Address comments from @rullzer:

- implement isAvailable - run tests only if ImageMagick with HEIC support is available in the environment
nextcloud · Aug 17, 2018 · e29f453 · e29f453
1 parent 8a7bc3f
commit e29f453
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/lib/private/Preview/HEIC.php b/lib/private/Preview/HEIC.php
@@ -29,4 +29,12 @@ class HEIC extends Bitmap {
  public function getMimeType() {
  return '/image\/hei(f|c)/';
  }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function isAvailable(\OCP\Files\FileInfo $file) {
+ return in_array("HEIC", \Imagick::queryFonts("HEI*") );
+ }
+
 }
diff --git a/tests/lib/Preview/HEICTest.php b/tests/lib/Preview/HEICTest.php
@@ -31,12 +31,18 @@
 class HEICTest extends Provider {
 
  public function setUp() {
- parent::setUp();
+ if ( !in_array("HEIC", \Imagick::queryFormats("HEI*")) ) {
+ $this->markTestSkipped('ImageMagick is not HEIC aware. Skipping tests');
+ } else {
+ parent::setUp();
+
+ $fileName = 'testimage.heic';
+ $this->imgPath = $this->prepareTestFile($fileName, \OC::$SERVERROOT . '/tests/data/' . $fileName);
+ $this->width = 1680;
+ $this->height = 1050;
+ $this->provider = new \OC\Preview\HEIC;
+ }
 
- $fileName = 'testimage.heic';
- $this->imgPath = $this->prepareTestFile($fileName, \OC::$SERVERROOT . '/tests/data/' . $fileName);
- $this->width = 1680;
- $this->height = 1050;
- $this->provider = new \OC\Preview\HEIC;
  }
+
 }