<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[30006] trunk/tests/phpunit/tests/multisite/site.php: Begin cleanup of ms-sites group unit tests</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/30006">30006</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/30006","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>jeremyfelt</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-10-24 04:50:57 +0000 (Fri, 24 Oct 2014)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Begin cleanup of ms-sites group unit tests
* Split `test_create_and_delete_blog()` into two tests.
* Clean up number of sites created during tests.
* Remove test_getters(), move get_blog_address_by_name() test to `test_created_site_details()`
See <a href="https://core.trac.wordpress.org/ticket/30080">#30080</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsmultisitesitephp">trunk/tests/phpunit/tests/multisite/site.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsmultisitesitephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/multisite/site.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/site.php 2014-10-24 04:48:31 UTC (rev 30005)
+++ trunk/tests/phpunit/tests/multisite/site.php 2014-10-24 04:50:57 UTC (rev 30006)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,59 +71,80 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( restore_current_blog() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_create_and_delete_blog() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Test the cache keys and database tables setup through the creation of a site.
+ */
+ function test_created_site_details() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog_ids = $this->factory->blog->create_many( 4 );
- foreach ( $blog_ids as $blog_id ) {
- $this->assertInternalType( 'int', $blog_id );
- $prefix = $wpdb->get_blog_prefix( $blog_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = $this->factory->blog->create();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // $get_all = false
- $details = get_blog_details( $blog_id, false );
- $this->assertEquals( $details, wp_cache_get( $blog_id . 'short', 'blog-details' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertInternalType( 'int', $blog_id );
+ $prefix = $wpdb->get_blog_prefix( $blog_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // get_id_from_blogname(), see #20950
- $this->assertEquals( $blog_id, get_id_from_blogname( $details->path ) );
- $this->assertEquals( $blog_id, wp_cache_get( 'get_id_from_blogname_' . trim( $details->path, '/' ), 'blog-details' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // $get_all = false, only retrieve details from the blogs table
+ $details = get_blog_details( $blog_id, false );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // get_blog_id_from_url()
- $this->assertEquals( $blog_id, get_blog_id_from_url( $details->domain, $details->path ) );
- $key = md5( $details->domain . $details->path );
- $this->assertEquals( $blog_id, wp_cache_get( $key, 'blog-id-cache' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Combine domain and path for a site specific cache key.
+ $key = md5( $details->domain . $details->path );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // These are empty until get_blog_details() is called with $get_all = true
- $this->assertEquals( false, wp_cache_get( $blog_id, 'blog-details' ) );
- $key = md5( $details->domain . $details->path );
- $this->assertEquals( false, wp_cache_get( $key, 'blog-lookup' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( $details, wp_cache_get( $blog_id . 'short', 'blog-details' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // $get_all = true should propulate the full blog-details cache and the blog slug lookup cache
- $details = get_blog_details( $blog_id, true );
- $this->assertEquals( $details, wp_cache_get( $blog_id, 'blog-details' ) );
- $this->assertEquals( $details, wp_cache_get( $key, 'blog-lookup' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // get_id_from_blogname(), see #20950
+ $this->assertEquals( $blog_id, get_id_from_blogname( $details->path ) );
+ $this->assertEquals( $blog_id, wp_cache_get( 'get_id_from_blogname_' . trim( $details->path, '/' ), 'blog-details' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $wpdb->tables( 'blog', false ) as $table ) {
- $suppress = $wpdb->suppress_errors();
- $table_fields = $wpdb->get_results( "DESCRIBE $prefix$table;" );
- $wpdb->suppress_errors( $suppress );
- $this->assertNotEmpty( $table_fields );
- $result = $wpdb->get_results( "SELECT * FROM $prefix$table LIMIT 1" );
- if ( 'commentmeta' == $table || 'links' == $table )
- $this->assertEmpty( $result );
- else
- $this->assertNotEmpty( $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // get_blogaddress_by_name()
+ $this->assertEquals( 'http://' . $details->domain . $details->path, get_blogaddress_by_name( trim( $details->path, '/' ) ) );
+
+ // These are empty until get_blog_details() is called with $get_all = true
+ $this->assertEquals( false, wp_cache_get( $blog_id, 'blog-details' ) );
+ $this->assertEquals( false, wp_cache_get( $key, 'blog-lookup' ) );
+
+ // $get_all = true, populate the full blog-details cache and the blog slug lookup cache
+ $details = get_blog_details( $blog_id, true );
+ $this->assertEquals( $details, wp_cache_get( $blog_id, 'blog-details' ) );
+ $this->assertEquals( $details, wp_cache_get( $key, 'blog-lookup' ) );
+
+ // Check existence of each database table for the created site.
+ foreach ( $wpdb->tables( 'blog', false ) as $table ) {
+ $suppress = $wpdb->suppress_errors();
+ $table_fields = $wpdb->get_results( "DESCRIBE $prefix$table;" );
+ $wpdb->suppress_errors( $suppress );
+
+ // The table should exist.
+ $this->assertNotEmpty( $table_fields );
+
+ // And the table should not be empty, unless commentmeta or links.
+ $result = $wpdb->get_results( "SELECT * FROM $prefix$table LIMIT 1" );
+ if ( 'commentmeta' == $table || 'links' == $table ) {
+ $this->assertEmpty( $result );
+ } else {
+ $this->assertNotEmpty( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // update the blog count cache to use get_blog_count()
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_network_counts();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 4 + 1, (int) get_blog_count() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 2, (int) get_blog_count() );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Test the deletion of a site, including a case where database tables are
+ * intentionally not deleted.
+ */
+ function test_wpmu_delete_blog() {
+ global $wpdb;
+
+ $blog_ids = $this->factory->blog->create_many( 2 );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $drop_tables = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // delete all blogs
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Delete both sites, but keep the database tables for one.
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $blog_ids as $blog_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // drop tables for every second blog
</span><span class="cx" style="display: block; padding: 0 10px"> $drop_tables = ! $drop_tables;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $details = get_blog_details( $blog_id, false );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wpmu_delete_blog( $blog_id, $drop_tables );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,10 +161,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $suppress = $wpdb->suppress_errors();
</span><span class="cx" style="display: block; padding: 0 10px"> $table_fields = $wpdb->get_results( "DESCRIBE $prefix$table;" );
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->suppress_errors( $suppress );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $drop_tables )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $drop_tables ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( $table_fields );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $table_fields, $prefix . $table );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -164,27 +186,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertLessThan( 2, $time_difference );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_getters(){
- global $current_site;
-
- $blog_id = get_current_blog_id();
- $blog = get_blog_details( $blog_id );
- $this->assertEquals( $blog_id, $blog->blog_id );
- $this->assertEquals( $current_site->domain, $blog->domain );
- $this->assertEquals( '/', $blog->path );
-
- // Test defaulting to current blog
- $this->assertEquals( $blog, get_blog_details() );
-
- $user_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
- $blog_id = $this->factory->blog->create( array( 'user_id' => $user_id, 'path' => '/test_blogname', 'title' => 'Test Title' ) );
- $this->assertInternalType( 'int', $blog_id );
-
- $this->assertEquals( 'http://' . $current_site->domain . $current_site->path . 'test_blogname/', get_blogaddress_by_name('test_blogname') );
-
- $this->assertEquals( $blog_id, get_id_from_blogname('test_blogname') );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> function test_update_blog_details() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $test_action_counter;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>