sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve layout of test for cached invalid, then valid site details

Browse Source 
* Rename method to `test_get_blog_details_when_site_does_not_exist()`.
* Always assume `MAX(blog_id)` is 1 and therefore always create a burner.
* Remove tests specific to `wpmu_delete_blog()` and cache, to be handled elsewhere.
* Remove extra asertions.

See #30080, #23405


git-svn-id: https://develop.svn.wordpress.org/trunk@30175 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Jeremy Felt 2014-11-02 01:04:47 +00:00
parent 85aa2ef76e
commit 6f88946089
1 changed files with 13 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
tests/phpunit/tests/multisite/site.php
View File

@ -444,46 +444,31 @@ class Tests_Multisite_Site extends WP_UnitTestCase {
} }
/** /**
* Test fetching a blog that doesn't exist and again after it exists. * Test cached data for a site that does not exist and then again after it exists.
* *
* @ticket 23405 * @ticket 23405
*/ */
function test_get_blog_details_blog_does_not_exist() { function test_get_blog_details_when_site_does_not_exist() {
global $wpdb; // Create an unused site so that we can then assume an invalid site ID.
$blog_id = $wpdb->get_var( "SELECT MAX(blog_id) FROM $wpdb->blogs" );
// An idosyncrancy of the unit tests is that the max blog_id gets reset
// to 1 in between test cases but picks up where it previously left off
// on the next insert. If 1 is reported, burn a blog create to get
// the max counter back in sync.
if ( 1 == $blog_id ) {
$blog_id = $this->factory->blog->create(); $blog_id = $this->factory->blog->create();
}
$blog_id++; $blog_id++;
$this->assertFalse( wp_cache_get( $blog_id, 'blog-details' ) ); // Prime the cache for an invalid site.
$this->assertFalse( get_blog_details( $blog_id ) ); get_blog_details( $blog_id );
$this->assertEquals( -1, wp_cache_get( $blog_id, 'blog-details' ) );
$this->assertFalse( get_blog_details( $blog_id ) ); // When the cache is primed with an invalid site, the value is set to -1.
$this->assertEquals( -1, wp_cache_get( $blog_id, 'blog-details' ) ); $this->assertEquals( -1, wp_cache_get( $blog_id, 'blog-details' ) );
$this->assertEquals( $blog_id, $this->factory->blog->create() ); // Create a site in the invalid site's place.
$this->factory->blog->create();
// When a new site is created, its cache is cleared through refresh_blog_details.
$this->assertFalse( wp_cache_get( $blog_id, 'blog-details' ) ); $this->assertFalse( wp_cache_get( $blog_id, 'blog-details' ) );
$blog = get_blog_details( $blog_id ); $blog = get_blog_details( $blog_id );
$this->assertEquals( $blog_id, $blog->blog_id );
$this->assertEquals( $blog, wp_cache_get( $blog_id, 'blog-details' ) );
wpmu_delete_blog( $blog_id ); // When the cache is refreshed, it should now equal the site data.
$this->assertFalse( wp_cache_get( $blog_id, 'blog-details' ) );
$blog->deleted = '1';
$this->assertEQuals( $blog, get_blog_details( $blog_id ) );
$this->assertEquals( $blog, wp_cache_get( $blog_id, 'blog-details' ) ); $this->assertEquals( $blog, wp_cache_get( $blog_id, 'blog-details' ) );
wpmu_delete_blog( $blog_id, true );
$this->assertFalse( get_blog_details( $blog_id ) );
$this->assertEquals( -1, wp_cache_get( $blog_id, 'blog-details' ) );
} }
function test_update_blog_status() { function test_update_blog_status() {