Changeset 55745 for trunk/tests/phpunit/tests/bookmark/getBookmarks.php

Timestamp:

05/11/2023 10:05:51 AM (2 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/bookmark/getBookmarks.php (modified) (8 diffs)

trunk/tests/phpunit/tests/bookmark/getBookmarks.php

@@ -6 +6 @@
 class Tests_Bookmark_GetBookmarks extends WP_UnitTestCase {
     public function test_should_hit_cache() {
-        global $wpdb;
-
         $bookmarks = self::factory()->bookmark->create_many( 2 );
 
@@ -16 +14 @@
         );
 
-        $num_queries = $wpdb->num_queries;
+        $num_queries = get_num_queries();
 
         $found2 = get_bookmarks(
@@ -25 +23 @@
 
         $this->assertSameSets( $found1, $found2 );
-        $this->assertSame( $num_queries, $wpdb->num_queries );
+        $this->assertSame( $num_queries, get_num_queries() );
     }
 
     public function test_adding_bookmark_should_bust_get_bookmarks_cache() {
-        global $wpdb;
-
         $bookmarks = self::factory()->bookmark->create_many( 2 );
 
@@ -40 +36 @@
         );
 
-        $num_queries = $wpdb->num_queries;
+        $num_queries = get_num_queries();
 
         $bookmarks[] = wp_insert_link(
@@ -56 +52 @@
 
         $this->assertEqualSets( $bookmarks, wp_list_pluck( $found2, 'link_id' ) );
-        $this->assertGreaterThan( $num_queries, $wpdb->num_queries );
+        $this->assertGreaterThan( $num_queries, get_num_queries() );
     }
 
@@ -63 +59 @@
      */
     public function test_orderby_rand_should_not_be_cached() {
-        global $wpdb;
-
         $bookmarks = self::factory()->bookmark->create_many( 2 );
 
@@ -73 +67 @@
         );
 
-        $num_queries = $wpdb->num_queries;
+        $num_queries = get_num_queries();
 
         $found2 = get_bookmarks(
@@ -83 +77 @@
         // Equal sets != same order.
         $this->assertEqualSets( $found1, $found2 );
-        $this->assertGreaterThan( $num_queries, $wpdb->num_queries );
+        $this->assertGreaterThan( $num_queries, get_num_queries() );
     }