Changeset 27794 for trunk/tests/phpunit/tests/image/base.php

Timestamp:

03/27/2014 08:39:08 PM (12 years ago)

Author:

wonderboymusic

Message:

In multi_resize() image editor methods, assert that null can only be passed for one of the arguments, not both. Add a lot more unit test assertions to ensure this.

Props pbearne, DH-Shredder.
Fixes #26823.

File:

• trunk/tests/phpunit/tests/image/base.php (modified) (1 diff)

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

@@ -40 +40 @@
          */
         protected function assertImageAlphaAtPoint( $image_path, $point, $alpha ) {
+                $im = imagecreatefrompng( $image_path );
+                $rgb = imagecolorat( $im, $point[0], $point[1] );
 
-                $im = imagecreatefrompng( $image_path );
-                $rgb = imagecolorat($im, $point[0], $point[1]);
-
-                $colors = imagecolorsforindex($im, $rgb);
+                $colors = imagecolorsforindex( $im, $rgb );
 
                 $this->assertEquals( $alpha, $colors['alpha'] );
         }
+
+        /**
+         * Helper assertion to check actual image dimensions on disk
+         *
+         * @param string $filename Image filename.
+         * @param int    $width    Width to verify.
+         * @param int    $height   Height to verify.
+         */
+        protected function assertImageDimensions( $filename, $width, $height ) {
+                $detected_width = 0;
+                $detected_height = 0;
+                $image_size = @getimagesize( $filename );
+
+                if ( isset( $image_size[0] ) ) {
+                        $detected_width = $image_size[0];
+                }
+
+                if ( isset( $image_size[1] ) ) {
+                        $detected_height = $image_size[1];
+                }
+
+                $this->assertEquals( $width, $detected_width );
+                $this->assertEquals( $height, $detected_height );
+        }
 }