WordPress.org
Get WordPress

Make WordPress Core


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/tests/phpunit/tests/general/wpGetArchives.php

    r52010 r55745  
    1717     */
    1818    public function test_get_archives_cache() {
    19         global $wpdb;
    20 
    2119        self::factory()->post->create_many( 3, array( 'post_type' => 'post' ) );
    2220        wp_cache_delete( 'last_changed', 'posts' );
    2321        $this->assertFalse( wp_cache_get( 'last_changed', 'posts' ) );
    2422
    25         $num_queries = $wpdb->num_queries;
     23        $num_queries = get_num_queries();
    2624
    2725        // Cache is not primed, expect 1 query.
    … …  
    3533        $time1 = wp_cache_get( 'last_changed', 'posts' );
    3634        $this->assertNotEmpty( $time1 );
    37         $this->assertSame( $num_queries + 1, $wpdb->num_queries );
     35        $this->assertSame( $num_queries + 1, get_num_queries() );
    3836
    39         $num_queries = $wpdb->num_queries;
     37        $num_queries = get_num_queries();
    4038
    4139        // Cache is primed, expect no queries.
    … …  
    4846        $this->assertIsString( $result );
    4947        $this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );
    50         $this->assertSame( $num_queries, $wpdb->num_queries );
     48        $this->assertSame( $num_queries, get_num_queries() );
    5149
    5250        // Change args, resulting in a different query string. Cache is not primed, expect 1 query.
    … …  
    6058        $this->assertIsString( $result );
    6159        $this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );
    62         $this->assertSame( $num_queries + 1, $wpdb->num_queries );
     60        $this->assertSame( $num_queries + 1, get_num_queries() );
    6361
    64         $num_queries = $wpdb->num_queries;
     62        $num_queries = get_num_queries();
    6563
    6664        // Cache is primed, expect no queries.
    … …  
    7472        $this->assertIsString( $result );
    7573        $this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );
    76         $this->assertSame( $num_queries, $wpdb->num_queries );
     74        $this->assertSame( $num_queries, get_num_queries() );
    7775
    78         $num_queries = $wpdb->num_queries;
     76        $num_queries = get_num_queries();
    7977
    8078        // Change type. Cache is not primed, expect 1 query.
    … …  
    8785        $this->assertIsString( $result );
    8886        $this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );
    89         $this->assertSame( $num_queries + 1, $wpdb->num_queries );
     87        $this->assertSame( $num_queries + 1, get_num_queries() );
    9088
    91         $num_queries = $wpdb->num_queries;
     89        $num_queries = get_num_queries();
    9290
    9391        // Cache is primed, expect no queries.
    … …  
    10098        $this->assertIsString( $result );
    10199        $this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );
    102         $this->assertSame( $num_queries, $wpdb->num_queries );
     100        $this->assertSame( $num_queries, get_num_queries() );
    103101
    104102        // Change type. Cache is not primed, expect 1 query.
    … …  
    111109        $this->assertIsString( $result );
    112110        $this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );
    113         $this->assertSame( $num_queries + 1, $wpdb->num_queries );
     111        $this->assertSame( $num_queries + 1, get_num_queries() );
    114112
    115         $num_queries = $wpdb->num_queries;
     113        $num_queries = get_num_queries();
    116114
    117115        // Cache is primed, expect no queries.
    … …  
    124122        $this->assertIsString( $result );
    125123        $this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );
    126         $this->assertSame( $num_queries, $wpdb->num_queries );
     124        $this->assertSame( $num_queries, get_num_queries() );
    127125
    128126        // Change type. Cache is not primed, expect 1 query.
    … …  
    135133        $this->assertIsString( $result );
    136134        $this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );
    137         $this->assertSame( $num_queries + 1, $wpdb->num_queries );
     135        $this->assertSame( $num_queries + 1, get_num_queries() );
    138136
    139         $num_queries = $wpdb->num_queries;
     137        $num_queries = get_num_queries();
    140138
    141139        // Cache is primed, expect no queries.
    … …  
    148146        $this->assertIsString( $result );
    149147        $this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );
    150         $this->assertSame( $num_queries, $wpdb->num_queries );
     148        $this->assertSame( $num_queries, get_num_queries() );
    151149
    152150        // Change type. Cache is not primed, expect 1 query.
    … …  
    159157        $this->assertIsString( $result );
    160158        $this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );
    161         $this->assertSame( $num_queries + 1, $wpdb->num_queries );
     159        $this->assertSame( $num_queries + 1, get_num_queries() );
    162160
    163         $num_queries = $wpdb->num_queries;
     161        $num_queries = get_num_queries();
    164162
    165163        // Cache is primed, expect no queries.
    … …  
    172170        $this->assertIsString( $result );
    173171        $this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );
    174         $this->assertSame( $num_queries, $wpdb->num_queries );
     172        $this->assertSame( $num_queries, get_num_queries() );
    175173    }
    176174}
Note: See TracChangeset for help on using the changeset viewer.