Changeset 55745 for trunk/tests/phpunit/tests/query/commentFeed.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/query/commentFeed.php (modified) (5 diffs)

trunk/tests/phpunit/tests/query/commentFeed.php

@@ -29 +29 @@
          */
         public function test_archive_comment_feed() {
-                global $wpdb;
                 add_filter( 'split_the_query', '__return_false' );
                 $q1   = new WP_Query();
@@ -43 +42 @@
                 );
                 $q1->query( $args );
-                $num_queries = $wpdb->num_queries;
+                $num_queries = get_num_queries();
                 $q2          = new WP_Query();
                 $q2->query( $args );
                 $this->assertTrue( $q2->is_comment_feed() );
                 $this->assertFalse( $q2->is_singular() );
-                $this->assertSame( $num_queries + 1, $wpdb->num_queries );
+                $this->assertSame( $num_queries + 1, get_num_queries() );
         }
 
@@ -88 +87 @@
          */
         public function test_single_comment_feed() {
-                global $wpdb;
                 $post = get_post( self::$post_ids[0] );
 
@@ -104 +102 @@
 
                 $q1->query( $args );
-                $num_queries = $wpdb->num_queries;
+                $num_queries = get_num_queries();
                 $q2          = new WP_Query();
                 $q2->query( $args );
@@ -110 +108 @@
                 $this->assertTrue( $q2->is_comment_feed() );
                 $this->assertTrue( $q2->is_singular() );
-                $this->assertSame( $num_queries + 1, $wpdb->num_queries );
+                $this->assertSame( $num_queries + 1, get_num_queries() );
         }
 }