Changeset 49014

Timestamp:

09/20/2020 01:25:07 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Tests: Optimize some image tests to avoid checking for image editor engines availability twice.

Follow-up to [49009].

See #50639, #50640.

File:

• trunk/tests/phpunit/tests/image/functions.php (modified) (6 diffs)

trunk/tests/phpunit/tests/image/functions.php

@@ -156 +156 @@
         }
 
-        if ( ! WP_Image_Editor_GD::test() && ! WP_Image_Editor_Imagick::test() ) {
+        $classes = array( 'WP_Image_Editor_GD', 'WP_Image_Editor_Imagick' );
+
+        foreach ( $classes as $class ) {
+            if ( ! call_user_func( array( $class, 'test' ) ) ) {
+                // If the image editor isn't available, skip it.
+                unset( $classes[ $class ] );
+            }
+        }
+
+        if ( ! $classes ) {
             $this->markTestSkipped( sprintf( 'The image editor engine %s is not supported on this system.', 'WP_Image_Editor_GD' ) );
         }
@@ -170 +179 @@
 
         // Test each image editor engine.
-        $classes = array( 'WP_Image_Editor_GD', 'WP_Image_Editor_Imagick' );
         foreach ( $classes as $class ) {
-
-            // If the image editor isn't available, skip it.
-            if ( ! call_user_func( array( $class, 'test' ) ) ) {
-                continue;
-            }
-
             $img    = new $class( DIR_TESTDATA . '/images/canola.jpg' );
             $loaded = $img->load();
@@ -213 +215 @@
         }
 
-        if ( ! WP_Image_Editor_GD::test() && ! WP_Image_Editor_Imagick::test() ) {
+        $classes = array( 'WP_Image_Editor_GD', 'WP_Image_Editor_Imagick' );
+
+        foreach ( $classes as $class ) {
+            if ( ! call_user_func( array( $class, 'test' ) ) ) {
+                // If the image editor isn't available, skip it.
+                unset( $classes[ $class ] );
+            }
+        }
+
+        if ( ! $classes ) {
             $this->markTestSkipped( sprintf( 'The image editor engine %s is not supported on this system.', 'WP_Image_Editor_GD' ) );
         }
 
         // Test each image editor engine.
-        $classes = array( 'WP_Image_Editor_GD', 'WP_Image_Editor_Imagick' );
         foreach ( $classes as $class ) {
-
-            // If the image editor isn't available, skip it.
-            if ( ! call_user_func( array( $class, 'test' ) ) ) {
-                continue;
-            }
-
             $img    = new $class( DIR_TESTDATA . '/images/canola.jpg' );
             $loaded = $img->load();
@@ -256 +260 @@
         }
 
-        if ( ! WP_Image_Editor_GD::test() && ! WP_Image_Editor_Imagick::test() ) {
+        $classes = array( 'WP_Image_Editor_GD', 'WP_Image_Editor_Imagick' );
+
+        foreach ( $classes as $class ) {
+            if ( ! call_user_func( array( $class, 'test' ) ) ) {
+                // If the image editor isn't available, skip it.
+                unset( $classes[ $class ] );
+            }
+        }
+
+        if ( ! $classes ) {
             $this->markTestSkipped( sprintf( 'The image editor engine %s is not supported on this system.', 'WP_Image_Editor_GD' ) );
         }
@@ -271 +284 @@
 
         // Test each image editor engine.
-        $classes = array( 'WP_Image_Editor_GD', 'WP_Image_Editor_Imagick' );
         foreach ( $classes as $class ) {
-
-            // If the image editor isn't available, skip it.
-            if ( ! call_user_func( array( $class, 'test' ) ) ) {
-                continue;
-            }
-
             $img    = new $class( DIR_TESTDATA . '/images/canola.jpg' );
             $loaded = $img->load();
@@ -320 +326 @@
         $this->assertNotInternalType( 'resource', $editor2 );
 
-        if ( ! WP_Image_Editor_GD::test() && ! WP_Image_Editor_Imagick::test() ) {
+        $classes = array( 'WP_Image_Editor_GD', 'WP_Image_Editor_Imagick' );
+
+        foreach ( $classes as $class ) {
+            if ( ! call_user_func( array( $class, 'test' ) ) ) {
+                // If the image editor isn't available, skip it.
+                unset( $classes[ $class ] );
+            }
+        }
+
+        if ( ! $classes ) {
             $this->markTestSkipped( sprintf( 'The image editor engine %s is not supported on this system.', 'WP_Image_Editor_GD' ) );
         }
 
         // Then, test with editors.
-        $classes = array( 'WP_Image_Editor_GD', 'WP_Image_Editor_Imagick' );
         foreach ( $classes as $class ) {
-            // If the image editor isn't available, skip it.
-            if ( ! call_user_func( array( $class, 'test' ) ) ) {
-                continue;
-            }
-
             $editor = new $class( DIR_TESTDATA );
             $loaded = $editor->load();