Changeset 38759

Timestamp:

10/08/2016 01:19:11 AM (8 years ago)

Author:

johnbillion

Message:

Build/Test Tools: Make use of PHPUnit's @requires notation.

Fixes #38256

Location:

trunk/tests/phpunit/tests

Files:

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

trunk/tests/phpunit/tests/http/functions.php

@@ -4 +4 @@
  * @group http
  * @group external-http
+ *
+ * @requires extension openssl
  */
 class Tests_HTTP_Functions extends WP_UnitTestCase {
-    public function setUp() {
-        if ( ! extension_loaded( 'openssl' ) ) {
-            $this->markTestSkipped( 'Tests_HTTP_Functions requires openssl.' );
-        }
-
-        parent::setUp();
-    }
 
     function test_head_request() {

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

@@ -109 +109 @@
      * Test save image file and mime_types
      * @ticket 6821
+     *
+     * @requires extension fileinfo
      */
     public function test_wp_save_image_file() {
-        if ( ! extension_loaded( 'fileinfo' ) ) {
-            $this->markTestSkipped( 'The fileinfo PHP extension is not loaded.' );
-        }
-
         include_once( ABSPATH . 'wp-admin/includes/image-edit.php' );
 
@@ -161 +159 @@
      * Test that a passed mime type overrides the extension in the filename
      * @ticket 6821
+     *
+     * @requires extension fileinfo
      */
     public function test_mime_overrides_filename() {
-        if ( ! extension_loaded( 'fileinfo' ) ) {
-            $this->markTestSkipped( 'The fileinfo PHP extension is not loaded.' );
-        }
-
         // Test each image editor engine
         $classes = array('WP_Image_Editor_GD', 'WP_Image_Editor_Imagick');
@@ -199 +195 @@
      * Test that mime types are correctly inferred from file extensions
      * @ticket 6821
+     *
+     * @requires extension fileinfo
      */
     public function test_inferred_mime_types() {
-        if ( ! extension_loaded( 'fileinfo' ) ) {
-            $this->markTestSkipped( 'The fileinfo PHP extension is not loaded.' );
-        }
-
         // Mime types
         $mime_types = array(
@@ -297 +291 @@
     }
 
+    /**
+     * @requires extension openssl
+     * @requires function imagejpeg
+     */
     public function test_wp_crop_image_url() {
-        if ( !function_exists( 'imagejpeg' ) )
-            $this->markTestSkipped( 'jpeg support unavailable' );
-
-        if ( ! extension_loaded( 'openssl' ) ) {
-            $this->markTestSkipped( 'Tests_Image_Functions::test_wp_crop_image_url() requires openssl.' );
-        }
-
         $file = wp_crop_image( 'https://asdftestblog1.files.wordpress.com/2008/04/canola.jpg',
                               0, 0, 100, 100, 100, 100, false,
@@ -324 +315 @@
     }
 
+    /**
+     * @requires extension openssl
+     */
     public function test_wp_crop_image_url_not_exist() {
-        if ( ! extension_loaded( 'openssl' ) ) {
-            $this->markTestSkipped( 'Tests_Image_Functions::test_wp_crop_image_url_not_exist() requires openssl.' );
-        }
-
         $file = wp_crop_image( 'https://asdftestblog1.files.wordpress.com/2008/04/canoladoesnotexist.jpg',
                               0, 0, 100, 100, 100, 100 );

trunk/tests/phpunit/tests/image/meta.php

@@ -5 +5 @@
  * @group media
  * @group upload
+ *
+ * @requires extension gd
+ * @requires extension exif
  */
 class Tests_Image_Meta extends WP_UnitTestCase {
-    function setUp() {
-        if ( ! extension_loaded( 'gd' ) )
-            $this->markTestSkipped( 'The gd PHP extension is not loaded.' );
-        if ( ! extension_loaded( 'exif' ) )
-            $this->markTestSkipped( 'The exif PHP extension is not loaded.' );
-        if ( ! is_callable( 'wp_read_image_metadata' ) )
-            $this->markTestSkipped( 'wp_read_image_metadata() is not callable.' );
-        parent::setUp();
-    }
 
     function test_exif_d70() {