<!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>[823] trunk/wp-testcase/test_includes_pluggable.php: Port pluggable.php 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, #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/823">823</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-06-30 22:04:01 +0000 (Sat, 30 Jun 2012)</dd>
</dl>

<h3>Log Message</h3>
<pre>Port pluggable.php tests. fixes <a href="http://unit-tests.trac.wordpress.org/ticket/87">#87</a>.

PHPMailer tests must wait for the mock to be ported. see <a href="http://unit-tests.trac.wordpress.org/ticket/27">#27</a>. currently marked as skipped.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwptestcasetest_includes_pluggablephp">trunk/wp-testcase/test_includes_pluggable.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwptestcasetest_includes_pluggablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-testcase/test_includes_pluggable.php (822 => 823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-testcase/test_includes_pluggable.php        2012-06-30 21:54:15 UTC (rev 822)
+++ trunk/wp-testcase/test_includes_pluggable.php        2012-06-30 22:04:01 UTC (rev 823)
</span><span class="lines">@@ -1,18 +1,16 @@
</span><span class="cx"> &lt;?php
</span><span class="cx"> 
</span><del>-class TestAuthFunctions extends WPTestCase {
</del><ins>+/**
+ * @group pluggable
+ */
+class TestAuthFunctions extends WP_UnitTestCase {
</ins><span class="cx">         var $user_id;
</span><span class="cx"> 
</span><span class="cx">         function setUp() {
</span><span class="cx">                 parent::setUp();
</span><del>-                $this-&gt;user_id = $this-&gt;_make_user();
</del><ins>+                $this-&gt;user_id = $this-&gt;factory-&gt;user-&gt;create();
</ins><span class="cx">         }
</span><span class="cx"> 
</span><del>-        function tearDown() {
-                $this-&gt;_destroy_user( $this-&gt;user_id );
-                parent::tearDown();
-        }
-
</del><span class="cx">         function test_auth_cookie_valid() {
</span><span class="cx">                 $cookie = wp_generate_auth_cookie( $this-&gt;user_id, time() + 3600, 'auth' );
</span><span class="cx">                 $this-&gt;assertEquals( $this-&gt;user_id, wp_validate_auth_cookie( $cookie, 'auth' ) );
</span><span class="lines">@@ -45,7 +43,16 @@
</span><span class="cx">         }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-class TestMailFunctions extends WPTestCase {
</del><ins>+/**
+ * @group pluggable
+ * @group mail
+ */
+class TestMailFunctions extends WP_UnitTestCase {
+        function setUp() {
+                parent::setUp();
+                $this-&gt;knownUTBug( 47 );
+        }
+
</ins><span class="cx">         function test_wp_mail_custom_boundaries() {
</span><span class="cx">                 $to = 'user@example.com';
</span><span class="cx">                 $subject = 'Test email with custom boundaries';
</span><span class="lines">@@ -240,7 +247,10 @@
</span><span class="cx">         }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-class TestRedirectFunctions extends WPTestCase {
</del><ins>+/**
+ * @group pluggable
+ */
+class TestRedirectFunctions extends WP_UnitTestCase {
</ins><span class="cx">         function test_wp_sanitize_redirect() {
</span><span class="cx">                 $this-&gt;assertEquals('http://example.com/watchthelinefeedgo', wp_sanitize_redirect('http://example.com/watchthelinefeed%0Ago'));
</span><span class="cx">                 $this-&gt;assertEquals('http://example.com/watchthelinefeedgo', wp_sanitize_redirect('http://example.com/watchthelinefeed%0ago'));
</span><span class="lines">@@ -252,24 +262,14 @@
</span><span class="cx">         }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-class TestUserFunction extends _WPEmptyBlog {
-        var $user_ids = array();
-
-        function setUp() {
-                parent::setUp();
-                // keep track of users we create
-                $this-&gt;user_ids = array();
-        }
-
-        function tearDown() {
-                parent::tearDown();
-                // delete any users that were created during tests
-                $this-&gt;_destroy_users();
-        }
-
</del><ins>+/**
+ * @group pluggable
+ * @group user
+ */
+class TestUserFunction extends WP_UnitTestCase {
</ins><span class="cx">         // #13317
</span><span class="cx">         function test_get_userdata() {
</span><del>-                $id = $this-&gt;_make_user('administrator');
</del><ins>+                $id = $this-&gt;factory-&gt;user-&gt;create( array( 'role' =&gt; 'administrator' ) );
</ins><span class="cx">                 $this-&gt;assertFalse( get_userdata( 0 ) );
</span><span class="cx">                 $this-&gt;assertFalse( get_userdata( 'string' ) );
</span><span class="cx">                 $this-&gt;assertFalse( get_userdata( array( 'array' ) ) );
</span></span></pre>
</div>
</div>

</body>
</html>