Ticket #24871: 24871(1).diff

tests/phpunit/tests/image/base.php

@@ -36 +36 @@
         }
 
         /**
-         * Helper assertion for testing alpha on images
+         * Helper assertion for testing alpha on images using GD library
          *
          * @param  string $image_path
          * @param  array $point      array(x,y)
          * @param  int $alpha
          */
-        protected function assertImageAlphaAtPoint( $image_path, $point, $alpha ) {
+        protected function assertImageAlphaAtPointGD( $image_path, $point, $alpha ) {
                 $im = imagecreatefrompng( $image_path );
                 $rgb = imagecolorat( $im, $point[0], $point[1] );
 
@@ -52 +52 @@
         }
 
         /**
+         * Helper assertion for testing alpha on images using Imagick
+         *
+         * @param string $image_path
+         * @param array $point      array(x,y)
+         * @param int $expected
+         */
+        protected function assertImageAlphaAtPointImagick( $image_path, $point, $expected ) {
+                $im = new Imagick( $image_path );
+                $pixel = $im->getImagePixelColor( $point[0], $point[1] );
+                $color = $pixel->getColorValue( imagick::COLOR_ALPHA );
+                $this->assertEquals( $expected, $color );
+        }
+
+        /**
          * Helper assertion to check actual image dimensions on disk
          *
          * @param string $filename Image filename.

tests/phpunit/tests/image/editor_imagick.php

@@ -461 +461 @@
          */
         public function test_image_preserves_alpha_on_resize() {
                 $file = DIR_TESTDATA . '/images/transparent.png';
-
                 $editor = wp_get_image_editor( $file );
-
                 $this->assertNotInstanceOf( 'WP_Error', $editor );
                 
                 $editor->load();
@@ -472 +470 @@
 
                 $editor->save( $save_to_file );
 
-                $this->assertImageAlphaAtPoint( $save_to_file, array( 0,0 ), 127 );
+                $im = new Imagick( $save_to_file );
+                $pixel = $im->getImagePixelColor( 0, 0 );
+                $expected = $pixel->getColorValue( imagick::COLOR_ALPHA );
 
+                $this->assertImageAlphaAtPointImagick( $save_to_file, array( 0,0 ), $expected );
+
                 unlink( $save_to_file );
         }
 
@@ -484 +486 @@
          */
         public function test_image_preserves_alpha() {
                 $file = DIR_TESTDATA . '/images/transparent.png';
-
                 $editor = wp_get_image_editor( $file );
-
                 $this->assertNotInstanceOf( 'WP_Error', $editor );
 
                 $editor->load();
-
                 $save_to_file = tempnam( get_temp_dir(), '' ) . '.png';
-
                 $editor->save( $save_to_file );
 
-                $this->assertImageAlphaAtPoint( $save_to_file, array( 0,0 ), 127 );
+                $im = new Imagick( $save_to_file );
+                $pixel = $im->getImagePixelColor( 0, 0 );
+                $expected = $pixel->getColorValue( imagick::COLOR_ALPHA );
 
+                $this->assertImageAlphaAtPointImagick( $save_to_file, array( 0,0 ), $expected );
+
                 unlink( $save_to_file );
         }
 }

tests/phpunit/tests/image/editor_gd.php

@@ -472 +472 @@
 
                 $editor->save( $save_to_file );
 
-                $this->assertImageAlphaAtPoint( $save_to_file, array( 0,0 ), 127 );
+                $this->assertImageAlphaAtPointGD( $save_to_file, array( 0,0 ), 127 );
 
                 unlink( $save_to_file );
         }
@@ -495 +495 @@
 
                 $editor->save( $save_to_file );
 
-                $this->assertImageAlphaAtPoint( $save_to_file, array( 0,0 ), 127 );
+                $this->assertImageAlphaAtPointGD( $save_to_file, array( 0,0 ), 127 );
 
                 unlink( $save_to_file );
         }