<!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>[Tests][1089] trunk/tests/ms.php: Remove closure from ms.php.</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/1089">1089</a></dd>
<dt>Author</dt> <dd>SergeyBiryukov</dd>
<dt>Date</dt> <dd>2012-10-24 13:49:01 +0000 (Wed, 24 Oct 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove closure from ms.php. see <a href="http://unit-tests.trac.wordpress.org/changeset/1078">[1078]</a>. see <a href="http://unit-tests.trac.wordpress.org/ticket/101">#101</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsmsphp">trunk/tests/ms.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsmsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/ms.php (1088 => 1089)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/ms.php 2012-10-19 22:29:56 UTC (rev 1088)
+++ trunk/tests/ms.php 2012-10-24 13:49:01 UTC (rev 1089)
</span><span class="lines">@@ -370,8 +370,13 @@
</span><span class="cx"> $this->assertEquals( $blog_id, get_id_from_blogname('test_blogname') );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function _action_counter_cb( $blog_id ) {
+ global $test_action_counter;
+ $test_action_counter++;
+ }
+
</ins><span class="cx"> function test_update_blog_details() {
</span><del>- global $current_site;
</del><ins>+ global $current_site, $test_action_counter;
</ins><span class="cx">
</span><span class="cx"> $user_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
</span><span class="cx"> $blog_id = $this->factory->blog->create( array( 'user_id' => $user_id, 'path' => '/test_blogpath', 'title' => 'Test Title' ) );
</span><span class="lines">@@ -399,14 +404,9 @@
</span><span class="cx"> $this->assertEquals( 'my_path/', $blog->path );
</span><span class="cx"> $this->assertEquals( '1', $blog->spam );
</span><span class="cx">
</span><del>- global $test_action_counter;
</del><span class="cx"> $test_action_counter = 0;
</span><del>- $callback = function( $blog_id ) {
- global $test_action_counter;
- $test_action_counter++;
- };
</del><span class="cx">
</span><del>- add_action( 'make_ham_blog', $callback, 10, 1 );
</del><ins>+ add_action( 'make_ham_blog', array( $this, '_action_counter_cb' ), 10, 1 );
</ins><span class="cx"> $result = update_blog_details( $blog_id, array( 'spam' => 0 ) );
</span><span class="cx"> $this->assertTrue( $result );
</span><span class="cx"> $blog = get_blog_details( $blog_id );
</span><span class="lines">@@ -419,9 +419,9 @@
</span><span class="cx"> $blog = get_blog_details( $blog_id );
</span><span class="cx"> $this->assertEquals( '0', $blog->spam );
</span><span class="cx"> $this->assertEquals( 1, $test_action_counter );
</span><del>- remove_action( 'make_ham_blog', $callback, 10, 1 );
</del><ins>+ remove_action( 'make_ham_blog', array( $this, '_action_counter_cb' ), 10, 1 );
</ins><span class="cx">
</span><del>- add_action( 'make_spam_blog', $callback, 10, 1 );
</del><ins>+ add_action( 'make_spam_blog', array( $this, '_action_counter_cb' ), 10, 1 );
</ins><span class="cx"> $result = update_blog_details( $blog_id, array( 'spam' => 1 ) );
</span><span class="cx"> $this->assertTrue( $result );
</span><span class="cx"> $blog = get_blog_details( $blog_id );
</span><span class="lines">@@ -434,9 +434,9 @@
</span><span class="cx"> $blog = get_blog_details( $blog_id );
</span><span class="cx"> $this->assertEquals( '1', $blog->spam );
</span><span class="cx"> $this->assertEquals( 2, $test_action_counter );
</span><del>- remove_action( 'make_spam_blog', $callback, 10, 1 );
</del><ins>+ remove_action( 'make_spam_blog', array( $this, '_action_counter_cb' ), 10, 1 );
</ins><span class="cx">
</span><del>- add_action( 'archive_blog', $callback, 10, 1 );
</del><ins>+ add_action( 'archive_blog', array( $this, '_action_counter_cb' ), 10, 1 );
</ins><span class="cx"> $result = update_blog_details( $blog_id, array( 'archived' => 1 ) );
</span><span class="cx"> $this->assertTrue( $result );
</span><span class="cx"> $blog = get_blog_details( $blog_id );
</span><span class="lines">@@ -449,9 +449,9 @@
</span><span class="cx"> $blog = get_blog_details( $blog_id );
</span><span class="cx"> $this->assertEquals( '1', $blog->archived );
</span><span class="cx"> $this->assertEquals( 3, $test_action_counter );
</span><del>- remove_action( 'archive_blog', $callback, 10, 1 );
</del><ins>+ remove_action( 'archive_blog', array( $this, '_action_counter_cb' ), 10, 1 );
</ins><span class="cx">
</span><del>- add_action( 'unarchive_blog', $callback, 10, 1 );
</del><ins>+ add_action( 'unarchive_blog', array( $this, '_action_counter_cb' ), 10, 1 );
</ins><span class="cx"> $result = update_blog_details( $blog_id, array( 'archived' => 0 ) );
</span><span class="cx"> $this->assertTrue( $result );
</span><span class="cx"> $blog = get_blog_details( $blog_id );
</span><span class="lines">@@ -464,9 +464,9 @@
</span><span class="cx"> $blog = get_blog_details( $blog_id );
</span><span class="cx"> $this->assertEquals( '0', $blog->archived );
</span><span class="cx"> $this->assertEquals( 4, $test_action_counter );
</span><del>- remove_action( 'unarchive_blog', $callback, 10, 1 );
</del><ins>+ remove_action( 'unarchive_blog', array( $this, '_action_counter_cb' ), 10, 1 );
</ins><span class="cx">
</span><del>- add_action( 'make_delete_blog', $callback, 10, 1 );
</del><ins>+ add_action( 'make_delete_blog', array( $this, '_action_counter_cb' ), 10, 1 );
</ins><span class="cx"> $result = update_blog_details( $blog_id, array( 'deleted' => 1 ) );
</span><span class="cx"> $this->assertTrue( $result );
</span><span class="cx"> $blog = get_blog_details( $blog_id );
</span><span class="lines">@@ -479,9 +479,9 @@
</span><span class="cx"> $blog = get_blog_details( $blog_id );
</span><span class="cx"> $this->assertEquals( '1', $blog->deleted );
</span><span class="cx"> $this->assertEquals( 5, $test_action_counter );
</span><del>- remove_action( 'make_delete_blog', $callback, 10, 1 );
</del><ins>+ remove_action( 'make_delete_blog', array( $this, '_action_counter_cb' ), 10, 1 );
</ins><span class="cx">
</span><del>- add_action( 'make_undelete_blog', $callback, 10, 1 );
</del><ins>+ add_action( 'make_undelete_blog', array( $this, '_action_counter_cb' ), 10, 1 );
</ins><span class="cx"> $result = update_blog_details( $blog_id, array( 'deleted' => 0 ) );
</span><span class="cx"> $this->assertTrue( $result );
</span><span class="cx"> $blog = get_blog_details( $blog_id );
</span><span class="lines">@@ -494,9 +494,9 @@
</span><span class="cx"> $blog = get_blog_details( $blog_id );
</span><span class="cx"> $this->assertEquals( '0', $blog->deleted );
</span><span class="cx"> $this->assertEquals( 6, $test_action_counter );
</span><del>- remove_action( 'make_undelete_blog', $callback, 10, 1 );
</del><ins>+ remove_action( 'make_undelete_blog', array( $this, '_action_counter_cb' ), 10, 1 );
</ins><span class="cx">
</span><del>- add_action( 'mature_blog', $callback, 10, 1 );
</del><ins>+ add_action( 'mature_blog', array( $this, '_action_counter_cb' ), 10, 1 );
</ins><span class="cx"> $result = update_blog_details( $blog_id, array( 'mature' => 1 ) );
</span><span class="cx"> $this->assertTrue( $result );
</span><span class="cx"> $blog = get_blog_details( $blog_id );
</span><span class="lines">@@ -509,9 +509,9 @@
</span><span class="cx"> $blog = get_blog_details( $blog_id );
</span><span class="cx"> $this->assertEquals( '1', $blog->mature );
</span><span class="cx"> $this->assertEquals( 7, $test_action_counter );
</span><del>- remove_action( 'mature_blog', $callback, 10, 1 );
</del><ins>+ remove_action( 'mature_blog', array( $this, '_action_counter_cb' ), 10, 1 );
</ins><span class="cx">
</span><del>- add_action( 'unmature_blog', $callback, 10, 1 );
</del><ins>+ add_action( 'unmature_blog', array( $this, '_action_counter_cb' ), 10, 1 );
</ins><span class="cx"> $result = update_blog_details( $blog_id, array( 'mature' => 0 ) );
</span><span class="cx"> $this->assertTrue( $result );
</span><span class="cx"> $blog = get_blog_details( $blog_id );
</span><span class="lines">@@ -524,22 +524,19 @@
</span><span class="cx"> $blog = get_blog_details( $blog_id );
</span><span class="cx"> $this->assertEquals( '0', $blog->mature );
</span><span class="cx"> $this->assertEquals( 8, $test_action_counter );
</span><del>- remove_action( 'unmature_blog', $callback, 10, 1 );
</del><ins>+ remove_action( 'unmature_blog', array( $this, '_action_counter_cb' ), 10, 1 );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_update_blog_status() {
</span><ins>+ global $test_action_counter;
+
</ins><span class="cx"> $user_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
</span><span class="cx"> $blog_id = $this->factory->blog->create( array( 'user_id' => $user_id, 'path' => '/test_blogpath', 'title' => 'Test Title' ) );
</span><span class="cx"> $this->assertInternalType( 'int', $blog_id );
</span><span class="cx">
</span><del>- global $test_action_counter;
</del><span class="cx"> $test_action_counter = 0;
</span><del>- $callback = function( $blog_id ) {
- global $test_action_counter;
- $test_action_counter++;
- };
</del><span class="cx">
</span><del>- add_action( 'make_ham_blog', $callback, 10, 1 );
</del><ins>+ add_action( 'make_ham_blog', array( $this, '_action_counter_cb' ), 10, 1 );
</ins><span class="cx"> $result = update_blog_status( $blog_id, 'spam', 0 );
</span><span class="cx"> $this->assertEquals( 0, $result );
</span><span class="cx"> $blog = get_blog_details( $blog_id );
</span><span class="lines">@@ -552,9 +549,9 @@
</span><span class="cx"> $blog = get_blog_details( $blog_id );
</span><span class="cx"> $this->assertEquals( '0', $blog->spam );
</span><span class="cx"> $this->assertEquals( 2, $test_action_counter );
</span><del>- remove_action( 'make_ham_blog', $callback, 10, 1 );
</del><ins>+ remove_action( 'make_ham_blog', array( $this, '_action_counter_cb' ), 10, 1 );
</ins><span class="cx">
</span><del>- add_action( 'make_spam_blog', $callback, 10, 1 );
</del><ins>+ add_action( 'make_spam_blog', array( $this, '_action_counter_cb' ), 10, 1 );
</ins><span class="cx"> $result = update_blog_status( $blog_id, 'spam', 1 );
</span><span class="cx"> $this->assertEquals( 1, $result );
</span><span class="cx"> $blog = get_blog_details( $blog_id );
</span><span class="lines">@@ -567,9 +564,9 @@
</span><span class="cx"> $blog = get_blog_details( $blog_id );
</span><span class="cx"> $this->assertEquals( '1', $blog->spam );
</span><span class="cx"> $this->assertEquals( 4, $test_action_counter );
</span><del>- remove_action( 'make_spam_blog', $callback, 10, 1 );
</del><ins>+ remove_action( 'make_spam_blog', array( $this, '_action_counter_cb' ), 10, 1 );
</ins><span class="cx">
</span><del>- add_action( 'archive_blog', $callback, 10, 1 );
</del><ins>+ add_action( 'archive_blog', array( $this, '_action_counter_cb' ), 10, 1 );
</ins><span class="cx"> $result = update_blog_status( $blog_id, 'archived', 1 );
</span><span class="cx"> $this->assertEquals( 1, $result );
</span><span class="cx"> $blog = get_blog_details( $blog_id );
</span><span class="lines">@@ -582,9 +579,9 @@
</span><span class="cx"> $blog = get_blog_details( $blog_id );
</span><span class="cx"> $this->assertEquals( '1', $blog->archived );
</span><span class="cx"> $this->assertEquals( 6, $test_action_counter );
</span><del>- remove_action( 'archive_blog', $callback, 10, 1 );
</del><ins>+ remove_action( 'archive_blog', array( $this, '_action_counter_cb' ), 10, 1 );
</ins><span class="cx">
</span><del>- add_action( 'unarchive_blog', $callback, 10, 1 );
</del><ins>+ add_action( 'unarchive_blog', array( $this, '_action_counter_cb' ), 10, 1 );
</ins><span class="cx"> $result = update_blog_status( $blog_id, 'archived', 0 );
</span><span class="cx"> $this->assertEquals( 0, $result );
</span><span class="cx"> $blog = get_blog_details( $blog_id );
</span><span class="lines">@@ -597,9 +594,9 @@
</span><span class="cx"> $blog = get_blog_details( $blog_id );
</span><span class="cx"> $this->assertEquals( '0', $blog->archived );
</span><span class="cx"> $this->assertEquals( 8, $test_action_counter );
</span><del>- remove_action( 'unarchive_blog', $callback, 10, 1 );
</del><ins>+ remove_action( 'unarchive_blog', array( $this, '_action_counter_cb' ), 10, 1 );
</ins><span class="cx">
</span><del>- add_action( 'make_delete_blog', $callback, 10, 1 );
</del><ins>+ add_action( 'make_delete_blog', array( $this, '_action_counter_cb' ), 10, 1 );
</ins><span class="cx"> $result = update_blog_status( $blog_id, 'deleted', 1 );
</span><span class="cx"> $this->assertEquals( 1, $result );
</span><span class="cx"> $blog = get_blog_details( $blog_id );
</span><span class="lines">@@ -612,9 +609,9 @@
</span><span class="cx"> $blog = get_blog_details( $blog_id );
</span><span class="cx"> $this->assertEquals( '1', $blog->deleted );
</span><span class="cx"> $this->assertEquals( 10, $test_action_counter );
</span><del>- remove_action( 'make_delete_blog', $callback, 10, 1 );
</del><ins>+ remove_action( 'make_delete_blog', array( $this, '_action_counter_cb' ), 10, 1 );
</ins><span class="cx">
</span><del>- add_action( 'make_undelete_blog', $callback, 10, 1 );
</del><ins>+ add_action( 'make_undelete_blog', array( $this, '_action_counter_cb' ), 10, 1 );
</ins><span class="cx"> $result = update_blog_status( $blog_id, 'deleted', 0 );
</span><span class="cx"> $this->assertEquals( 0, $result );
</span><span class="cx"> $blog = get_blog_details( $blog_id );
</span><span class="lines">@@ -627,9 +624,9 @@
</span><span class="cx"> $blog = get_blog_details( $blog_id );
</span><span class="cx"> $this->assertEquals( '0', $blog->deleted );
</span><span class="cx"> $this->assertEquals( 12, $test_action_counter );
</span><del>- remove_action( 'make_undelete_blog', $callback, 10, 1 );
</del><ins>+ remove_action( 'make_undelete_blog', array( $this, '_action_counter_cb' ), 10, 1 );
</ins><span class="cx">
</span><del>- add_action( 'mature_blog', $callback, 10, 1 );
</del><ins>+ add_action( 'mature_blog', array( $this, '_action_counter_cb' ), 10, 1 );
</ins><span class="cx"> $result = update_blog_status( $blog_id, 'mature', 1 );
</span><span class="cx"> $this->assertEquals( 1, $result );
</span><span class="cx"> $blog = get_blog_details( $blog_id );
</span><span class="lines">@@ -642,9 +639,9 @@
</span><span class="cx"> $blog = get_blog_details( $blog_id );
</span><span class="cx"> $this->assertEquals( '1', $blog->mature );
</span><span class="cx"> $this->assertEquals( 14, $test_action_counter );
</span><del>- remove_action( 'mature_blog', $callback, 10, 1 );
</del><ins>+ remove_action( 'mature_blog', array( $this, '_action_counter_cb' ), 10, 1 );
</ins><span class="cx">
</span><del>- add_action( 'unmature_blog', $callback, 10, 1 );
</del><ins>+ add_action( 'unmature_blog', array( $this, '_action_counter_cb' ), 10, 1 );
</ins><span class="cx"> $result = update_blog_status( $blog_id, 'mature', 0 );
</span><span class="cx"> $this->assertEquals( 0, $result );
</span><span class="cx"> $blog = get_blog_details( $blog_id );
</span><span class="lines">@@ -657,7 +654,7 @@
</span><span class="cx"> $blog = get_blog_details( $blog_id );
</span><span class="cx"> $this->assertEquals( '0', $blog->mature );
</span><span class="cx"> $this->assertEquals( 16, $test_action_counter );
</span><del>- remove_action( 'unmature_blog', $callback, 10, 1 );
</del><ins>+ remove_action( 'unmature_blog', array( $this, '_action_counter_cb' ), 10, 1 );
</ins><span class="cx">
</span><span class="cx"> // Updating a dummy field returns the value passed. Go fig.
</span><span class="cx"> $result = update_blog_status( $blog_id, 'doesnotexist', 1 );
</span></span></pre>
</div>
</div>
</body>
</html>