Changeset 55562 for trunk/tests/phpunit/tests/date/wpTimezone.php

Timestamp:

03/19/2023 12:03:30 PM (22 months ago)

Author:

SergeyBiryukov

Message:

Tests: Use the data_ prefix for various data provider methods.

This aims to bring more consistency to the test suite, as the vast majority of data providers already use that prefix.

Includes moving some data providers next to the tests they are used in.

Follow-up to [55464].

See #57841.

File:

• trunk/tests/phpunit/tests/date/wpTimezone.php (modified) (3 diffs)

trunk/tests/phpunit/tests/date/wpTimezone.php

@@ -23 +23 @@
      * @ticket 24730
      *
-     * @dataProvider timezone_offset_provider
+     * @dataProvider data_should_convert_gmt_offset
      *
      * @param float  $gmt_offset Numeric offset from UTC.
@@ -40 +40 @@
 
     /**
-     * @ticket 24730
-     */
-    public function test_should_return_timezone_string() {
-        update_option( 'timezone_string', 'Europe/Helsinki' );
-
-        $this->assertSame( 'Europe/Helsinki', wp_timezone_string() );
-
-        $timezone = wp_timezone();
-
-        $this->assertSame( 'Europe/Helsinki', $timezone->getName() );
-    }
-
-    /**
-     * Ensures that deprecated timezone strings are handled correctly.
-     *
-     * @ticket 56468
-     */
-    public function test_should_return_deprecated_timezone_string() {
-        $tz_string = 'America/Buenos_Aires'; // This timezone was deprecated pre-PHP 5.6.
-        update_option( 'timezone_string', $tz_string );
-
-        $this->assertSame( $tz_string, wp_timezone_string() );
-
-        $timezone = wp_timezone();
-
-        $this->assertSame( $tz_string, $timezone->getName() );
-    }
-
-    /**
      * Data provider to test numeric offset conversion.
      *
      * @return array
      */
-    public function timezone_offset_provider() {
+    public function data_should_convert_gmt_offset() {
         return array(
             array( -12, '-12:00' ),
@@ -135 +106 @@
         );
     }
+
+    /**
+     * @ticket 24730
+     */
+    public function test_should_return_timezone_string() {
+        update_option( 'timezone_string', 'Europe/Helsinki' );
+
+        $this->assertSame( 'Europe/Helsinki', wp_timezone_string() );
+
+        $timezone = wp_timezone();
+
+        $this->assertSame( 'Europe/Helsinki', $timezone->getName() );
+    }
+
+    /**
+     * Ensures that deprecated timezone strings are handled correctly.
+     *
+     * @ticket 56468
+     */
+    public function test_should_return_deprecated_timezone_string() {
+        $tz_string = 'America/Buenos_Aires'; // This timezone was deprecated pre-PHP 5.6.
+        update_option( 'timezone_string', $tz_string );
+
+        $this->assertSame( $tz_string, wp_timezone_string() );
+
+        $timezone = wp_timezone();
+
+        $this->assertSame( $tz_string, $timezone->getName() );
+    }
 }