<!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][941] trunk/tests/option/blogOption.php: More tests for *_blog_option().</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/941">941</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-07-27 14:58:06 +0000 (Fri, 27 Jul 2012)</dd>
</dl>

<h3>Log Message</h3>
<pre>More tests for *_blog_option(). See #WP21270</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsoptionblogOptionphp">trunk/tests/option/blogOption.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsoptionblogOptionphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/option/blogOption.php (940 => 941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/option/blogOption.php        2012-07-27 14:45:21 UTC (rev 940)
+++ trunk/tests/option/blogOption.php        2012-07-27 14:58:06 UTC (rev 941)
</span><span class="lines">@@ -41,5 +41,97 @@
</span><span class="cx">                 $this-&gt;assertFalse( get_blog_option( 1, $key2 ) );
</span><span class="cx">                 $this-&gt;assertFalse( get_option( $key2 ) ); // check get_option()
</span><span class="cx">         }
</span><ins>+
+        function test_from_same_site_with_null_blog_id() {
+                $key = rand_str();
+                $key2 = rand_str();
+                $value = rand_str();
+                $value2 = rand_str();
+
+                $this-&gt;assertFalse( get_blog_option( null, 'doesnotexist' ) );
+                $this-&gt;assertFalse( get_option( 'doesnotexist' ) ); // check get_option()
+
+                $this-&gt;assertTrue( add_blog_option( null, $key, $value ) );
+                // Assert all values of $blog_id that means the current or main blog (the same here).
+                $this-&gt;assertEquals( $value, get_blog_option( null, $key ) );
+                $this-&gt;assertEquals( $value, get_blog_option( null, $key ) );
+                $this-&gt;assertEquals( $value, get_option( $key ) ); // check get_option()
+
+                $this-&gt;assertFalse( add_blog_option( null, $key, $value ) );  // Already exists
+                $this-&gt;assertFalse( update_blog_option( null, $key, $value ) );  // Value is the same
+                $this-&gt;assertTrue( update_blog_option( null, $key, $value2 ) );
+                $this-&gt;assertEquals( $value2, get_blog_option( null, $key ) );
+                $this-&gt;assertEquals( $value2, get_option( $key ) ); // check get_option()
+                $this-&gt;assertFalse( add_blog_option( null, $key, $value ) );
+                $this-&gt;assertEquals( $value2, get_blog_option( null, $key ) );
+                $this-&gt;assertEquals( $value2, get_option( $key ) ); // check get_option()
+
+                $this-&gt;assertTrue( delete_blog_option( null, $key ) );
+                $this-&gt;assertFalse( get_blog_option( null, $key ) );
+                $this-&gt;assertFalse( get_option( $key ) ); // check get_option()
+                $this-&gt;assertFalse( delete_blog_option( null, $key ) );
+                $this-&gt;assertTrue( update_blog_option( null, $key2, $value2 ) );
+                $this-&gt;assertEquals( $value2, get_blog_option( null, $key2 ) );
+                $this-&gt;assertEquals( $value2, get_option( $key2 ) ); // check get_option()
+                $this-&gt;assertTrue( delete_blog_option( null, $key2 ) );
+                $this-&gt;assertFalse( get_blog_option( null, $key2 ) );
+                $this-&gt;assertFalse( get_option( $key2 ) ); // check get_option()
+        }
+
+        function test_with_another_site() {
+                global $current_site, $base;
+
+                $domain = 'blogoptiontest';
+
+                if ( is_subdomain_install() ) {
+                        $newdomain = $domain . '.' . preg_replace( '|^www\.|', '', $current_site-&gt;domain );
+                        $path = $base;
+                } else {
+                        $newdomain = $current_site-&gt;domain;
+                        $path = $base . $domain . '/';
+                }
+
+                $email = 'foo@foo.foo';
+                $password = wp_generate_password( 12, false );
+                $user_id = wpmu_create_user( $domain, $password, $email );
+                $this-&gt;assertInternalType( 'integer', $user_id );
+
+                $blog_id = wpmu_create_blog( $newdomain, $path, $title, $user_id , array( 'public' =&gt; 1 ), $current_site-&gt;id );
+                $this-&gt;assertInternalType( 'integer', $blog_id );
+
+                $key = rand_str();
+                $key2 = rand_str();
+                $value = rand_str();
+                $value2 = rand_str();
+
+                $this-&gt;assertFalse( get_blog_option( $blog_id, 'doesnotexist' ) );
+                //$this-&gt;assertFalse( get_option( 'doesnotexist' ) ); // check get_option()
+
+                $this-&gt;assertTrue( add_blog_option( $blog_id, $key, $value ) );
+                // Assert all values of $blog_id that means the current or main blog (the same here).
+                $this-&gt;assertEquals( $value, get_blog_option( $blog_id, $key ) );
+                $this-&gt;assertEquals( $value, get_blog_option( &quot;$blog_id&quot;, $key ) );
+                //$this-&gt;assertEquals( $value, get_option( $key ) ); // check get_option()
+
+                $this-&gt;assertFalse( add_blog_option( $blog_id, $key, $value ) );  // Already exists
+                $this-&gt;assertFalse( update_blog_option( $blog_id, $key, $value ) );  // Value is the same
+                $this-&gt;assertTrue( update_blog_option( $blog_id, $key, $value2 ) );
+                $this-&gt;assertEquals( $value2, get_blog_option( $blog_id, $key ) );
+                //$this-&gt;assertEquals( $value2, get_option( $key ) ); // check get_option()
+                $this-&gt;assertFalse( add_blog_option( $blog_id, $key, $value ) );
+                $this-&gt;assertEquals( $value2, get_blog_option( $blog_id, $key ) );
+                //$this-&gt;assertEquals( $value2, get_option( $key ) ); // check get_option()
+
+                $this-&gt;assertTrue( delete_blog_option( $blog_id, $key ) );
+                $this-&gt;assertFalse( get_blog_option( $blog_id, $key ) );
+                //$this-&gt;assertFalse( get_option( $key ) ); // check get_option()
+                $this-&gt;assertFalse( delete_blog_option( $blog_id, $key ) );
+                $this-&gt;assertTrue( update_blog_option( $blog_id, $key2, $value2 ) );
+                $this-&gt;assertEquals( $value2, get_blog_option( $blog_id, $key2 ) );
+                //$this-&gt;assertEquals( $value2, get_option( $key2 ) ); // check get_option()
+                $this-&gt;assertTrue( delete_blog_option( $blog_id, $key2 ) );
+                $this-&gt;assertFalse( get_blog_option( $blog_id, $key2 ) );
+                //$this-&gt;assertFalse( get_option( $key2 ) ); // check get_option()
+        }
</ins><span class="cx"> }
</span><span class="cx"> endif;
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>

</body>
</html>