<!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>[34033] trunk/tests/phpunit/tests: Move `wp_delete_user()` tests to their own file.</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/34033">34033</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/34033","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-09-11 01:50:40 +0000 (Fri, 11 Sep 2015)</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'>Move `wp_delete_user()` tests to their own file.
    
See <a href="https://core.trac.wordpress.org/ticket/33800">#33800</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsuserphp">trunk/tests/phpunit/tests/user.php</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsuserwpDeleteUserphp">trunk/tests/phpunit/tests/user/wpDeleteUser.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsuserwpDeleteUserphpfromrev34032trunktestsphpunittestsuserphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/tests/phpunit/tests/user/wpDeleteUser.php (from rev 34032, trunk/tests/phpunit/tests/user.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/wpDeleteUser.php                           (rev 0)
+++ trunk/tests/phpunit/tests/user/wpDeleteUser.php     2015-09-11 01:50:40 UTC (rev 34033)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,128 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * @group user
+ */
+class Tests_User_WpDeleteUser extends WP_UnitTestCase {
+
+       /**
+        * Test that usermeta cache is cleared after user deletion.
+        *
+        * @ticket 19500
+        */
+       function test_get_blogs_of_user() {
+               // Logged out users don't have blogs.
+               $this->assertEquals( array(), get_blogs_of_user( 0 ) );
+
+               $user_id = $this->factory->user->create( array( 'role' => 'subscriber' ) );
+               $blogs = get_blogs_of_user( $user_id );
+               $this->assertEquals( array( 1 ), array_keys( $blogs ) );
+
+               // Non-existent users don't have blogs.
+               if ( is_multisite() )
+                       wpmu_delete_user( $user_id );
+               else
+                       wp_delete_user( $user_id );
+
+               $user = new WP_User( $user_id );
+               $this->assertFalse( $user->exists(), 'WP_User->exists' );
+               $this->assertEquals( array(), get_blogs_of_user( $user_id ) );
+       }
+
+       /**
+        * Test that usermeta cache is cleared after user deletion.
+        *
+        * @ticket 19500
+        */
+       function test_is_user_member_of_blog() {
+               $old_current = get_current_user_id();
+
+               $user_id = $this->factory->user->create( array( 'role' => 'subscriber' ) );
+               wp_set_current_user( $user_id );
+
+               $this->assertTrue( is_user_member_of_blog() );
+               $this->assertTrue( is_user_member_of_blog( 0, 0 ) );
+               $this->assertTrue( is_user_member_of_blog( 0, get_current_blog_id() ) );
+               $this->assertTrue( is_user_member_of_blog( $user_id ) );
+               $this->assertTrue( is_user_member_of_blog( $user_id, get_current_blog_id() ) );
+
+               // Will only remove the user from the current site in multisite; this is desired
+               // and will achieve the desired effect with is_user_member_of_blog().
+               wp_delete_user( $user_id );
+
+               $this->assertFalse( is_user_member_of_blog( $user_id ) );
+               $this->assertFalse( is_user_member_of_blog( $user_id, get_current_blog_id() ) );
+
+               wp_set_current_user( $old_current );
+       }
+
+       function test_delete_user() {
+               $user_id = $this->factory->user->create( array( 'role' => 'author' ) );
+               $user = new WP_User( $user_id );
+
+               $post = array(
+                       'post_author' => $user_id,
+                       'post_status' => 'publish',
+                       'post_content' => rand_str(),
+                       'post_title' => rand_str(),
+                       'post_type' => 'post',
+               );
+
+               // insert a post and make sure the ID is ok
+               $post_id = wp_insert_post($post);
+               $this->assertTrue(is_numeric($post_id));
+               $this->assertTrue($post_id > 0);
+
+               $post = get_post( $post_id );
+               $this->assertEquals( $post_id, $post->ID );
+
+               $post = array(
+                       'post_author' => $user_id,
+                       'post_status' => 'publish',
+                       'post_content' => rand_str(),
+                       'post_title' => rand_str(),
+                       'post_type' => 'nav_menu_item',
+               );
+
+               // insert a post and make sure the ID is ok
+               $nav_id = wp_insert_post($post);
+               $this->assertTrue(is_numeric($nav_id));
+               $this->assertTrue($nav_id > 0);
+
+               $post = get_post( $nav_id );
+               $this->assertEquals( $nav_id, $post->ID );
+
+               wp_delete_user( $user_id );
+               $user = new WP_User( $user_id );
+               if ( is_multisite() )
+                       $this->assertTrue( $user->exists() );
+               else
+                       $this->assertFalse( $user->exists() );
+
+               $this->assertNotNull( get_post( $post_id ) );
+               $this->assertEquals( 'trash', get_post( $post_id )->post_status );
+               // nav_menu_item is delete_with_user = false so the nav post should remain published.
+               $this->assertNotNull( get_post( $nav_id ) );
+               $this->assertEquals( 'publish', get_post( $nav_id )->post_status );
+               wp_delete_post( $nav_id, true );
+               $this->assertNull( get_post( $nav_id ) );
+               wp_delete_post( $post_id, true );
+               $this->assertNull( get_post( $post_id ) );
+       }
+
+       /**
+        * @ticket 20447
+        */
+       function test_wp_delete_user_reassignment_clears_post_caches() {
+               $user_id   = $this->factory->user->create();
+               $reassign  = $this->factory->user->create();
+               $post_id   = $this->factory->post->create( array( 'post_author' => $user_id ) );
+
+               get_post( $post_id ); // Ensure this post is in the cache.
+
+               wp_delete_user( $user_id, $reassign );
+
+               $post = get_post( $post_id );
+               $this->assertEquals( $reassign, $post->post_author );
+       }
+}
</ins></span></pre></div>
<a id="trunktestsphpunittestsuserphp"></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/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user.php        2015-09-11 01:46:17 UTC (rev 34032)
+++ trunk/tests/phpunit/tests/user.php  2015-09-11 01:50:40 UTC (rev 34033)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -335,62 +335,6 @@
</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 that usermeta cache is cleared after user deletion.
-        *
-        * @ticket 19500
-        */
-       function test_get_blogs_of_user() {
-               // Logged out users don't have blogs.
-               $this->assertEquals( array(), get_blogs_of_user( 0 ) );
-
-               $user_id = $this->factory->user->create( array( 'role' => 'subscriber' ) );
-               $blogs = get_blogs_of_user( $user_id );
-               $this->assertEquals( array( 1 ), array_keys( $blogs ) );
-
-               // Non-existent users don't have blogs.
-               if ( is_multisite() )
-                       wpmu_delete_user( $user_id );
-               else
-                       wp_delete_user( $user_id );
-
-               $user = new WP_User( $user_id );
-               $this->assertFalse( $user->exists(), 'WP_User->exists' );
-               $this->assertEquals( array(), get_blogs_of_user( $user_id ) );
-       }
-
-       /**
-        * Test that usermeta cache is cleared after user deletion.
-        *
-        * @ticket 19500
-        */
-       function test_is_user_member_of_blog() {
-               $old_current = get_current_user_id();
-
-               $this->assertSame( 0, $old_current );
-
-               // test for "get current user" when not logged in
-               $this->assertFalse( is_user_member_of_blog() );
-
-               $user_id = $this->factory->user->create( array( 'role' => 'subscriber' ) );
-               wp_set_current_user( $user_id );
-
-               $this->assertTrue( is_user_member_of_blog() );
-               $this->assertTrue( is_user_member_of_blog( 0, 0 ) );
-               $this->assertTrue( is_user_member_of_blog( 0, get_current_blog_id() ) );
-               $this->assertTrue( is_user_member_of_blog( $user_id ) );
-               $this->assertTrue( is_user_member_of_blog( $user_id, get_current_blog_id() ) );
-
-               // Will only remove the user from the current site in multisite; this is desired
-               // and will achieve the desired effect with is_user_member_of_blog().
-               wp_delete_user( $user_id );
-
-               $this->assertFalse( is_user_member_of_blog( $user_id ) );
-               $this->assertFalse( is_user_member_of_blog( $user_id, get_current_blog_id() ) );
-
-               wp_set_current_user( $old_current );
-       }
-
-       /**
</del><span class="cx" style="display: block; padding: 0 10px">          * ticket 19595
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        function test_global_userdata() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -461,60 +405,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        setup_postdata( get_post( $old_post_id ) );
</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">-        function test_delete_user() {
-               $user_id = $this->factory->user->create( array( 'role' => 'author' ) );
-               $user = new WP_User( $user_id );
-
-               $post = array(
-                       'post_author' => $user_id,
-                       'post_status' => 'publish',
-                       'post_content' => rand_str(),
-                       'post_title' => rand_str(),
-                       'post_type' => 'post',
-               );
-
-               // insert a post and make sure the ID is ok
-               $post_id = wp_insert_post($post);
-               $this->assertTrue(is_numeric($post_id));
-               $this->assertTrue($post_id > 0);
-
-               $post = get_post( $post_id );
-               $this->assertEquals( $post_id, $post->ID );
-
-               $post = array(
-                       'post_author' => $user_id,
-                       'post_status' => 'publish',
-                       'post_content' => rand_str(),
-                       'post_title' => rand_str(),
-                       'post_type' => 'nav_menu_item',
-               );
-
-               // insert a post and make sure the ID is ok
-               $nav_id = wp_insert_post($post);
-               $this->assertTrue(is_numeric($nav_id));
-               $this->assertTrue($nav_id > 0);
-
-               $post = get_post( $nav_id );
-               $this->assertEquals( $nav_id, $post->ID );
-
-               wp_delete_user( $user_id );
-               $user = new WP_User( $user_id );
-               if ( is_multisite() )
-                       $this->assertTrue( $user->exists() );
-               else
-                       $this->assertFalse( $user->exists() );
-
-               $this->assertNotNull( get_post( $post_id ) );
-               $this->assertEquals( 'trash', get_post( $post_id )->post_status );
-               // nav_menu_item is delete_with_user = false so the nav post should remain published.
-               $this->assertNotNull( get_post( $nav_id ) );
-               $this->assertEquals( 'publish', get_post( $nav_id )->post_status );
-               wp_delete_post( $nav_id, true );
-               $this->assertNull( get_post( $nav_id ) );
-               wp_delete_post( $post_id, true );
-               $this->assertNull( get_post( $post_id ) );
-       }
-
</del><span class="cx" style="display: block; padding: 0 10px">         /**
</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 13317
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -556,22 +446,6 @@
</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">-         * @ticket 20447
-        */
-       function test_wp_delete_user_reassignment_clears_post_caches() {
-               $user_id   = $this->factory->user->create();
-               $reassign  = $this->factory->user->create();
-               $post_id   = $this->factory->post->create( array( 'post_author' => $user_id ) );
-
-               get_post( $post_id ); // Ensure this post is in the cache.
-
-               wp_delete_user( $user_id, $reassign );
-
-               $post = get_post( $post_id );
-               $this->assertEquals( $reassign, $post->post_author );
-       }
-
-       /**
</del><span class="cx" style="display: block; padding: 0 10px">          * @ticket 21431
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        function test_count_many_users_posts() {
</span></span></pre>
</div>
</div>

</body>
</html>