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/comment/query.php

    r54704 r55745  
    35893589     */
    35903590    public function test_comment_cache_key_should_ignore_custom_params() {
    3591         global $wpdb;
    3592 
    35933591        $p = self::factory()->post->create();
    35943592        $c = self::factory()->comment->create( array( 'comment_post_ID' => $p ) );
    … …  
    36023600        );
    36033601
    3604         $num_queries = $wpdb->num_queries;
     3602        $num_queries = get_num_queries();
    36053603
    36063604        $q2 = new WP_Comment_Query();
    … …  
    36133611        );
    36143612
    3615         $this->assertSame( $num_queries, $wpdb->num_queries );
     3613        $this->assertSame( $num_queries, get_num_queries() );
    36163614    }
    36173615
    … …  
    36303628        );
    36313629
    3632         $num_queries = $wpdb->num_queries;
     3630        $num_queries = get_num_queries();
    36333631
    36343632        $q2 = new WP_Comment_Query(
    … …  
    36383636        );
    36393637
    3640         $this->assertNotEquals( $num_queries, $wpdb->num_queries );
     3638        $this->assertNotEquals( $num_queries, get_num_queries() );
    36413639    }
    36423640
    … …  
    36553653        );
    36563654
    3657         $num_queries = $wpdb->num_queries;
     3655        $num_queries = get_num_queries();
    36583656
    36593657        $q2 = new WP_Comment_Query(
    … …  
    36633661        );
    36643662
    3665         $this->assertNotEquals( $num_queries, $wpdb->num_queries );
     3663        $this->assertNotEquals( $num_queries, get_num_queries() );
    36663664    }
    36673665
    … …  
    44284426        $q1_ids = wp_list_pluck( $q1->comments, 'comment_ID' );
    44294427
    4430         $num_queries = $wpdb->num_queries;
     4428        $num_queries = get_num_queries();
    44314429        $q2          = new WP_Comment_Query(
    44324430            array(
    … …  
    44384436
    44394437        $this->assertSameSets( $q1_ids, $q2_ids );
    4440         $this->assertSame( $num_queries, $wpdb->num_queries );
     4438        $this->assertSame( $num_queries, get_num_queries() );
    44414439    }
    44424440
    … …  
    45914589        );
    45924590
    4593         $num_queries = $wpdb->num_queries;
     4591        $num_queries = get_num_queries();
    45944592        $this->assertTrue( isset( $q->comments[0]->post_name ) );
    4595         $this->assertSame( $num_queries + 1, $wpdb->num_queries );
     4593        $this->assertSame( $num_queries + 1, get_num_queries() );
    45964594    }
    45974595
    … …  
    46144612        );
    46154613
    4616         $num_queries = $wpdb->num_queries;
     4614        $num_queries = get_num_queries();
    46174615        $this->assertTrue( isset( $q->comments[0]->post_name ) );
    4618         $this->assertSame( $num_queries, $wpdb->num_queries );
     4616        $this->assertSame( $num_queries, get_num_queries() );
    46194617    }
    46204618
    … …  
    46304628        clean_comment_cache( $comments );
    46314629
    4632         $num_queries = $wpdb->num_queries;
     4630        $num_queries = get_num_queries();
    46334631        $q           = new WP_Comment_Query(
    46344632            array(
    … …  
    46464644        $this->assertEqualSets( $comments, $found );
    46474645
    4648         $this->assertSame( $num_queries, $wpdb->num_queries );
     4646        $this->assertSame( $num_queries, get_num_queries() );
    46494647    }
    46504648
    … …  
    46934691        );
    46944692
    4695         $num_queries = $wpdb->num_queries;
     4693        $num_queries = get_num_queries();
    46964694
    46974695        $q2 = new WP_Comment_Query(
    … …  
    47024700        );
    47034701
    4704         $this->assertSame( $num_queries, $wpdb->num_queries );
     4702        $this->assertSame( $num_queries, get_num_queries() );
    47054703    }
    47064704
    … …  
    47254723        );
    47264724
    4727         $num_queries = $wpdb->num_queries;
     4725        $num_queries = get_num_queries();
    47284726
    47294727        $q = new WP_Comment_Query(
    … …  
    47344732        );
    47354733
    4736         $this->assertSame( $num_queries, $wpdb->num_queries );
     4734        $this->assertSame( $num_queries, get_num_queries() );
    47374735        $this->assertSameSets( array( $c ), $q->comments );
    47384736    }
    … …  
    47674765        );
    47684766
    4769         $num_queries = $wpdb->num_queries;
     4767        $num_queries = get_num_queries();
    47704768
    47714769        $q = new WP_Comment_Query(
    … …  
    47774775
    47784776        $num_queries++;
    4779         $this->assertSame( $num_queries, $wpdb->num_queries );
     4777        $this->assertSame( $num_queries, get_num_queries() );
    47804778        $this->assertSameSets( array( $c ), $q->comments );
    47814779    }
    … …  
    48034801        wp_delete_comment( $c );
    48044802
    4805         $num_queries = $wpdb->num_queries;
     4803        $num_queries = get_num_queries();
    48064804
    48074805        $q = new WP_Comment_Query(
    … …  
    48134811
    48144812        $num_queries++;
    4815         $this->assertSame( $num_queries, $wpdb->num_queries );
     4813        $this->assertSame( $num_queries, get_num_queries() );
    48164814        $this->assertSameSets( array(), $q->comments );
    48174815    }
    … …  
    48394837        wp_trash_comment( $c );
    48404838
    4841         $num_queries = $wpdb->num_queries;
     4839        $num_queries = get_num_queries();
    48424840
    48434841        $q = new WP_Comment_Query(
    … …  
    48494847
    48504848        $num_queries++;
    4851         $this->assertSame( $num_queries, $wpdb->num_queries );
     4849        $this->assertSame( $num_queries, get_num_queries() );
    48524850        $this->assertSameSets( array(), $q->comments );
    48534851    }
    … …  
    48774875        wp_untrash_comment( $c );
    48784876
    4879         $num_queries = $wpdb->num_queries;
     4877        $num_queries = get_num_queries();
    48804878
    48814879        $q = new WP_Comment_Query(
    … …  
    48874885
    48884886        $num_queries++;
    4889         $this->assertSame( $num_queries, $wpdb->num_queries );
     4887        $this->assertSame( $num_queries, get_num_queries() );
    48904888        $this->assertSameSets( array( $c ), $q->comments );
    48914889    }
    … …  
    49134911        wp_spam_comment( $c );
    49144912
    4915         $num_queries = $wpdb->num_queries;
     4913        $num_queries = get_num_queries();
    49164914
    49174915        $q = new WP_Comment_Query(
    … …  
    49234921
    49244922        $num_queries++;
    4925         $this->assertSame( $num_queries, $wpdb->num_queries );
     4923        $this->assertSame( $num_queries, get_num_queries() );
    49264924        $this->assertSameSets( array(), $q->comments );
    49274925    }
    … …  
    49514949        wp_unspam_comment( $c );
    49524950
    4953         $num_queries = $wpdb->num_queries;
     4951        $num_queries = get_num_queries();
    49544952
    49554953        $q = new WP_Comment_Query(
    … …  
    49614959
    49624960        $num_queries++;
    4963         $this->assertSame( $num_queries, $wpdb->num_queries );
     4961        $this->assertSame( $num_queries, get_num_queries() );
    49644962        $this->assertSameSets( array( $c ), $q->comments );
    49654963    }
    … …  
    49834981        );
    49844982
    4985         $number_of_queries = $wpdb->num_queries;
     4983        $number_of_queries = get_num_queries();
    49864984
    49874985        $query_2 = $q->query(
    … …  
    49934991            )
    49944992        );
    4995         $this->assertSame( $number_of_queries + 1, $wpdb->num_queries );
     4993        $this->assertSame( $number_of_queries + 1, get_num_queries() );
    49964994    }
    49974995
    … …  
    50145012            )
    50155013        );
    5016         $number_of_queries = $wpdb->num_queries;
     5014        $number_of_queries = get_num_queries();
    50175015
    50185016        $query_2 = $q->query(
    … …  
    50245022            )
    50255023        );
    5026         $this->assertSame( $number_of_queries, $wpdb->num_queries );
     5024        $this->assertSame( $number_of_queries, get_num_queries() );
    50275025    }
    50285026
    … …  
    50445042            )
    50455043        );
    5046         $number_of_queries = $wpdb->num_queries;
     5044        $number_of_queries = get_num_queries();
    50475045
    50485046        $query_2 = $q->query(
    … …  
    50545052        );
    50555053
    5056         $this->assertSame( $number_of_queries, $wpdb->num_queries );
     5054        $this->assertSame( $number_of_queries, get_num_queries() );
    50575055    }
    50585056
    … …  
    52205218        add_filter( 'comments_pre_query', array( __CLASS__, 'filter_comments_pre_query' ), 10, 2 );
    52215219
    5222         $num_queries = $wpdb->num_queries;
     5220        $num_queries = get_num_queries();
    52235221
    52245222        $q       = new WP_Comment_Query();
    … …  
    52285226
    52295227        // Make sure no queries were executed.
    5230         $this->assertSame( $num_queries, $wpdb->num_queries );
     5228        $this->assertSame( $num_queries, get_num_queries() );
    52315229
    52325230        // We manually inserted a non-existing site and overrode the results with it.
Note: See TracChangeset for help on using the changeset viewer.