Changeset 31510

Timestamp:

02/22/2015 09:06:36 PM (12 years ago)

Author:

boonebgorges

Message:

Better image-type support checks in image unit tests.

PHP can be compiled without support for certain image types. Our unit tests
should be sensitive to these configurations.

Fixes #31124.

Location:

trunk/tests/phpunit/tests/image

Files:

• editor_gd.php (modified) (4 diffs)
• functions.php (modified) (2 diffs)

trunk/tests/phpunit/tests/image/editor_gd.php

@@ -32 +32 @@
         }
 
-        /**
-         * Check support for GD compatible mime types.
-         */
-        public function test_supports_mime_type() {
+        public function test_supports_mime_type_jpeg() {
                 $gd_image_editor = new WP_Image_Editor_GD( null );
-
-                $this->assertTrue( $gd_image_editor->supports_mime_type( 'image/jpeg' ), 'Does not support image/jpeg' );
-                $this->assertTrue( $gd_image_editor->supports_mime_type( 'image/png' ), 'Does not support image/png' );
-                $this->assertTrue( $gd_image_editor->supports_mime_type( 'image/gif' ), 'Does not support image/gif' );
+                $expected = imagetypes() & IMG_JPG;
+                $this->assertEquals( $expected, $gd_image_editor->supports_mime_type( 'image/jpeg' ) );
+        }
+
+        public function test_supports_mime_type_png() {
+                $gd_image_editor = new WP_Image_Editor_GD( null );
+                $expected = imagetypes() & IMG_PNG;
+                $this->assertEquals( $expected, $gd_image_editor->supports_mime_type( 'image/png' ) );
+        }
+
+        public function test_supports_mime_type_gif() {
+                $gd_image_editor = new WP_Image_Editor_GD( null );
+                $expected = imagetypes() & IMG_GIF;
+                $this->assertEquals( $expected, $gd_image_editor->supports_mime_type( 'image/gif' ) );
         }
 
@@ -461 +468 @@
          */
         public function test_image_preserves_alpha_on_resize() {
+                if ( ! ( imagetypes() & IMG_PNG ) ) {
+                        $this->markTestSkipped( 'This test requires PHP to be compiled with PNG support.' );
+                }
+
                 $file = DIR_TESTDATA . '/images/transparent.png';
 
@@ -484 +495 @@
          */
         public function test_image_preserves_alpha() {
+                if ( ! ( imagetypes() & IMG_PNG ) ) {
+                        $this->markTestSkipped( 'This test requires PHP to be compiled with PNG support.' );
+                }
+
                 $file = DIR_TESTDATA . '/images/transparent.png';
 
@@ -506 +521 @@
          */
         public function test_image_preserves_alpha_on_rotate() {
+                if ( ! ( imagetypes() & IMG_PNG ) ) {
+                        $this->markTestSkipped( 'This test requires PHP to be compiled with PNG support.' );
+                }
+
                 $file = DIR_TESTDATA . '/images/transparent.png';
 

trunk/tests/phpunit/tests/image/functions.php

@@ -138 +138 @@
                         // Save a file as each mime type, assert it works
                         foreach ( $mime_types as $mime_type ) {
+                                if ( ! $class::supports_mime_type( $mime_type ) ) {
+                                        continue;
+                                }
+
                                 $file = wp_tempnam();
                                 $ret = wp_save_image_file( $file, $img, $mime_type, 1 );
@@ -229 +233 @@
                         $temp = get_temp_dir();
                         foreach ( $mime_types as $ext => $mime_type ) {
+                                if ( ! $class::supports_mime_type( $mime_type ) ) {
+                                        continue;
+                                }
+
                                 $file = wp_unique_filename( $temp, uniqid() . ".$ext" );
                                 $ret = $img->save( trailingslashit( $temp ) . $file );