Changeset 49010

Timestamp:

09/20/2020 03:31:46 AM (6 years ago)

Author:

SergeyBiryukov

Message:

Tests: Consistently require imagejpeg() function in image_make_intermediate_size() tests.

This outputs a proper message if the requirement is not met, instead of an obscure PHP error further in the test.

See #50639, #50640.

File:

• trunk/tests/phpunit/tests/image/intermediateSize.php (modified) (8 diffs)

trunk/tests/phpunit/tests/image/intermediateSize.php

@@ -70 +70 @@
          */
         function test_get_intermediate_sizes_by_name() {
+                if ( ! function_exists( 'imagejpeg' ) ) {
+                        $this->fail( 'jpeg support unavailable' );
+                }
+
                 add_image_size( 'test-size', 330, 220, true );
 
@@ -90 +94 @@
          */
         function test_get_intermediate_sizes_by_array_exact() {
+                if ( ! function_exists( 'imagejpeg' ) ) {
+                        $this->fail( 'jpeg support unavailable' );
+                }
+
                 // Only one dimention match shouldn't return false positive (see: #17626).
                 add_image_size( 'test-size', 330, 220, true );
@@ -111 +119 @@
          */
         function test_get_intermediate_sizes_by_array_nearest() {
+                if ( ! function_exists( 'imagejpeg' ) ) {
+                        $this->fail( 'jpeg support unavailable' );
+                }
+
                 // If an exact size is not found, it should be returned.
                 // If not, find nearest size that is larger (see: #17626).
@@ -154 +166 @@
          */
         function test_get_intermediate_sizes_by_array_zero_height() {
+                if ( ! function_exists( 'imagejpeg' ) ) {
+                        $this->fail( 'jpeg support unavailable' );
+                }
+
                 // Generate random width.
                 $random_w = rand( 300, 400 );
@@ -182 +198 @@
          */
         function test_get_intermediate_sizes_by_array_zero_width() {
+                if ( ! function_exists( 'imagejpeg' ) ) {
+                        $this->fail( 'jpeg support unavailable' );
+                }
+
                 // 202 is the smallest height that will trigger a miss for 'false-height'.
                 $height = 202;
@@ -210 +230 @@
          */
         public function test_get_intermediate_sizes_should_match_size_with_off_by_one_aspect_ratio() {
+                if ( ! function_exists( 'imagejpeg' ) ) {
+                        $this->fail( 'jpeg support unavailable' );
+                }
+
                 // Original is 600x400. 300x201 is close enough to match.
                 $width  = 300;
@@ -233 +257 @@
          */
         public function test_get_intermediate_size_with_small_size_array() {
+                if ( ! function_exists( 'imagejpeg' ) ) {
+                        $this->fail( 'jpeg support unavailable' );
+                }
+
                 // Add a hard cropped size that matches the aspect ratio we're going to test.
                 add_image_size( 'test-size', 200, 100, true );
@@ -250 +278 @@
          */
         public function test_get_intermediate_size_with_small_size_array_fallback() {
+                if ( ! function_exists( 'imagejpeg' ) ) {
+                        $this->fail( 'jpeg support unavailable' );
+                }
+
                 $file = DIR_TESTDATA . '/images/waffles.jpg';
                 $id   = $this->_make_attachment( $file, 0 );