Changeset 55745 for trunk/tests/phpunit/tests/multisite/wpSiteQuery.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/multisite/wpSiteQuery.php (modified) (10 diffs)

trunk/tests/phpunit/tests/multisite/wpSiteQuery.php

@@ -780 +780 @@
                  */
                 public function test_wp_site_query_cache_with_different_fields_no_count() {
-                        global $wpdb;
                         $q                 = new WP_Site_Query();
                         $query_1           = $q->query(
@@ -790 +789 @@
                                 )
                         );
-                        $number_of_queries = $wpdb->num_queries;
+                        $number_of_queries = get_num_queries();
 
                         $query_2 = $q->query(
@@ -801 +800 @@
                         );
 
-                        $this->assertSame( $number_of_queries, $wpdb->num_queries );
+                        $this->assertSame( $number_of_queries, get_num_queries() );
                 }
 
@@ -808 +807 @@
                  */
                 public function test_wp_site_query_cache_with_different_fields_active_count() {
-                        global $wpdb;
                         $q = new WP_Site_Query();
 
@@ -820 +818 @@
                                 )
                         );
-                        $number_of_queries = $wpdb->num_queries;
+                        $number_of_queries = get_num_queries();
 
                         $query_2 = $q->query(
@@ -831 +829 @@
                                 )
                         );
-                        $this->assertSame( $number_of_queries, $wpdb->num_queries );
+                        $this->assertSame( $number_of_queries, get_num_queries() );
                 }
 
@@ -838 +836 @@
                  */
                 public function test_wp_site_query_cache_with_same_fields_different_count() {
-                        global $wpdb;
                         $q = new WP_Site_Query();
 
@@ -861 +858 @@
                                 )
                         );
-                        $this->assertSame( $number_of_queries + 1, $wpdb->num_queries );
+                        $this->assertSame( $number_of_queries + 1, get_num_queries() );
                 }
 
@@ -1120 +1117 @@
                  */
                 public function test_sites_pre_query_filter_should_bypass_database_query() {
-                        global $wpdb;
-
                         add_filter( 'sites_pre_query', array( __CLASS__, 'filter_sites_pre_query' ), 10, 2 );
 
-                        $num_queries = $wpdb->num_queries;
+                        $num_queries = get_num_queries();
 
                         $q       = new WP_Site_Query();
@@ -1132 +1127 @@
 
                         // Make sure no queries were executed.
-                        $this->assertSame( $num_queries, $wpdb->num_queries );
+                        $this->assertSame( $num_queries, get_num_queries() );
 
                         // We manually inserted a non-existing site and overrode the results with it.