Changeset 49009

Timestamp:

09/20/2020 02:45:35 AM (4 years ago)

Author:

SergeyBiryukov

Message:

Tests: Skip some image tests if neither GD nor Imagick image editor engines are supported on the system.

The explicit message brings some consistency with other image editor tests, specifically the ones using the WP_Image_UnitTestCase class.

Previously, the tests were marked as "risky" in that scenario, due to performing no assertions.

See #50639, #50640.

Location:

trunk/tests/phpunit/tests

Files:

• http/base.php (modified) (1 diff)
• image/base.php (modified) (1 diff)
• image/functions.php (modified) (5 diffs)

trunk/tests/phpunit/tests/http/base.php

@@ -28 +28 @@
         $class = 'WP_Http_' . ucfirst( $this->transport );
         if ( ! call_user_func( array( $class, 'test' ) ) ) {
-            $this->markTestSkipped( sprintf( 'The transport %s is not supported on this system', $this->transport ) );
+            $this->markTestSkipped( sprintf( 'The transport %s is not supported on this system.', $this->transport ) );
         }
 

trunk/tests/phpunit/tests/image/base.php

@@ -13 +13 @@
 
         if ( ! call_user_func( array( $this->editor_engine, 'test' ) ) ) {
-            $this->markTestSkipped( sprintf( 'The image editor engine %s is not supported on this system', $this->editor_engine ) );
+            $this->markTestSkipped( sprintf( 'The image editor engine %s is not supported on this system.', $this->editor_engine ) );
         }
 

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

@@ -156 +156 @@
         }
 
+        if ( ! WP_Image_Editor_GD::test() && ! WP_Image_Editor_Imagick::test() ) {
+            $this->markTestSkipped( sprintf( 'The image editor engine %s is not supported on this system.', 'WP_Image_Editor_GD' ) );
+        }
+
         require_once ABSPATH . 'wp-admin/includes/image-edit.php';
 
@@ -209 +213 @@
         }
 
+        if ( ! WP_Image_Editor_GD::test() && ! WP_Image_Editor_Imagick::test() ) {
+            $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' );
@@ -246 +254 @@
         if ( ! extension_loaded( 'fileinfo' ) ) {
             $this->markTestSkipped( 'The fileinfo PHP extension is not loaded.' );
+        }
+
+        if ( ! WP_Image_Editor_GD::test() && ! WP_Image_Editor_Imagick::test() ) {
+            $this->markTestSkipped( sprintf( 'The image editor engine %s is not supported on this system.', 'WP_Image_Editor_GD' ) );
         }
 
@@ -307 +319 @@
         $editor2 = wp_get_image_editor( DIR_TESTDATA );
         $this->assertNotInternalType( 'resource', $editor2 );
+
+        if ( ! WP_Image_Editor_GD::test() && ! WP_Image_Editor_Imagick::test() ) {
+            $this->markTestSkipped( sprintf( 'The image editor engine %s is not supported on this system.', 'WP_Image_Editor_GD' ) );
+        }
 
         // Then, test with editors.
@@ -511 +527 @@
      */
     public function test_crop_setting_for_pdf() {
-
         if ( ! wp_image_editor_supports( array( 'mime_type' => 'application/pdf' ) ) ) {
             $this->markTestSkipped( 'Rendering PDFs is not supported on this system.' );