Changeset 34775

Timestamp:

10/02/2015 02:13:15 PM (9 years ago)

Author:

boonebgorges

Message:

More explicit tests for image_get_intermediate_size().

After [33807], Tests_Image_Intermediate_Size::test_get_intermediate_sizes_by_array_zero_width()
was failing intermittently. This failure was due to the use of a random number
for the image height. When the height was sufficiently large - $height >= 202 -
to change the aspect ratio of the cropped image (based on WP's threshold of a
1px difference), the test passed. And when the height was exactly 200, the
medium image size was hit exactly. The failure occurred only with a height of
201, which is close enough to 200 so that WP determined that the aspect ratio
of the potential crop was close enough to match.

The current changeset splits the test into two, in order to demonstrate the
failure.

See #17626. Fixes #34087.

File:

• trunk/tests/phpunit/tests/image/intermediate_size.php (modified) (3 diffs)

trunk/tests/phpunit/tests/image/intermediate_size.php

@@ -215 +215 @@
 
     /**
-    * @ticket 17626
-    */
+     * @ticket 17626
+     * @ticket 34087
+     */
     function test_get_intermediate_sizes_by_array_zero_width() {
-        // Generate random height
-        $random_h = rand( 200, 300 );
+        // 202 is the smallest height that will trigger a miss for 'false-height'.
+        $height = 202;
 
         // Only one dimention match shouldn't return false positive (see: 17626)
-        add_image_size( 'test-size', 0, $random_h, false );
-        add_image_size( 'false-height', 300, $random_h, true );
+        add_image_size( 'test-size', 0, $height, false );
+        add_image_size( 'false-height', 300, $height, true );
 
         $file = DIR_TESTDATA . '/images/waffles.jpg';
@@ -229 +230 @@
 
         $original = wp_get_attachment_metadata( $id );
-        $image_h = $random_h;
+        $image_h = $height;
         $image_w = round( ( $image_h / $original['height'] ) * $original['width'] );
 
         // look for a size by array that exists
         // note: staying larger than 300px to miss default medium crop
-        $image = image_get_intermediate_size( $id, array( 0, $random_h ) );
+        $image = image_get_intermediate_size( $id, array( 0, $height ) );
 
         // test for the expected string because the array will by definition
@@ -244 +245 @@
         remove_image_size( 'false-height' );
     }
+
+    /**
+     * @ticket 17626
+     * @ticket 34087
+     */
+    public function test_get_intermediate_sizes_should_match_size_with_off_by_one_aspect_ratio() {
+        // Original is 600x400. 300x201 is close enough to match.
+        $width  = 300;
+        $height = 201;
+        add_image_size( 'off-by-one', $width, $height, true );
+
+        $file = DIR_TESTDATA . '/images/waffles.jpg';
+        $id = $this->_make_attachment( $file, 0 );
+
+        $original = wp_get_attachment_metadata( $id );
+        $image_h = $height;
+        $image_w = round( ( $image_h / $original['height'] ) * $original['width'] );
+
+        // look for a size by array that exists
+        // note: staying larger than 300px to miss default medium crop
+        $image = image_get_intermediate_size( $id, array( 0, $height ) );
+
+        $this->assertTrue( strpos( $image['file'], $width . 'x' . $height ) > 0 );
+
+        // cleanup
+        remove_image_size( 'off-by-one' );
+    }
 }