Changeset 53509

Timestamp:

06/15/2022 02:07:24 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Tests: Some improvements for REST API cache priming tests:

• Give the test methods more specific names and move them closer together.
• Correct the @covers tags.

Follow-up to [53499], [53504], [53506], [53507], [53508].

See #55593, #55652.

Location:

trunk/tests/phpunit/tests

Files:

• post/nav-menu.php (modified) (2 diffs)
• rest-api/rest-posts-controller.php (modified) (4 diffs)

trunk/tests/phpunit/tests/post/nav-menu.php

@@ -205 +205 @@
         /**
          * @ticket 55620
-         * @covers update_menu_item_cache
-         */
-        public function test_update_menu_item_cache_primed_posts() {
+         * @covers ::update_menu_item_cache
+         */
+        public function test_update_menu_item_cache_primes_posts() {
                 $post_id = self::factory()->post->create();
                 wp_update_nav_menu_item(
@@ -236 +236 @@
         /**
          * @ticket 55620
-         * @covers update_menu_item_cache
-         */
-        public function test_update_menu_item_cache_primed_terms() {
+         * @covers ::update_menu_item_cache
+         */
+        public function test_update_menu_item_cache_primes_terms() {
                 register_taxonomy( 'wptests_tax', 'post', array( 'hierarchical' => true ) );
                 $term_id = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );

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

@@ -1518 +1518 @@
          * @ticket 55592
          * @covers WP_REST_Posts_Controller::get_items
+         * @covers ::update_post_thumbnail_cache
          */
-        public function test_get_items_with_featured_media() {
+        public function test_get_items_primes_thumbnail_cache_for_featured_media() {
                 $file           = DIR_TESTDATA . '/images/canola.jpg';
                 $attachment_ids = array();
@@ -1535 +1536 @@
                 }
 
-                // Attachment creation warms thumbnail ids. Needs clean up for test.
+                // Attachment creation warms thumbnail IDs. Needs clean up for test.
                 wp_cache_delete_multiple( $attachment_ids, 'posts' );
 
@@ -1549 +1550 @@
                 $this->assertIsArray( $last, 'The last value is not an array' );
                 $this->assertEqualSets( $attachment_ids, $last[1] );
+        }
+
+        /**
+         * @ticket 55593
+         * @covers WP_REST_Posts_Controller::get_items
+         * @covers ::update_post_parent_caches
+         */
+        public function test_get_items_primes_parent_post_caches() {
+                $parent_id1 = self::$post_ids[0];
+                $parent_id2 = self::$post_ids[1];
+                $parent_ids = array( $parent_id2, $parent_id1 );
+
+                $this->factory->attachment->create_object(
+                        DIR_TESTDATA . '/images/canola.jpg',
+                        $parent_id1,
+                        array(
+                                'post_mime_type' => 'image/jpeg',
+                                'post_excerpt'   => 'A sample caption 1',
+                        )
+                );
+
+                $this->factory->attachment->create_object(
+                        DIR_TESTDATA . '/images/canola.jpg',
+                        $parent_id2,
+                        array(
+                                'post_mime_type' => 'image/jpeg',
+                                'post_excerpt'   => 'A sample caption 2',
+                        )
+                );
+
+                // Attachment creation warms parent IDs. Needs clean up for test.
+                wp_cache_delete_multiple( $parent_ids, 'posts' );
+
+                $filter = new MockAction();
+                add_filter( 'update_post_metadata_cache', array( $filter, 'filter' ), 10, 2 );
+
+                $request = new WP_REST_Request( 'GET', '/wp/v2/media' );
+                rest_get_server()->dispatch( $request );
+
+                $args = $filter->get_args();
+                $last = end( $args );
+                $this->assertIsArray( $last, 'The last value is not an array' );
+                $this->assertEqualSets( $parent_ids, $last[1] );
         }
 
@@ -1786 +1830 @@
 
                 $this->assertSame( $formats, $data['schema']['properties']['format']['enum'] );
-        }
-
-        /**
-         * @ticket 55593
-         * @covers WP_REST_Posts_Controller::get_items
-         * @covers update_post_parent_caches
-         */
-        public function test_get_items_parent_ids_primed() {
-                $parent_id1 = self::$post_ids[0];
-                $parent_id2 = self::$post_ids[1];
-                $parent_ids = array( $parent_id2, $parent_id1 );
-
-                $this->factory->attachment->create_object(
-                        DIR_TESTDATA . '/images/canola.jpg',
-                        $parent_id1,
-                        array(
-                                'post_mime_type' => 'image/jpeg',
-                                'post_excerpt'   => 'A sample caption 1',
-                        )
-                );
-
-                $this->factory->attachment->create_object(
-                        DIR_TESTDATA . '/images/canola.jpg',
-                        $parent_id2,
-                        array(
-                                'post_mime_type' => 'image/jpeg',
-                                'post_excerpt'   => 'A sample caption 2',
-                        )
-                );
-
-                // Attachment creation warms parent ids. Needs clean up for test.
-                wp_cache_delete_multiple( $parent_ids, 'posts' );
-
-                $filter = new MockAction();
-                add_filter( 'update_post_metadata_cache', array( $filter, 'filter' ), 10, 2 );
-
-                $request = new WP_REST_Request( 'GET', '/wp/v2/media' );
-                rest_get_server()->dispatch( $request );
-
-                $args = $filter->get_args();
-                $last = end( $args );
-                $this->assertIsArray( $last, 'The last value is not an array' );
-                $this->assertEqualSets( $parent_ids, $last[1] );
         }