Changeset 55745 for trunk/tests/phpunit/tests/comment/metaCache.php

Timestamp:

05/11/2023 10:05:51 AM (3 years ago)

Author:

spacedmonkey

Message:

Tests: Use the function get_num_queries across all unit tests.

Replace use of $wpdb->num_queries with a function call to get_num_queries. This improves readability and consistency between tests.

Props SergeyBiryukov, peterwilsoncc, spacedmonkey.
See #57841.

File:

• trunk/tests/phpunit/tests/comment/metaCache.php (modified) (12 diffs)

trunk/tests/phpunit/tests/comment/metaCache.php

@@ -13 +13 @@
          */
         public function test_update_comment_meta_cache_should_default_to_true() {
-                global $wpdb;
-
                 $p           = self::factory()->post->create( array( 'post_status' => 'publish' ) );
                 $comment_ids = self::factory()->comment->create_post_comments( $p, 3 );
@@ -31 +29 @@
                 );
 
-                $num_queries = $wpdb->num_queries;
+                $num_queries = get_num_queries();
                 foreach ( $comment_ids as $cid ) {
                         get_comment_meta( $cid, 'foo', 'bar' );
                 }
 
-                $this->assertSame( $num_queries, $wpdb->num_queries );
+                $this->assertSame( $num_queries, get_num_queries() );
         }
 
@@ -45 +43 @@
          */
         public function test_update_comment_meta_cache_true() {
-                global $wpdb;
-
                 $p           = self::factory()->post->create( array( 'post_status' => 'publish' ) );
                 $comment_ids = self::factory()->comment->create_post_comments( $p, 3 );
@@ -64 +60 @@
                 );
 
-                $num_queries = $wpdb->num_queries;
+                $num_queries = get_num_queries();
                 foreach ( $comment_ids as $cid ) {
                         get_comment_meta( $cid, 'foo', 'bar' );
                 }
 
-                $this->assertSame( $num_queries, $wpdb->num_queries );
+                $this->assertSame( $num_queries, get_num_queries() );
         }
 
@@ -78 +74 @@
          */
         public function test_update_comment_meta_cache_false() {
-                global $wpdb;
-
                 $p           = self::factory()->post->create( array( 'post_status' => 'publish' ) );
                 $comment_ids = self::factory()->comment->create_post_comments( $p, 3 );
@@ -94 +88 @@
                 );
 
-                $num_queries = $wpdb->num_queries;
+                $num_queries = get_num_queries();
                 foreach ( $comment_ids as $cid ) {
                         get_comment_meta( $cid, 'foo', 'bar' );
                 }
 
-                $this->assertSame( $num_queries + 3, $wpdb->num_queries );
+                $this->assertSame( $num_queries + 3, get_num_queries() );
         }
 
@@ -108 +102 @@
          */
         public function test_comment_meta_should_be_lazy_loaded_for_all_comments_in_comments_template() {
-                global $wpdb;
-
                 $p           = self::factory()->post->create( array( 'post_status' => 'publish' ) );
                 $comment_ids = self::factory()->comment->create_post_comments( $p, 3 );
@@ -127 +119 @@
 
                                 // First request will hit the database.
-                                $num_queries = $wpdb->num_queries;
+                                $num_queries = get_num_queries();
                                 get_comment_meta( $comment_ids[0], 'sauce' );
-                                $this->assertSame( $num_queries + 1, $wpdb->num_queries );
+                                $this->assertSame( $num_queries + 1, get_num_queries() );
 
                                 // Second and third requests should be in cache.
                                 get_comment_meta( $comment_ids[1], 'sauce' );
                                 get_comment_meta( $comment_ids[2], 'sauce' );
-                                $this->assertSame( $num_queries + 1, $wpdb->num_queries );
+                                $this->assertSame( $num_queries + 1, get_num_queries() );
                         }
                 }
@@ -145 +137 @@
          */
         public function test_comment_meta_should_be_lazy_loaded_in_comment_feed_queries() {
-                global $wpdb;
-
                 $posts = self::factory()->post->create_many( 2, array( 'post_status' => 'publish' ) );
 
@@ -174 +164 @@
 
                 // First comment will cause the cache to be primed.
-                $num_queries = $wpdb->num_queries;
+                $num_queries = get_num_queries();
                 $this->assertSame( 'bar', get_comment_meta( $comments[0], 'foo', 'bar' ) );
                 $num_queries++;
-                $this->assertSame( $num_queries, $wpdb->num_queries );
+                $this->assertSame( $num_queries, get_num_queries() );
 
                 // Second comment from the results should not cause more queries.
                 $this->assertSame( 'bar', get_comment_meta( $comments[1], 'foo', 'bar' ) );
-                $this->assertSame( $num_queries, $wpdb->num_queries );
+                $this->assertSame( $num_queries, get_num_queries() );
 
                 // A comment from outside the results will not be primed.
                 $this->assertSame( 'bar', get_comment_meta( $comments[4], 'foo', 'bar' ) );
                 $num_queries++;
-                $this->assertSame( $num_queries, $wpdb->num_queries );
+                $this->assertSame( $num_queries, get_num_queries() );
         }
 
@@ -195 +185 @@
          */
         public function test_comment_meta_should_be_lazy_loaded_in_single_post_comment_feed_queries() {
-                global $wpdb;
-
                 $posts = self::factory()->post->create_many( 2, array( 'post_status' => 'publish' ) );
 
@@ -225 +213 @@
 
                 // First comment will cause the cache to be primed.
-                $num_queries = $wpdb->num_queries;
+                $num_queries = get_num_queries();
                 $this->assertSame( 'bar', get_comment_meta( $comments[0], 'foo', 'bar' ) );
                 $num_queries++;
-                $this->assertSame( $num_queries, $wpdb->num_queries );
+                $this->assertSame( $num_queries, get_num_queries() );
 
                 // Second comment from the results should not cause more queries.
                 $this->assertSame( 'bar', get_comment_meta( $comments[1], 'foo', 'bar' ) );
-                $this->assertSame( $num_queries, $wpdb->num_queries );
+                $this->assertSame( $num_queries, get_num_queries() );
 
                 // A comment from outside the results will not be primed.
                 $this->assertSame( 'bar', get_comment_meta( $comments[4], 'foo', 'bar' ) );
                 $num_queries++;
-                $this->assertSame( $num_queries, $wpdb->num_queries );
+                $this->assertSame( $num_queries, get_num_queries() );
         }