Changeset 55562 for trunk/tests/phpunit/tests/formatting/redirect.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/formatting/redirect.php (modified) (7 diffs)

trunk/tests/phpunit/tests/formatting/redirect.php

@@ -19 +19 @@
      * @ticket 44317
      *
-     * @dataProvider get_bad_status_codes
+     * @dataProvider data_wp_redirect_bad_status_code
      *
      * @covers ::wp_redirect
@@ -32 +32 @@
     }
 
-    public function get_bad_status_codes() {
+    public function data_wp_redirect_bad_status_code() {
         return array(
             // Tests for bad arguments.
@@ -74 +74 @@
 
     /**
-     * @dataProvider valid_url_provider
+     * @dataProvider data_wp_validate_redirect_valid_url
      *
      * @covers ::wp_validate_redirect
@@ -82 +82 @@
     }
 
-    /**
-     * @dataProvider invalid_url_provider
-     *
-     * @covers ::wp_validate_redirect
-     */
-    public function test_wp_validate_redirect_invalid_url( $url ) {
-        $this->assertEquals( false, wp_validate_redirect( $url, false ) );
-    }
-
-    public function valid_url_provider() {
+    public function data_wp_validate_redirect_valid_url() {
         return array(
             array( 'http://example.com', 'http://example.com' ),
@@ -107 +98 @@
     }
 
-    public function invalid_url_provider() {
+    /**
+     * @dataProvider data_wp_validate_redirect_invalid_url
+     *
+     * @covers ::wp_validate_redirect
+     */
+    public function test_wp_validate_redirect_invalid_url( $url ) {
+        $this->assertEquals( false, wp_validate_redirect( $url, false ) );
+    }
+
+    public function data_wp_validate_redirect_invalid_url() {
         return array(
             // parse_url() fails.
@@ -177 +177 @@
     /**
      * @ticket 47980
-     * @dataProvider relative_url_provider
+     * @dataProvider data_wp_validate_redirect_relative_url
      *
      * @covers ::wp_validate_redirect
@@ -212 +212 @@
      * }
      */
-    public function relative_url_provider() {
+    public function data_wp_validate_redirect_relative_url() {
         return array(
             array(