Changeset 51415 for trunk/tests/phpunit/tests/compat.php

Timestamp:

07/13/2021 10:43:42 AM (3 years ago)

Author:

SergeyBiryukov

Message:

Tests: Clean up skipping conditions and requirements for various tests.

This improves the consistency of test skipping and ensures that:

• The @requires annotations use the right condition and format, and are on the right level (class vs. function).
• Inline conditions with a markTestSkipped() call are only used when annotations cannot be used.
• All markTestSkipped() calls contain a verbose explanation of why the test is being skipped.

Props jrf, hellofromTonya.
Fixes #53009.

File:

• trunk/tests/phpunit/tests/compat.php (modified) (2 diffs)

trunk/tests/phpunit/tests/compat.php

@@ -243 +243 @@
      *
      * @ticket 43583
+     *
+     * @requires extension intl
      */
     function test_is_countable_ResourceBundle() {
-        if ( ! class_exists( 'ResourceBundle' ) ) {
-            $this->markTestSkipped( 'The intl extension is not loaded. ResourceBundle not tested for is_countable().' );
-        }
-
         $this->assertTrue( is_countable( new ResourceBundle( 'en', null ) ) );
     }
@@ -256 +254 @@
      *
      * @ticket 43583
+     *
+     * @requires extension simplexml
      */
     function test_is_countable_SimpleXMLElement() {
-        if ( ! class_exists( 'SimpleXMLElement' ) ) {
-            $this->markTestSkipped( 'The xml extension is not loaded. SimpleXMLElement not tested for is_countable().' );
-        }
-
         $this->assertTrue( is_countable( new SimpleXMLElement( '<xml><tag>1</tag><tag>2</tag></xml>' ) ) );
     }