Changeset 30660 for trunk/tests/phpunit/tests/image/resize.php

Timestamp:

11/30/2014 07:53:18 PM (10 years ago)

Author:

wonderboymusic

Message:

Use round() instead of floor() when resizing image dimensions.

Updates unit tests.

Props SergeyBiryukov, kitchin.
Fixes #18532.

File:

• trunk/tests/phpunit/tests/image/resize.php (modified) (10 diffs)

trunk/tests/phpunit/tests/image/resize.php

@@ -14 +14 @@
         $image = $this->resize_helper( DIR_TESTDATA.'/images/test-image.jpg', 25, 25 );
 
-        $this->assertEquals( 'test-image-25x25.jpg', basename($image) );
+        $this->assertEquals( 'test-image-25x25.jpg', basename( $image ) );
         list($w, $h, $type) = getimagesize($image);
         $this->assertEquals( 25, $w );
@@ -26 +26 @@
         $image = $this->resize_helper( DIR_TESTDATA.'/images/test-image.png', 25, 25 );
 
-        $this->assertEquals( 'test-image-25x25.png', basename($image) );
+        if ( ! is_string( $image ) ) {  // WP_Error, stop GLib-GObject-CRITICAL assertion
+            $this->markTestSkipped( sprintf( 'No PNG support in the editor engine %s on this system', $this->editor_engine ) );
+            return;
+        }
+
+        $this->assertEquals( 'test-image-25x25.png', basename( $image ) );
         list($w, $h, $type) = getimagesize($image);
         $this->assertEquals( 25, $w );
@@ -38 +43 @@
         $image = $this->resize_helper( DIR_TESTDATA.'/images/test-image.gif', 25, 25 );
 
-        $this->assertEquals( 'test-image-25x25.gif', basename($image) );
+        if ( ! is_string( $image ) ) {  // WP_Error, stop GLib-GObject-CRITICAL assertion
+            $this->markTestSkipped( sprintf( 'No GIF support in the editor engine %s on this system', $this->editor_engine ) );
+            return;
+        }
+
+        $this->assertEquals( 'test-image-25x25.gif', basename( $image ) );
         list($w, $h, $type) = getimagesize($image);
         $this->assertEquals( 25, $w );
@@ -58 +68 @@
         $image = $this->resize_helper( DIR_TESTDATA.'/images/2007-06-17DSC_4173.JPG', 128, 96 );
 
-        $this->assertEquals( '2007-06-17DSC_4173-63x96.jpg', basename($image) );
+        $this->assertEquals( '2007-06-17DSC_4173-64x96.jpg', basename( $image ) );
         list($w, $h, $type) = getimagesize($image);
-        $this->assertEquals( 63, $w );
+        $this->assertEquals( 64, $w );
         $this->assertEquals( 96, $h );
         $this->assertEquals( IMAGETYPE_JPEG, $type );
@@ -70 +80 @@
         $image = $this->resize_helper( DIR_TESTDATA.'/images/2007-06-17DSC_4173.JPG', 128, 0 );
 
-        $this->assertEquals( '2007-06-17DSC_4173-128x192.jpg', basename($image) );
+        $this->assertEquals( '2007-06-17DSC_4173-128x193.jpg', basename( $image ) );
         list($w, $h, $type) = getimagesize($image);
         $this->assertEquals( 128, $w );
-        $this->assertEquals( 192, $h );
+        $this->assertEquals( 193, $h );
         $this->assertEquals( IMAGETYPE_JPEG, $type );
 
@@ -82 +92 @@
         $image = $this->resize_helper( DIR_TESTDATA.'/images/2007-06-17DSC_4173.JPG', 0, 96 );
 
-        $this->assertEquals( '2007-06-17DSC_4173-63x96.jpg', basename($image) );
+        $this->assertEquals( '2007-06-17DSC_4173-64x96.jpg', basename( $image ) );
         list($w, $h, $type) = getimagesize($image);
-        $this->assertEquals( 63, $w );
+        $this->assertEquals( 64, $w );
         $this->assertEquals( 96, $h );
         $this->assertEquals( IMAGETYPE_JPEG, $type );
@@ -94 +104 @@
         $image = $this->resize_helper( DIR_TESTDATA.'/images/2007-06-17DSC_4173.JPG', 150, 150, true );
 
-        $this->assertEquals( '2007-06-17DSC_4173-150x150.jpg', basename($image) );
+        $this->assertEquals( '2007-06-17DSC_4173-150x150.jpg', basename( $image ) );
         list($w, $h, $type) = getimagesize($image);
         $this->assertEquals( 150, $w );
@@ -106 +116 @@
         $image = $this->resize_helper( DIR_TESTDATA.'/images/2007-06-17DSC_4173.JPG', 150, 100, true );
 
-        $this->assertEquals( '2007-06-17DSC_4173-150x100.jpg', basename($image) );
+        $this->assertEquals( '2007-06-17DSC_4173-150x100.jpg', basename( $image ) );
         list($w, $h, $type) = getimagesize($image);
         $this->assertEquals( 150, $w );
@@ -118 +128 @@
         $image = $this->resize_helper( DIR_TESTDATA.'/images/2007-06-17DSC_4173.JPG', 50, 150, true );
 
-        $this->assertEquals( '2007-06-17DSC_4173-50x150.jpg', basename($image) );
+        $this->assertEquals( '2007-06-17DSC_4173-50x150.jpg', basename( $image ) );
         list($w, $h, $type) = getimagesize($image);
         $this->assertEquals( 50, $w );
@@ -143 +153 @@
      */
     public function test_resize_bad_image() {
+
+        if ( $this->editor_engine == 'WP_Image_Editor_Imagick' ) {
+            $this->markTestSkipped( sprintf( 'Avoid GLib-GObject-CRITICAL assertion in %s', $this->editor_engine ) );
+            return;
+        }
+
         $image = $this->resize_helper( DIR_TESTDATA.'/export/crazy-cdata.xml', 25, 25 );
         $this->assertInstanceOf( 'WP_Error', $image );