Changeset 30549

Timestamp:

11/24/2014 08:56:36 PM (12 years ago)

Author:

boonebgorges

Message:

Fix the unit tests for Imagick alpha.

These tests were written to use the assertImageAtAlpha() helper method, whose
internals were specific to GD. As a result, the tests could not pass. This
changeset introduces GD- and Imagick-specific versions of this method.

Props voldemortensen.
Fixes #24871.

Location:

trunk/tests/phpunit/tests/image

Files:

• base.php (modified) (3 diffs)
• editor_gd.php (modified) (2 diffs)
• editor_imagick.php (modified) (2 diffs)

trunk/tests/phpunit/tests/image/base.php

@@ -37 +37 @@
 
         /**
-         * Helper assertion for testing alpha on images
+         * Helper assertion for testing alpha on images using GD library
          *
          * @param  string $image_path
@@ -43 +43 @@
          * @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] );
@@ -50 +50 @@
 
                 $this->assertEquals( $alpha, $colors['alpha'] );
+        }
+
+        /**
+         * 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 );
         }
 

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

@@ -473 +473 @@
                 $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 );
@@ -496 +496 @@
                 $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 );

trunk/tests/phpunit/tests/image/editor_imagick.php

@@ -473 +473 @@
                 $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 );
@@ -496 +500 @@
                 $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 );