Changeset 55562 for trunk/tests/phpunit/tests/rest-api.php

Timestamp:

03/19/2023 12:03:30 PM (21 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/rest-api.php (modified) (7 diffs)

trunk/tests/phpunit/tests/rest-api.php

@@ -26 +26 @@
         remove_filter( 'wp_rest_server_class', array( $this, 'filter_wp_rest_server_class' ) );
         parent::tear_down();
+    }
+
+    public function filter_wp_rest_server_class( $class_name ) {
+        return 'Spy_REST_Server';
     }
 
@@ -823 +827 @@
     }
 
-    public function jsonp_callback_provider() {
+    /**
+     * @dataProvider data_jsonp_callback_check
+     */
+    public function test_jsonp_callback_check( $callback, $expected ) {
+        $this->assertSame( $expected, wp_check_jsonp_callback( $callback ) );
+    }
+
+    public function data_jsonp_callback_check() {
         return array(
             // Standard names.
@@ -842 +853 @@
 
     /**
-     * @dataProvider jsonp_callback_provider
-     */
-    public function test_jsonp_callback_check( $callback, $expected ) {
-        $this->assertSame( $expected, wp_check_jsonp_callback( $callback ) );
-    }
-
-    public function rest_date_provider() {
+     * @dataProvider data_rest_parse_date
+     */
+    public function test_rest_parse_date( $date, $expected ) {
+        $this->assertEquals( $expected, rest_parse_date( $date ) );
+    }
+
+    public function data_rest_parse_date() {
         return array(
             // Valid dates with timezones.
@@ -874 +885 @@
 
     /**
-     * @dataProvider rest_date_provider
-     */
-    public function test_rest_parse_date( $date, $expected ) {
-        $this->assertEquals( $expected, rest_parse_date( $date ) );
-    }
-
-    public function rest_date_force_utc_provider() {
+     * @dataProvider data_rest_parse_date_force_utc
+     */
+    public function test_rest_parse_date_force_utc( $date, $expected ) {
+        $this->assertSame( $expected, rest_parse_date( $date, true ) );
+    }
+
+    public function data_rest_parse_date_force_utc() {
         return array(
             // Valid dates with timezones.
@@ -903 +914 @@
             array( '2017', false ),
         );
-    }
-
-    /**
-     * @dataProvider rest_date_force_utc_provider
-     */
-    public function test_rest_parse_date_force_utc( $date, $expected ) {
-        $this->assertSame( $expected, rest_parse_date( $date, true ) );
-    }
-
-    public function filter_wp_rest_server_class( $class_name ) {
-        return 'Spy_REST_Server';
     }
 
@@ -1784 +1784 @@
 
     /**
-     * @dataProvider rest_ensure_response_data_provider
+     * @dataProvider data_rest_ensure_response_returns_instance_of_wp_rest_response
      *
      * @param mixed $response      The response passed to rest_ensure_response().
@@ -1800 +1800 @@
      * @return array
      */
-    public function rest_ensure_response_data_provider() {
+    public function data_rest_ensure_response_returns_instance_of_wp_rest_response() {
         return array(
             array( null, null ),