WordPress.org
Get WordPress

Make WordPress Core


Ignore:
Timestamp:
05/11/2023 10:05:51 AM (21 months 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:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/tests/phpunit/tests/post/getPages.php

    r55590 r55745  
    1111     */
    1212    public function test_get_pages_cache() {
    13         global $wpdb;
    14 
    1513        self::factory()->post->create_many( 3, array( 'post_type' => 'page' ) );
    1614        wp_cache_delete( 'last_changed', 'posts' );
    … …  
    2119        $time1 = wp_cache_get( 'last_changed', 'posts' );
    2220        $this->assertNotEmpty( $time1 );
    23         $num_queries = $wpdb->num_queries;
     21        $num_queries = get_num_queries();
    2422        foreach ( $pages as $page ) {
    2523            $this->assertInstanceOf( 'WP_Post', $page );
    … …  
    3028        $this->assertCount( 3, $pages );
    3129        $this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );
    32         $this->assertSame( $num_queries, $wpdb->num_queries );
     30        $this->assertSame( $num_queries, get_num_queries() );
    3331        foreach ( $pages as $page ) {
    3432            $this->assertInstanceOf( 'WP_Post', $page );
    … …  
    4038        $this->assertCount( 2, $pages );
    4139        $this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );
    42         $this->assertSame( $num_queries + 1, $wpdb->num_queries );
     40        $this->assertSame( $num_queries + 1, get_num_queries() );
    4341        foreach ( $pages as $page ) {
    4442            $this->assertInstanceOf( 'WP_Post', $page );
    4543        }
    4644
    47         $num_queries = $wpdb->num_queries;
     45        $num_queries = get_num_queries();
    4846
    4947        // Again. num_queries and last_changed should remain the same.
    … …  
    5149        $this->assertCount( 2, $pages );
    5250        $this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );
    53         $this->assertSame( $num_queries, $wpdb->num_queries );
     51        $this->assertSame( $num_queries, get_num_queries() );
    5452        foreach ( $pages as $page ) {
    5553            $this->assertInstanceOf( 'WP_Post', $page );
    … …  
    6058        $this->assertCount( 3, $pages );
    6159        $this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );
    62         $this->assertSame( $num_queries, $wpdb->num_queries );
     60        $this->assertSame( $num_queries, get_num_queries() );
    6361        foreach ( $pages as $page ) {
    6462            $this->assertInstanceOf( 'WP_Post', $page );
    … …  
    6967        $this->assertNotEquals( $time1, $time2 = wp_cache_get( 'last_changed', 'posts' ) );
    7068        get_post( $pages[0]->ID );
    71         $num_queries = $wpdb->num_queries;
     69        $num_queries = get_num_queries();
    7270
    7371        // last_changed bumped so num_queries should increment.
    … …  
    7573        $this->assertCount( 2, $pages );
    7674        $this->assertSame( $time2, wp_cache_get( 'last_changed', 'posts' ) );
    77         $this->assertSame( $num_queries + 1, $wpdb->num_queries );
     75        $this->assertSame( $num_queries + 1, get_num_queries() );
    7876        foreach ( $pages as $page ) {
    7977            $this->assertInstanceOf( 'WP_Post', $page );
    … …  
    8886        $this->assertGreaterThan( $old_changed_float, $new_changed_float );
    8987
    90         $num_queries  = $wpdb->num_queries;
     88        $num_queries  = get_num_queries();
    9189        $last_changed = wp_cache_get( 'last_changed', 'posts' );
    9290
    … …  
    9593        $this->assertCount( 2, $pages );
    9694        $this->assertSame( $last_changed, wp_cache_get( 'last_changed', 'posts' ) );
    97         $this->assertSame( $num_queries + 1, $wpdb->num_queries );
     95        $this->assertSame( $num_queries + 1, get_num_queries() );
    9896        foreach ( $pages as $page ) {
    9997            $this->assertInstanceOf( 'WP_Post', $page );
    … …  
    105103     */
    106104    public function test_get_pages_cache_empty() {
    107         global $wpdb;
    108 
    109105        wp_cache_delete( 'last_changed', 'posts' );
    110106        $this->assertFalse( wp_cache_get( 'last_changed', 'posts' ) );
    111107
    112         $num_queries = $wpdb->num_queries;
     108        $num_queries = get_num_queries();
    113109
    114110        $pages = get_pages(); // Database gets queried.
    115111
    116         $this->assertSame( $num_queries + 1, $wpdb->num_queries );
    117 
    118         $num_queries = $wpdb->num_queries;
     112        $this->assertSame( $num_queries + 1, get_num_queries() );
     113
     114        $num_queries = get_num_queries();
    119115
    120116        $pages = get_pages(); // Database should not get queried.
    121117
    122         $this->assertSame( $num_queries, $wpdb->num_queries );
     118        $this->assertSame( $num_queries, get_num_queries() );
    123119    }
    124120
Note: See TracChangeset for help on using the changeset viewer.