vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-10-04 14:47:02 +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
tests/phpunit/tests/multisite/network.php
+2 -4
View File
@@ -590,14 +590,12 @@ if ( is_multisite() ) :
* @ticket 42251
*/
public function test_get_network_not_found_cache() {
global $wpdb;
$new_network_id = $this->_get_next_network_id();
$this->assertNull( get_network( $new_network_id ) );
$num_queries = $wpdb->num_queries;
$num_queries = get_num_queries();
$this->assertNull( get_network( $new_network_id ) );
$this->assertSame( $num_queries, $wpdb->num_queries );
$this->assertSame( $num_queries, get_num_queries() );
}
/**
tests/phpunit/tests/multisite/site.php
+2 -4
View File
@@ -2170,14 +2170,12 @@ if ( is_multisite() ) :
* @ticket 42251
*/
public function test_get_site_not_found_cache() {
global $wpdb;
$new_site_id = $this->_get_next_site_id();
$this->assertNull( get_site( $new_site_id ) );
$num_queries = $wpdb->num_queries;
$num_queries = get_num_queries();
$this->assertNull( get_site( $new_site_id ) );
$this->assertSame( $num_queries, $wpdb->num_queries );
$this->assertSame( $num_queries, get_num_queries() );
}
/**
tests/phpunit/tests/multisite/siteMeta.php
+6 -12
View File
@@ -220,8 +220,6 @@ if ( is_multisite() ) :
}
public function test_update_site_meta_cache() {
global $wpdb;
if ( ! is_site_meta_supported() ) {
$this->markTestSkipped( 'Test only runs with the blogmeta database table installed.' );
}
@@ -229,14 +227,12 @@ if ( is_multisite() ) :
update_site_meta( self::$site_id, 'foo', 'bar' );
update_sitemeta_cache( array( self::$site_id ) );
$num_queries = $wpdb->num_queries;
$num_queries = get_num_queries();
get_site_meta( self::$site_id, 'foo', true );
$this->assertSame( $num_queries, $wpdb->num_queries );
$this->assertSame( $num_queries, get_num_queries() );
}
public function test_query_update_site_meta_cache_true() {
global $wpdb;
if ( ! is_site_meta_supported() ) {
$this->markTestSkipped( 'Test only runs with the blogmeta database table installed.' );
}
@@ -250,14 +246,12 @@ if ( is_multisite() ) :
)
);
$num_queries = $wpdb->num_queries;
$num_queries = get_num_queries();
get_site_meta( self::$site_id, 'foo', true );
$this->assertSame( $num_queries, $wpdb->num_queries );
$this->assertSame( $num_queries, get_num_queries() );
}
public function test_query_update_site_meta_cache_false() {
global $wpdb;
if ( ! is_site_meta_supported() ) {
$this->markTestSkipped( 'Test only runs with the blogmeta database table installed.' );
}
@@ -271,9 +265,9 @@ if ( is_multisite() ) :
)
);
$num_queries = $wpdb->num_queries;
$num_queries = get_num_queries();
get_site_meta( self::$site_id, 'foo', true );
$this->assertSame( $num_queries + 1, $wpdb->num_queries );
$this->assertSame( $num_queries + 1, get_num_queries() );
}
/**
tests/phpunit/tests/multisite/wpNetworkQuery.php
+8 -16
View File
@@ -428,8 +428,6 @@ if ( is_multisite() ) :
* @ticket 41347
*/
public function test_wp_network_query_cache_with_different_fields_no_count() {
global $wpdb;
$q = new WP_Network_Query();
$query_1 = $q->query(
array(
@@ -438,7 +436,7 @@ if ( is_multisite() ) :
'order' => 'ASC',
)
);
$number_of_queries = $wpdb->num_queries;
$number_of_queries = get_num_queries();
$query_2 = $q->query(
array(
@@ -448,15 +446,13 @@ if ( is_multisite() ) :
)
);
$this->assertSame( $number_of_queries, $wpdb->num_queries );
$this->assertSame( $number_of_queries, get_num_queries() );
}
/**
* @ticket 41347
*/
public function test_wp_network_query_cache_with_different_fields_active_count() {
global $wpdb;
$q = new WP_Network_Query();
$query_1 = $q->query(
@@ -467,7 +463,7 @@ if ( is_multisite() ) :
'count' => true,
)
);
$number_of_queries = $wpdb->num_queries;
$number_of_queries = get_num_queries();
$query_2 = $q->query(
array(
@@ -477,15 +473,13 @@ if ( is_multisite() ) :
'count' => true,
)
);
$this->assertSame( $number_of_queries, $wpdb->num_queries );
$this->assertSame( $number_of_queries, get_num_queries() );
}
/**
* @ticket 41347
*/
public function test_wp_network_query_cache_with_same_fields_different_count() {
global $wpdb;
$q = new WP_Network_Query();
$query_1 = $q->query(
@@ -496,7 +490,7 @@ if ( is_multisite() ) :
)
);
$number_of_queries = $wpdb->num_queries;
$number_of_queries = get_num_queries();
$query_2 = $q->query(
array(
@@ -506,7 +500,7 @@ if ( is_multisite() ) :
'count' => true,
)
);
$this->assertSame( $number_of_queries + 1, $wpdb->num_queries );
$this->assertSame( $number_of_queries + 1, get_num_queries() );
}
/**
@@ -568,11 +562,9 @@ if ( is_multisite() ) :
* @ticket 47599
*/
public function test_networks_pre_query_filter_should_bypass_database_query() {
global $wpdb;
add_filter( 'networks_pre_query', array( __CLASS__, 'filter_networks_pre_query' ), 10, 2 );
$num_queries = $wpdb->num_queries;
$num_queries = get_num_queries();
$q = new WP_Network_Query();
$results = $q->query( array() );
@@ -580,7 +572,7 @@ if ( is_multisite() ) :
remove_filter( 'networks_pre_query', array( __CLASS__, 'filter_networks_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 );
tests/phpunit/tests/multisite/wpSiteQuery.php
+7 -12
View File
@@ -779,7 +779,6 @@ if ( is_multisite() ) :
* @ticket 41197
*/
public function test_wp_site_query_cache_with_different_fields_no_count() {
global $wpdb;
$q = new WP_Site_Query();
$query_1 = $q->query(
array(
@@ -789,7 +788,7 @@ if ( is_multisite() ) :
'order' => 'ASC',
)
);
$number_of_queries = $wpdb->num_queries;
$number_of_queries = get_num_queries();
$query_2 = $q->query(
array(
@@ -800,14 +799,13 @@ if ( is_multisite() ) :
)
);
$this->assertSame( $number_of_queries, $wpdb->num_queries );
$this->assertSame( $number_of_queries, get_num_queries() );
}
/**
* @ticket 41197
*/
public function test_wp_site_query_cache_with_different_fields_active_count() {
global $wpdb;
$q = new WP_Site_Query();
$query_1 = $q->query(
@@ -819,7 +817,7 @@ if ( is_multisite() ) :
'count' => true,
)
);
$number_of_queries = $wpdb->num_queries;
$number_of_queries = get_num_queries();
$query_2 = $q->query(
array(
@@ -830,14 +828,13 @@ if ( is_multisite() ) :
'count' => true,
)
);
$this->assertSame( $number_of_queries, $wpdb->num_queries );
$this->assertSame( $number_of_queries, get_num_queries() );
}
/**
* @ticket 41197
*/
public function test_wp_site_query_cache_with_same_fields_different_count() {
global $wpdb;
$q = new WP_Site_Query();
$query_1 = $q->query(
@@ -860,7 +857,7 @@ if ( is_multisite() ) :
'count' => true,
)
);
$this->assertSame( $number_of_queries + 1, $wpdb->num_queries );
$this->assertSame( $number_of_queries + 1, get_num_queries() );
}
/**
@@ -1119,11 +1116,9 @@ if ( is_multisite() ) :
* @ticket 47599
*/
public function test_sites_pre_query_filter_should_bypass_database_query() {
global $wpdb;
add_filter( 'sites_pre_query', array( __CLASS__, 'filter_sites_pre_query' ), 10, 2 );
$num_queries = $wpdb->num_queries;
$num_queries = get_num_queries();
$q = new WP_Site_Query();
$results = $q->query( array() );
@@ -1131,7 +1126,7 @@ if ( is_multisite() ) :
remove_filter( 'sites_pre_query', array( __CLASS__, 'filter_sites_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 );