Changeset 55562 for trunk/tests/phpunit/tests/rest-api/rest-attachments-controller.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/rest-attachments-controller.php (modified) (4 diffs)

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

@@ -136 +136 @@
     }
 
-    public static function disposition_provider() {
+    /**
+     * @dataProvider data_parse_disposition
+     */
+    public function test_parse_disposition( $header, $expected ) {
+        $header_list = array( $header );
+        $parsed      = WP_REST_Attachments_Controller::get_filename_from_disposition( $header_list );
+        $this->assertSame( $expected, $parsed );
+    }
+
+    public static function data_parse_disposition() {
         return array(
             // Types.
@@ -166 +175 @@
             array( 'unknown; notfilename="foo.jpg"', null ),
         );
-    }
-
-    /**
-     * @dataProvider disposition_provider
-     */
-    public function test_parse_disposition( $header, $expected ) {
-        $header_list = array( $header );
-        $parsed      = WP_REST_Attachments_Controller::get_filename_from_disposition( $header_list );
-        $this->assertSame( $expected, $parsed );
     }
 
@@ -1258 +1258 @@
     }
 
-    public static function attachment_roundtrip_provider() {
+    /**
+     * @dataProvider data_attachment_roundtrip_as_author
+     * @requires function imagejpeg
+     */
+    public function test_attachment_roundtrip_as_author( $raw, $expected ) {
+        wp_set_current_user( self::$author_id );
+        $this->assertFalse( current_user_can( 'unfiltered_html' ) );
+        $this->verify_attachment_roundtrip( $raw, $expected );
+    }
+
+    public static function data_attachment_roundtrip_as_author() {
         return array(
             array(
@@ -1353 +1363 @@
             ),
         );
-    }
-
-    /**
-     * @dataProvider attachment_roundtrip_provider
-     * @requires function imagejpeg
-     */
-    public function test_post_roundtrip_as_author( $raw, $expected ) {
-        wp_set_current_user( self::$author_id );
-        $this->assertFalse( current_user_can( 'unfiltered_html' ) );
-        $this->verify_attachment_roundtrip( $raw, $expected );
     }