Changeset 52577

Timestamp:

01/14/2022 05:50:52 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Tests: Avoid duplicate queries in some WP_Query tests.

When passing args to the WP_Query::__construct() method, it internally executes the WP_Query::get_posts() method and stores the result in the WP_Query::posts property.

When calling WP_Query::get_posts() again, the same SQL query gets executed, and the result is again stored in the WP_Query::posts property.

Thus, the correct usage is to read the posts already stored in the WP_Query::posts property.

Follow-up to [1062/tests], [1065/tests], [1066/tests], [1070/tests], [29805], [31286], [49900], [51144].

Props david.binda.
Fixes #54822.

Location:

trunk/tests/phpunit/tests/query

Files:

• invalidQueries.php (modified) (4 diffs)
• taxQuery.php (modified) (2 diffs)

trunk/tests/phpunit/tests/query/invalidQueries.php

@@ -92 +92 @@
 
                 $query = new WP_Query( array( 'post_type' => 'unregistered_cpt' ) );
-                $posts = $query->get_posts();
 
                 $this->assertStringContainsString( "{$wpdb->posts}.post_type = 'unregistered_cpt'", self::$last_posts_request );
                 $this->assertStringContainsString( "{$wpdb->posts}.post_status = 'publish'", self::$last_posts_request );
-                $this->assertCount( 0, $posts );
+                $this->assertCount( 0, $query->posts );
         }
 
@@ -112 +111 @@
                         )
                 );
-                $posts = $query->get_posts();
 
                 $this->assertStringContainsString( "{$wpdb->posts}.post_type = 'unregistered_cpt'", self::$last_posts_request );
-                $this->assertCount( 1, $posts, 'the valid `page` post type should still return one post' );
+                $this->assertCount( 1, $query->posts, 'the valid `page` post type should still return one post' );
         }
 
@@ -144 +142 @@
                         )
                 );
-                $posts = $query->get_posts();
 
                 // Only the published page should be returned.
-                $this->assertCount( 1, $posts );
+                $this->assertCount( 1, $query->posts );
         }
 
@@ -159 +156 @@
                         )
                 );
-                $posts = $query->get_posts();
 
                 // Only the published post should be returned.
-                $this->assertCount( 1, $posts );
+                $this->assertCount( 1, $query->posts );
         }
 }

trunk/tests/phpunit/tests/query/taxQuery.php

@@ -1025 +1025 @@
                 );
 
-                $posts = $query->get_posts();
-                $this->assertCount( 0, $posts );
+                $this->assertCount( 0, $query->posts );
         }
 
@@ -1060 +1059 @@
                 );
 
-                $posts = $query->get_posts();
-                $this->assertCount( 0, $posts );
+                $this->assertCount( 0, $query->posts );
         }