<!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>[30106] trunk/tests/phpunit/tests/multisite/site.php: Expand tests around wpmu_delete_blog()</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/30106">30106</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/30106","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-30 01:59:02 +0000 (Thu, 30 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'>Expand tests around wpmu_delete_blog()
* Test cache after a site is deleted or flagged as deleted.
* Test tables after a site is deleted or flagged as deleted.
* Test tables and cache after the main site is deleted.
* Test site count after a site is deleted or flagged as deleted.
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-30 01:04:55 UTC (rev 30105)
+++ trunk/tests/phpunit/tests/multisite/site.php 2014-10-30 01:59:02 UTC (rev 30106)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,50 +130,150 @@
</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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Test the deletion of a site, including a case where database tables are
- * intentionally not deleted.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * When a site is flagged as 'deleted', its data should be cleared from cache.
</ins><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_wpmu_delete_blog() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function test_data_in_cache_after_wpmu_delete_blog_drop_false() {
+ $blog_id = $this->factory->blog->create();
+
+ $details = get_blog_details( $blog_id, false );
+ $key = md5( $details->domain . $details->path );
+
+ // Delete the site without forcing a table drop.
+ wpmu_delete_blog( $blog_id, false );
+
+ $this->assertEquals( false, wp_cache_get( 'get_id_from_blogname_' . trim( $details->path, '/' ), 'blog-details' ) );
+ $this->assertEquals( false, wp_cache_get( $blog_id, 'blog-details' ) );
+ $this->assertEquals( false, wp_cache_get( $blog_id . 'short', 'blog-details' ) );
+ $this->assertEquals( false, wp_cache_get( $key, 'blog-lookup' ) );
+ $this->assertEquals( false, wp_cache_get( $key, 'blog-id-cache' ) );
+ }
+
+ /**
+ * When a site is flagged as 'deleted', its data should remain in the database.
+ */
+ function test_data_in_tables_after_wpmu_delete_blog_drop_false() {
</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( 2 );
</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">- $drop_tables = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Delete the site without forcing a table drop.
+ wpmu_delete_blog( $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">- // Delete both sites, but keep the database tables for one.
- foreach ( $blog_ids as $blog_id ) {
- // drop tables for every second blog
- $drop_tables = ! $drop_tables;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $prefix = $wpdb->get_blog_prefix( $blog_id );
+ 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, $prefix . $table );
+ }
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $details = get_blog_details( $blog_id, false );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * When a site is fully deleted, its data should be cleared from cache.
+ */
+ function test_data_in_cache_after_wpmu_delete_blog_drop_true() {
+ $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">- wpmu_delete_blog( $blog_id, $drop_tables );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $details = get_blog_details( $blog_id, false );
+ $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">- $this->assertEquals( false, wp_cache_get( 'get_id_from_blogname_' . trim( $details->path, '/' ), 'blog-details' ) );
- $this->assertEquals( false, wp_cache_get( $blog_id, 'blog-details' ) );
- $this->assertEquals( false, wp_cache_get( $blog_id . 'short', 'blog-details' ) );
- $key = md5( $details->domain . $details->path );
- $this->assertEquals( false, wp_cache_get( $key, 'blog-lookup' ) );
- $this->assertEquals( false, wp_cache_get( $key, 'blog-id-cache' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Delete the site and force a table drop.
+ wpmu_delete_blog( $blog_id, true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $prefix = $wpdb->get_blog_prefix( $blog_id );
- foreach ( $wpdb->tables( 'blog', false ) as $table ) {
- $suppress = $wpdb->suppress_errors();
- $table_fields = $wpdb->get_results( "DESCRIBE $prefix$table;" );
- $wpdb->suppress_errors( $suppress );
- if ( $drop_tables ) {
- $this->assertEmpty( $table_fields );
- } else {
- $this->assertNotEmpty( $table_fields, $prefix . $table );
- }
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( false, wp_cache_get( 'get_id_from_blogname_' . trim( $details->path, '/' ), 'blog-details' ) );
+ $this->assertEquals( false, wp_cache_get( $blog_id, 'blog-details' ) );
+ $this->assertEquals( false, wp_cache_get( $blog_id . 'short', 'blog-details' ) );
+ $this->assertEquals( false, wp_cache_get( $key, 'blog-lookup' ) );
+ $this->assertEquals( false, wp_cache_get( $key, 'blog-id-cache' ) );
+ }
+
+ /**
+ * When a site is fully deleted, its data should be removed from the database.
+ */
+ function test_data_in_tables_after_wpmu_delete_blog_drop_true() {
+ global $wpdb;
+
+ $blog_id = $this->factory->blog->create();
+
+ // Delete the site and force a table drop.
+ wpmu_delete_blog( $blog_id, true );
+
+ $prefix = $wpdb->get_blog_prefix( $blog_id );
+ foreach ( $wpdb->tables( 'blog', false ) as $table ) {
+ $suppress = $wpdb->suppress_errors();
+ $table_fields = $wpdb->get_results( "DESCRIBE $prefix$table;" );
+ $wpdb->suppress_errors( $suppress );
+ $this->assertEmpty( $table_fields );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * When the main site of a network is fully deleted, its data should be cleared from cache.
+ */
+ function test_data_in_cache_after_wpmu_delete_blog_main_site_drop_true() {
+ $blog_id = 1; // The main site in our test suite has an ID of 1.
+
+ $details = get_blog_details( $blog_id, false );
+ $key = md5( $details->domain . $details->path );
+
+ // Delete the site and force a table drop.
+ wpmu_delete_blog( $blog_id, true );
+
+ $this->assertEquals( false, wp_cache_get( 'get_id_from_blogname_' . trim( $details->path, '/' ), 'blog-details' ) );
+ $this->assertEquals( false, wp_cache_get( $blog_id, 'blog-details' ) );
+ $this->assertEquals( false, wp_cache_get( $blog_id . 'short', 'blog-details' ) );
+ $this->assertEquals( false, wp_cache_get( $key, 'blog-lookup' ) );
+ $this->assertEquals( false, wp_cache_get( $key, 'blog-id-cache' ) );
+ }
+
+ /**
+ * When the main site of a network is fully deleted, its data should remain in the database.
+ */
+ function test_data_in_tables_after_wpmu_delete_blog_main_site_drop_true() {
+ global $wpdb;
+
+ $blog_id = 1; // The main site in our test suite has an ID of 1.
+
+ // Delete the site and force a table drop.
+ wpmu_delete_blog( $blog_id, true );
+
+ $prefix = $wpdb->get_blog_prefix( $blog_id );
+ 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, $prefix . $table );
+ }
+ }
+
+ /**
+ * The site count of a network should change when a site is flagged as 'deleted'.
+ */
+ function test_network_count_after_wpmu_delete_blog_drop_false() {
+ $blog_id = $this->factory->blog->create();
+
+ // Delete the site without forcing a table drop.
+ wpmu_delete_blog( $blog_id, false );
+
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, get_blog_count() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * The site count of a network should change when a site is fully deleted.
+ */
+ function test_blog_count_after_wpmu_delete_blog_drop_true() {
+ $blog_id = $this->factory->blog->create();
+
+ // Delete the site and force a table drop.
+ wpmu_delete_blog( $blog_id, true );
+
+ // update the blog count cache to use get_blog_count()
+ wp_update_network_counts();
+ $this->assertEquals( 1, get_blog_count() );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_wpmu_update_blogs_date() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>