Changeset 51415 for trunk/tests/phpunit/tests/db/charset.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/db/charset.php (modified) (5 diffs)

trunk/tests/phpunit/tests/db/charset.php

@@ -763 +763 @@
         if ( ! self::$_wpdb->has_cap( 'utf8mb4' ) && preg_match( '/utf8mb[34]/i', $create ) ) {
             $this->markTestSkipped( "This version of MySQL doesn't support utf8mb4." );
-            return;
         }
 
@@ -805 +804 @@
         if ( ! self::$_wpdb->has_cap( 'utf8mb4' ) && preg_match( '/utf8mb[34]/i', $create ) ) {
             $this->markTestSkipped( "This version of MySQL doesn't support utf8mb4." );
-            return;
         }
 
@@ -829 +827 @@
         if ( ! self::$_wpdb->has_cap( 'utf8mb4' ) && preg_match( '/utf8mb[34]/i', $create ) ) {
             $this->markTestSkipped( "This version of MySQL doesn't support utf8mb4." );
-            return;
         }
 
@@ -857 +854 @@
         if ( ! self::$_wpdb->has_cap( 'utf8mb4' ) && preg_match( '/utf8mb[34]/i', $create ) ) {
             $this->markTestSkipped( "This version of MySQL doesn't support utf8mb4." );
-            return;
         }
 
@@ -918 +914 @@
         if ( ! self::$_wpdb->has_cap( 'utf8mb4' ) && preg_match( '/utf8mb[34]/i', $create ) ) {
             $this->markTestSkipped( "This version of MySQL doesn't support utf8mb4." );
-            return;
         }