Changeset 49024 for trunk/tests/phpunit/tests/image/intermediateSize.php

Timestamp:

09/21/2020 11:34:06 AM (6 years ago)

Author:

SergeyBiryukov

Message:

Tests: Convert the checks for imagejpeg() function availability to use the @requires annotation.

This better utilizes the PHPUnit native functionality.

Props ayeshrajans, jrf, johnbillion.
Fixes #50639. See #50640.

File:

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

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

@@ -29 +29 @@
     }
 
+    /**
+     * @requires function imagejpeg
+     */
     function test_make_intermediate_size_width() {
-        if ( ! function_exists( 'imagejpeg' ) ) {
-            $this->fail( 'jpeg support unavailable' );
-        }
-
         $image = image_make_intermediate_size( DIR_TESTDATA . '/images/a2-small.jpg', 100, 0, false );
 
@@ -39 +38 @@
     }
 
+    /**
+     * @requires function imagejpeg
+     */
     function test_make_intermediate_size_height() {
-        if ( ! function_exists( 'imagejpeg' ) ) {
-            $this->fail( 'jpeg support unavailable' );
-        }
-
         $image = image_make_intermediate_size( DIR_TESTDATA . '/images/a2-small.jpg', 0, 75, false );
 
@@ -49 +47 @@
     }
 
+    /**
+     * @requires function imagejpeg
+     */
     function test_make_intermediate_size_successful() {
-        if ( ! function_exists( 'imagejpeg' ) ) {
-            $this->fail( 'jpeg support unavailable' );
-        }
-
         $image = image_make_intermediate_size( DIR_TESTDATA . '/images/a2-small.jpg', 100, 75, true );
 
@@ -68 +65 @@
     /**
      * @ticket 17626
+     * @requires function imagejpeg
      */
     function test_get_intermediate_sizes_by_name() {
-        if ( ! function_exists( 'imagejpeg' ) ) {
-            $this->fail( 'jpeg support unavailable' );
-        }
-
         add_image_size( 'test-size', 330, 220, true );
 
@@ -92 +86 @@
     /**
      * @ticket 17626
+     * @requires function imagejpeg
      */
     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 );
@@ -117 +108 @@
     /**
      * @ticket 17626
+     * @requires function imagejpeg
      */
     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).
@@ -164 +152 @@
     /**
      * @ticket 17626
+     * @requires function imagejpeg
      */
     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 );
@@ -196 +181 @@
      * @ticket 17626
      * @ticket 34087
+     * @requires function imagejpeg
      */
     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;
@@ -228 +210 @@
      * @ticket 17626
      * @ticket 34087
+     * @requires function imagejpeg
      */
     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;
@@ -255 +234 @@
     /**
      * @ticket 34384
+     * @requires function imagejpeg
      */
     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 );
@@ -276 +252 @@
     /**
      * @ticket 34384
+     * @requires function imagejpeg
      */
     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 );