Changeset 57146

Timestamp:

11/30/2023 11:15:34 AM (13 months ago)

Author:

SergeyBiryukov

Message:

Tests: Update _wp_timezone_choice_usort_callback() tests for consistency.

• Use the same @group annotation as the other tests.
• Use assertSame() to verify the type of the result.
• Use data_ prefix for the data provider.
• Use named data set in the data provider. This makes the output when using the --testdox option more descriptive and is helpful when trying to debug which data set from a data provider failed the test.
• Other minor corrections.

Reference: ​Core Handbook: Writing PHP Tests: Repetitive Tests.

Follow-up to [57145].

See #59953, #59647.

File:

• trunk/tests/phpunit/tests/functions/wpTimezoneChoiceUsortCallback.php (moved) (moved from trunk/tests/phpunit/tests/functions/WpTimezoneChoiceUsortCallback.php) (10 diffs)

trunk/tests/phpunit/tests/functions/wpTimezoneChoiceUsortCallback.php

@@ -2 +2 @@
 
 /**
- * Tests for the _wp_timezone_choice_usort_callback function.
+ * Tests for the _wp_timezone_choice_usort_callback() function.
  *
- * @group Functions.php
+ * @group function
  *
  * @covers ::_wp_timezone_choice_usort_callback
@@ -13 +13 @@
      * @ticket 59953
      *
-     * @dataProvider wp_timezone_choice_usort_callback_data
+     * @dataProvider data_wp_timezone_choice_usort_callback
      */
-    public function test__wp_timezone_choice_usort_callback( $unsorted, $sorted, $info ) {
-
+    public function test_wp_timezone_choice_usort_callback( $unsorted, $sorted ) {
         usort( $unsorted, '_wp_timezone_choice_usort_callback' );
 
-        $this->assertEquals( $sorted, $unsorted, $info );
+        $this->assertSame( $sorted, $unsorted );
     }
 
-
-    public function wp_timezone_choice_usort_callback_data() {
+    public function data_wp_timezone_choice_usort_callback() {
         return array(
-            array(
+            'just GMT+'                         => array(
                 'unsorted' => array(
                     array(
@@ -100 +98 @@
                     ),
                 ),
-                'info'     => '_wp_timezone_choice_usort_callback: just GMT+',
-            ),
-
-            array(
+            ),
+
+            'mixed UTC and GMT'                 => array(
                 'unsorted' => array(
                     array(
@@ -178 +175 @@
                     ),
                 ),
-                'info'     => '_wp_timezone_choice_usort_callback: MIXED utc and GMT',
-            ),
-
-            array(
+            ),
+
+            'just alpha city'                   => array(
                 'unsorted' => array(
                     array(
@@ -256 +252 @@
                     ),
                 ),
-                'info'     => '_wp_timezone_choice_usort_callback: just alpha city',
-            ),
-
-            array(
+            ),
+
+            'not Etc continents are not sorted' => array(
                 'unsorted' => array(
                     array(
@@ -334 +329 @@
                     ),
                 ),
-                'info'     => '_wp_timezone_choice_usort_callback: not Etc continent are not sorted',
-            ),
-            array(
+            ),
+
+            'not Etc just t_continent'          => array(
                 'unsorted' => array(
                     array(
@@ -411 +406 @@
                     ),
                 ),
-                'info'     => '_wp_timezone_choice_usort_callback: not Etc just t_city',
-            ),
-            array(
+            ),
+
+            'not Etc just t_city'               => array(
                 'unsorted' => array(
                     array(
@@ -488 +483 @@
                     ),
                 ),
-                'info'     => '_wp_timezone_choice_usort_callback: not Etc just t_city',
-            ),
-            array(
+            ),
+
+            'not Etc just t_subcity'            => array(
                 'unsorted' => array(
                     array(
@@ -565 +560 @@
                     ),
                 ),
-                'info'     => '_wp_timezone_choice_usort_callback: just sub city',
-            ),
-            array(
+            ),
+
+            'just continent with Etc which pulls 1 to bottom' => array(
                 'unsorted' => array(
                     array(
@@ -642 +637 @@
                     ),
                 ),
-                'info'     => '_wp_timezone_choice_usort_callback: just continent with etc which pulls 1 to bottom',
             ),
         );