vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-04-08 22:54:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tests: Use the function get_num_queries across all unit tests.

Browse Source 
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.

git-svn-id: https://develop.svn.wordpress.org/trunk@55745 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Jonny Harris
2023-05-11 10:05:51 +00:00
parent 55ee499f4e
commit 07fc459e7a
32 changed files with 283 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
tests/phpunit/tests/comment/query.php
View File

@@ -3588,8 +3588,6 @@ class Tests_Comment_Query extends WP_UnitTestCase {
* @covers WP_Comment_Query::query
*/
public function test_comment_cache_key_should_ignore_custom_params() {
global $wpdb;
$p = self::factory()->post->create();
$c = self::factory()->comment->create( array( 'comment_post_ID' => $p ) );
@@ -3601,7 +3599,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
)
);
$num_queries = $wpdb->num_queries;
$num_queries = get_num_queries();
$q2 = new WP_Comment_Query();
$q2->query(
@@ -3612,7 +3610,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
)
);
$this->assertSame( $num_queries, $wpdb->num_queries );
$this->assertSame( $num_queries, get_num_queries() );
}
/**
@@ -3629,7 +3627,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
)
);
$num_queries = $wpdb->num_queries;
$num_queries = get_num_queries();
$q2 = new WP_Comment_Query(
array(
@@ -3637,7 +3635,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
)
);
$this->assertNotEquals( $num_queries, $wpdb->num_queries );
$this->assertNotEquals( $num_queries, get_num_queries() );
}
/**
@@ -3654,7 +3652,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
)
);
$num_queries = $wpdb->num_queries;
$num_queries = get_num_queries();
$q2 = new WP_Comment_Query(
array(
@@ -3662,7 +3660,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
)
);
$this->assertNotEquals( $num_queries, $wpdb->num_queries );
$this->assertNotEquals( $num_queries, get_num_queries() );
}
/**
@@ -4427,7 +4425,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
);
$q1_ids = wp_list_pluck( $q1->comments, 'comment_ID' );
$num_queries = $wpdb->num_queries;
$num_queries = get_num_queries();
$q2 = new WP_Comment_Query(
array(
'post_id' => $p,
@@ -4437,7 +4435,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
$q2_ids = wp_list_pluck( $q2->comments, 'comment_ID' );
$this->assertSameSets( $q1_ids, $q2_ids );
$this->assertSame( $num_queries, $wpdb->num_queries );
$this->assertSame( $num_queries, get_num_queries() );
}
/**
@@ -4590,9 +4588,9 @@ class Tests_Comment_Query extends WP_UnitTestCase {
)
);
$num_queries = $wpdb->num_queries;
$num_queries = get_num_queries();
$this->assertTrue( isset( $q->comments[0]->post_name ) );
$this->assertSame( $num_queries + 1, $wpdb->num_queries );
$this->assertSame( $num_queries + 1, get_num_queries() );
}
/**
@@ -4613,9 +4611,9 @@ class Tests_Comment_Query extends WP_UnitTestCase {
)
);
$num_queries = $wpdb->num_queries;
$num_queries = get_num_queries();
$this->assertTrue( isset( $q->comments[0]->post_name ) );
$this->assertSame( $num_queries, $wpdb->num_queries );
$this->assertSame( $num_queries, get_num_queries() );
}
/**
@@ -4629,7 +4627,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
$comments = self::factory()->comment->create_many( 3, array( 'comment_post_ID' => self::$post_id ) );
clean_comment_cache( $comments );
$num_queries = $wpdb->num_queries;
$num_queries = get_num_queries();
$q = new WP_Comment_Query(
array(
'post_id' => self::$post_id,
@@ -4645,7 +4643,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
$found = wp_list_pluck( $q->comments, 'comment_ID' );
$this->assertEqualSets( $comments, $found );
$this->assertSame( $num_queries, $wpdb->num_queries );
$this->assertSame( $num_queries, get_num_queries() );
}
/**
@@ -4692,7 +4690,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
)
);
$num_queries = $wpdb->num_queries;
$num_queries = get_num_queries();
$q2 = new WP_Comment_Query(
array(
@@ -4701,7 +4699,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
)
);
$this->assertSame( $num_queries, $wpdb->num_queries );
$this->assertSame( $num_queries, get_num_queries() );
}
/**
@@ -4724,7 +4722,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
)
);
$num_queries = $wpdb->num_queries;
$num_queries = get_num_queries();
$q = new WP_Comment_Query(
array(
@@ -4733,7 +4731,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
)
);
$this->assertSame( $num_queries, $wpdb->num_queries );
$this->assertSame( $num_queries, get_num_queries() );
$this->assertSameSets( array( $c ), $q->comments );
}
@@ -4766,7 +4764,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
)
);
$num_queries = $wpdb->num_queries;
$num_queries = get_num_queries();
$q = new WP_Comment_Query(
array(
@@ -4776,7 +4774,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
);
$num_queries++;
$this->assertSame( $num_queries, $wpdb->num_queries );
$this->assertSame( $num_queries, get_num_queries() );
$this->assertSameSets( array( $c ), $q->comments );
}
@@ -4802,7 +4800,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
wp_delete_comment( $c );
$num_queries = $wpdb->num_queries;
$num_queries = get_num_queries();
$q = new WP_Comment_Query(
array(
@@ -4812,7 +4810,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
);
$num_queries++;
$this->assertSame( $num_queries, $wpdb->num_queries );
$this->assertSame( $num_queries, get_num_queries() );
$this->assertSameSets( array(), $q->comments );
}
@@ -4838,7 +4836,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
wp_trash_comment( $c );
$num_queries = $wpdb->num_queries;
$num_queries = get_num_queries();
$q = new WP_Comment_Query(
array(
@@ -4848,7 +4846,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
);
$num_queries++;
$this->assertSame( $num_queries, $wpdb->num_queries );
$this->assertSame( $num_queries, get_num_queries() );
$this->assertSameSets( array(), $q->comments );
}
@@ -4876,7 +4874,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
wp_untrash_comment( $c );
$num_queries = $wpdb->num_queries;
$num_queries = get_num_queries();
$q = new WP_Comment_Query(
array(
@@ -4886,7 +4884,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
);
$num_queries++;
$this->assertSame( $num_queries, $wpdb->num_queries );
$this->assertSame( $num_queries, get_num_queries() );
$this->assertSameSets( array( $c ), $q->comments );
}
@@ -4912,7 +4910,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
wp_spam_comment( $c );
$num_queries = $wpdb->num_queries;
$num_queries = get_num_queries();
$q = new WP_Comment_Query(
array(
@@ -4922,7 +4920,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
);
$num_queries++;
$this->assertSame( $num_queries, $wpdb->num_queries );
$this->assertSame( $num_queries, get_num_queries() );
$this->assertSameSets( array(), $q->comments );
}
@@ -4950,7 +4948,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
wp_unspam_comment( $c );
$num_queries = $wpdb->num_queries;
$num_queries = get_num_queries();
$q = new WP_Comment_Query(
array(
@@ -4960,7 +4958,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
);
$num_queries++;
$this->assertSame( $num_queries, $wpdb->num_queries );
$this->assertSame( $num_queries, get_num_queries() );
$this->assertSameSets( array( $c ), $q->comments );
}
@@ -4982,7 +4980,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
)
);
$number_of_queries = $wpdb->num_queries;
$number_of_queries = get_num_queries();
$query_2 = $q->query(
array(
@@ -4992,7 +4990,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
'count' => true,
)
);
$this->assertSame( $number_of_queries + 1, $wpdb->num_queries );
$this->assertSame( $number_of_queries + 1, get_num_queries() );
}
/**
@@ -5013,7 +5011,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
'count' => true,
)
);
$number_of_queries = $wpdb->num_queries;
$number_of_queries = get_num_queries();
$query_2 = $q->query(
array(
@@ -5023,7 +5021,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
'count' => true,
)
);
$this->assertSame( $number_of_queries, $wpdb->num_queries );
$this->assertSame( $number_of_queries, get_num_queries() );
}
/**
@@ -5043,7 +5041,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
'order' => 'ASC',
)
);
$number_of_queries = $wpdb->num_queries;
$number_of_queries = get_num_queries();
$query_2 = $q->query(
array(
@@ -5053,7 +5051,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
)
);
$this->assertSame( $number_of_queries, $wpdb->num_queries );
$this->assertSame( $number_of_queries, get_num_queries() );
}
/**
@@ -5219,7 +5217,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
add_filter( 'comments_pre_query', array( __CLASS__, 'filter_comments_pre_query' ), 10, 2 );
$num_queries = $wpdb->num_queries;
$num_queries = get_num_queries();
$q = new WP_Comment_Query();
$results = $q->query( array() );
@@ -5227,7 +5225,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
remove_filter( 'comments_pre_query', array( __CLASS__, 'filter_comments_pre_query' ), 10, 2 );
// Make sure no queries were executed.
$this->assertSame( $num_queries, $wpdb->num_queries );
$this->assertSame( $num_queries, get_num_queries() );
// We manually inserted a non-existing site and overrode the results with it.
$this->assertSame( array( 555 ), $results );