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/term/getTerms.php

    r55671 r55745  
    135135     */
    136136    public function test_get_terms_cache() {
    137         global $wpdb;
    138 
    139137        $this->set_up_three_posts_and_tags();
    140138
    141         $num_queries = $wpdb->num_queries;
     139        $num_queries = get_num_queries();
    142140
    143141        // last_changed and num_queries should bump.
    … …  
    146144        $time1 = wp_cache_get( 'last_changed', 'terms' );
    147145        $this->assertNotEmpty( $time1 );
    148         $this->assertSame( $num_queries + 2, $wpdb->num_queries );
    149 
    150         $num_queries = $wpdb->num_queries;
     146        $this->assertSame( $num_queries + 2, get_num_queries() );
     147
     148        $num_queries = get_num_queries();
    151149
    152150        // Again. last_changed and num_queries should remain the same.
    … …  
    154152        $this->assertCount( 3, $terms );
    155153        $this->assertSame( $time1, wp_cache_get( 'last_changed', 'terms' ) );
    156         $this->assertSame( $num_queries, $wpdb->num_queries );
     154        $this->assertSame( $num_queries, get_num_queries() );
    157155    }
    158156
    … …  
    168166        $terms       = get_terms( 'post_tag' );
    169167        $time1       = wp_cache_get( 'last_changed', 'terms' );
    170         $num_queries = $wpdb->num_queries;
     168        $num_queries = get_num_queries();
    171169
    172170        // num_queries should bump, last_changed should remain the same.
    … …  
    174172        $this->assertCount( 2, $terms );
    175173        $this->assertSame( $time1, wp_cache_get( 'last_changed', 'terms' ) );
    176         $this->assertSame( $num_queries + 1, $wpdb->num_queries );
    177 
    178         $num_queries = $wpdb->num_queries;
     174        $this->assertSame( $num_queries + 1, get_num_queries() );
     175
     176        $num_queries = get_num_queries();
    179177
    180178        // Again. last_changed and num_queries should remain the same.
    … …  
    182180        $this->assertCount( 2, $terms );
    183181        $this->assertSame( $time1, wp_cache_get( 'last_changed', 'terms' ) );
    184         $this->assertSame( $num_queries, $wpdb->num_queries );
     182        $this->assertSame( $num_queries, get_num_queries() );
    185183    }
    186184
    … …  
    196194        $terms       = get_terms( 'post_tag' );
    197195        $time1       = wp_cache_get( 'last_changed', 'terms' );
    198         $num_queries = $wpdb->num_queries;
     196        $num_queries = get_num_queries();
    199197
    200198        // Force last_changed to bump.
    201199        wp_delete_term( $terms[0]->term_id, 'post_tag' );
    202200
    203         $num_queries = $wpdb->num_queries;
     201        $num_queries = get_num_queries();
    204202        $time2       = wp_cache_get( 'last_changed', 'terms' );
    205203        $this->assertNotEquals( $time1, $time2 );
    … …  
    209207        $this->assertCount( 2, $terms );
    210208        $this->assertSame( $time2, wp_cache_get( 'last_changed', 'terms' ) );
    211         $this->assertSame( $num_queries + 1, $wpdb->num_queries );
    212 
    213         $num_queries = $wpdb->num_queries;
     209        $this->assertSame( $num_queries + 1, get_num_queries() );
     210
     211        $num_queries = get_num_queries();
    214212
    215213        // Again. last_changed and num_queries should remain the same.
    … …  
    217215        $this->assertCount( 2, $terms );
    218216        $this->assertSame( $time2, wp_cache_get( 'last_changed', 'terms' ) );
    219         $this->assertSame( $num_queries, $wpdb->num_queries );
     217        $this->assertSame( $num_queries, get_num_queries() );
    220218
    221219        // @todo Repeat with term insert and update.
    … …  
    849847     */
    850848    public function test_child_of_should_skip_query_when_specified_parent_is_not_found_in_hierarchy_cache() {
    851         global $wpdb;
    852 
    853849        register_taxonomy( 'wptests_tax', 'post', array( 'hierarchical' => true ) );
    854850
    855851        $terms = self::factory()->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
    856852
    857         $num_queries = $wpdb->num_queries;
     853        $num_queries = get_num_queries();
    858854
    859855        $found = get_terms(
    … …  
    866862
    867863        $this->assertEmpty( $found );
    868         $this->assertSame( $num_queries, $wpdb->num_queries );
     864        $this->assertSame( $num_queries, get_num_queries() );
    869865    }
    870866
    … …  
    24742470     */
    24752471    public function test_parent_should_skip_query_when_specified_parent_is_not_found_in_hierarchy_cache() {
    2476         global $wpdb;
    2477 
    24782472        register_taxonomy( 'wptests_tax', 'post', array( 'hierarchical' => true ) );
    24792473
    24802474        $terms = self::factory()->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
    24812475
    2482         $num_queries = $wpdb->num_queries;
     2476        $num_queries = get_num_queries();
    24832477
    24842478        $found = get_terms(
    … …  
    24912485
    24922486        $this->assertEmpty( $found );
    2493         $this->assertSame( $num_queries, $wpdb->num_queries );
     2487        $this->assertSame( $num_queries, get_num_queries() );
    24942488    }
    24952489
    … …  
    27742768        );
    27752769
    2776         $num_queries = $wpdb->num_queries;
     2770        $num_queries = get_num_queries();
    27772771
    27782772        foreach ( $terms as $t ) {
    … …  
    27802774        }
    27812775
    2782         $this->assertSame( $num_queries + 1, $wpdb->num_queries );
     2776        $this->assertSame( $num_queries + 1, get_num_queries() );
    27832777    }
    27842778
    … …  
    28042798        );
    28052799
    2806         $num_queries = $wpdb->num_queries;
     2800        $num_queries = get_num_queries();
    28072801
    28082802        foreach ( $terms as $t ) {
    … …  
    28102804        }
    28112805
    2812         $this->assertSame( $num_queries + 3, $wpdb->num_queries );
     2806        $this->assertSame( $num_queries + 3, get_num_queries() );
    28132807    }
    28142808
    … …  
    29092903        );
    29102904
    2911         $num_queries = $wpdb->num_queries;
     2905        $num_queries = get_num_queries();
    29122906
    29132907        $found = get_terms(
    … …  
    29192913        );
    29202914
    2921         $this->assertSame( $num_queries, $wpdb->num_queries );
     2915        $this->assertSame( $num_queries, get_num_queries() );
    29222916
    29232917        $this->assertNotEmpty( $found );
    … …  
    29322926     */
    29332927    public function test_should_prime_individual_term_cache_when_fields_is_all() {
    2934         global $wpdb;
    2935 
    29362928        register_taxonomy( 'wptests_tax', 'post' );
    29372929        $terms = self::factory()->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
    … …  
    29452937        );
    29462938
    2947         $num_queries = $wpdb->num_queries;
     2939        $num_queries = get_num_queries();
    29482940        $term0       = get_term( $terms[0] );
    2949         $this->assertSame( $num_queries, $wpdb->num_queries );
     2941        $this->assertSame( $num_queries, get_num_queries() );
    29502942
    29512943    }
Note: See TracChangeset for help on using the changeset viewer.