Changeset 55745 for trunk/tests/phpunit/tests/post/getPageByPath.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/post/getPageByPath.php (modified) (9 diffs)

trunk/tests/phpunit/tests/post/getPageByPath.php

@@ -261 +261 @@
      */
     public function test_should_hit_cache() {
-        global $wpdb;
-
         $page = self::factory()->post->create(
             array(
@@ -274 +272 @@
         $this->assertSame( $page, $found->ID );
 
-        $num_queries = $wpdb->num_queries;
-
-        $found = get_page_by_path( 'foo' );
-        $this->assertSame( $page, $found->ID );
-        $this->assertSame( $num_queries, $wpdb->num_queries );
+        $num_queries = get_num_queries();
+
+        $found = get_page_by_path( 'foo' );
+        $this->assertSame( $page, $found->ID );
+        $this->assertSame( $num_queries, get_num_queries() );
     }
 
@@ -285 +283 @@
      */
     public function test_bad_path_should_be_cached() {
-        global $wpdb;
-
         // Prime cache.
         $found = get_page_by_path( 'foo' );
         $this->assertNull( $found );
 
-        $num_queries = $wpdb->num_queries;
-
-        $found = get_page_by_path( 'foo' );
-        $this->assertNull( $found );
-        $this->assertSame( $num_queries, $wpdb->num_queries );
+        $num_queries = get_num_queries();
+
+        $found = get_page_by_path( 'foo' );
+        $this->assertNull( $found );
+        $this->assertSame( $num_queries, get_num_queries() );
     }
 
@@ -302 +298 @@
      */
     public function test_bad_path_served_from_cache_should_not_fall_back_on_current_post() {
-        global $wpdb, $post;
+        global $post;
 
         // Fake the global.
@@ -311 +307 @@
         $this->assertNull( $found );
 
-        $num_queries = $wpdb->num_queries;
-
-        $found = get_page_by_path( 'foo' );
-        $this->assertNull( $found );
-        $this->assertSame( $num_queries, $wpdb->num_queries );
+        $num_queries = get_num_queries();
+
+        $found = get_page_by_path( 'foo' );
+        $this->assertNull( $found );
+        $this->assertSame( $num_queries, get_num_queries() );
 
         unset( $post );
@@ -324 +320 @@
      */
     public function test_cache_should_not_match_post_in_different_post_type_with_same_path() {
-        global $wpdb;
-
         register_post_type( 'wptests_pt' );
 
@@ -346 +340 @@
         $this->assertSame( $p1, $found->ID );
 
-        $num_queries = $wpdb->num_queries;
+        $num_queries = get_num_queries();
 
         $found = get_page_by_path( 'foo', OBJECT, 'wptests_pt' );
         $this->assertSame( $p2, $found->ID );
         $num_queries++;
-        $this->assertSame( $num_queries, $wpdb->num_queries );
+        $this->assertSame( $num_queries, get_num_queries() );
     }
 
@@ -358 +352 @@
      */
     public function test_cache_should_be_invalidated_when_post_name_is_edited() {
-        global $wpdb;
-
         $page = self::factory()->post->create(
             array(
@@ -378 +370 @@
         );
 
-        $num_queries = $wpdb->num_queries;
+        $num_queries = get_num_queries();
 
         $found = get_page_by_path( 'bar' );
         $this->assertSame( $page, $found->ID );
         $num_queries++;
-        $this->assertSame( $num_queries, $wpdb->num_queries );
+        $this->assertSame( $num_queries, get_num_queries() );
     }