<!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>[460] wp-testcase/test_ms.php: Describe all tables after blog creation to make sure they exist.</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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd><a href="http://unit-tests.trac.wordpress.org/changeset/460">460</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-10-20 15:07:24 +0000 (Thu, 20 Oct 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Describe all tables after blog creation to make sure they exist.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#wptestcasetest_msphp">wp-testcase/test_ms.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="wptestcasetest_msphp"></a>
<div class="modfile"><h4>Modified: wp-testcase/test_ms.php (459 => 460)</h4>
<pre class="diff"><span>
<span class="info">--- wp-testcase/test_ms.php        2011-10-19 22:37:50 UTC (rev 459)
+++ wp-testcase/test_ms.php        2011-10-20 15:07:24 UTC (rev 460)
</span><span class="lines">@@ -31,6 +31,13 @@
</span><span class="cx">                         $id = ( $i & 1 ) ? $user1_id : $user2_id;
</span><span class="cx">                         $blog_id = wpmu_create_blog( $current_site->domain, 'path'.$i, "Title".$i, $id );
</span><span class="cx">                         $this->assertInternalType( 'int', $blog_id );
</span><ins>+
+                        $prefix = $wpdb->get_blog_prefix( $blog_id );
+                        foreach ( $wpdb->tables( 'blog', false ) as $table ) {
+                                $table_fields = $wpdb->get_results( "DESCRIBE $prefix$table;" );
+                                $this->assertNotEmpty( $table_fields );
+                        }
+
</ins><span class="cx">                         $blog_ids[] = $blog_id;
</span><span class="cx">                 }
</span><span class="cx">
</span><span class="lines">@@ -43,15 +50,16 @@
</span><span class="cx">                 foreach ( $blog_ids as $blog_id ) {
</span><span class="cx">                         // drop tables for every second blog
</span><span class="cx">                         $drop_tables = ! $drop_tables;
</span><del>-                        $blog_prefix = $wpdb->get_blog_prefix( $blog_id );
</del><span class="cx">                         wpmu_delete_blog( $blog_id, $drop_tables );
</span><span class="cx">
</span><del>-                        // test the $drop argument
-                        $blog_tables = $wpdb->get_results( "SHOW TABLES LIKE '{$blog_prefix}%'", ARRAY_A );
-                        if ( $drop_tables )
-                                $this->assertEquals( 0 , count( $blog_tables ) );
-                        else
-                                $this->assertGreaterThan( 0 , count( $blog_tables ) );
</del><ins>+                        $prefix = $wpdb->get_blog_prefix( $blog_id );
+                        foreach ( $wpdb->tables( 'blog', false ) as $table ) {
+                                $table_fields = $wpdb->get_results( "DESCRIBE $prefix$table;" );
+                                if ( $drop_tables )
+                                        $this->assertEmpty( $table_fields );
+                                else
+                                        $this->assertNotEmpty( $table_fields );
+                        }
</ins><span class="cx">                 }
</span><span class="cx">
</span><span class="cx">                 // update the blog count cache to use get_blog_count()
</span></span></pre>
</div>
</div>
</body>
</html>