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

trunk/tests/phpunit/tests/multisite/siteMeta.php

@@ -221 +221 @@
 
                 public function test_update_site_meta_cache() {
-                        global $wpdb;
-
                         if ( ! is_site_meta_supported() ) {
                                 $this->markTestSkipped( 'Test only runs with the blogmeta database table installed.' );
@@ -230 +228 @@
                         update_sitemeta_cache( array( self::$site_id ) );
 
-                        $num_queries = $wpdb->num_queries;
+                        $num_queries = get_num_queries();
                         get_site_meta( self::$site_id, 'foo', true );
-                        $this->assertSame( $num_queries, $wpdb->num_queries );
+                        $this->assertSame( $num_queries, get_num_queries() );
                 }
 
                 public function test_query_update_site_meta_cache_true() {
-                        global $wpdb;
-
                         if ( ! is_site_meta_supported() ) {
                                 $this->markTestSkipped( 'Test only runs with the blogmeta database table installed.' );
@@ -251 +247 @@
                         );
 
-                        $num_queries = $wpdb->num_queries;
+                        $num_queries = get_num_queries();
                         get_site_meta( self::$site_id, 'foo', true );
-                        $this->assertSame( $num_queries, $wpdb->num_queries );
+                        $this->assertSame( $num_queries, get_num_queries() );
                 }
 
                 public function test_query_update_site_meta_cache_false() {
-                        global $wpdb;
-
                         if ( ! is_site_meta_supported() ) {
                                 $this->markTestSkipped( 'Test only runs with the blogmeta database table installed.' );
@@ -272 +266 @@
                         );
 
-                        $num_queries = $wpdb->num_queries;
+                        $num_queries = get_num_queries();
                         get_site_meta( self::$site_id, 'foo', true );
-                        $this->assertSame( $num_queries + 1, $wpdb->num_queries );
+                        $this->assertSame( $num_queries + 1, get_num_queries() );
                 }