<!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>[797] trunk/wp-testcase/test_user.php: Port test_user.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/797">797</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-06-30 19:47:49 +0000 (Sat, 30 Jun 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Port test_user.php. fixes <a href="http://unit-tests.trac.wordpress.org/ticket/69">#69</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwptestcasetest_userphp">trunk/wp-testcase/test_user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwptestcasetest_userphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-testcase/test_user.php (796 => 797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-testcase/test_user.php 2012-06-30 19:44:27 UTC (rev 796)
+++ trunk/wp-testcase/test_user.php 2012-06-30 19:47:49 UTC (rev 797)
</span><span class="lines">@@ -1,25 +1,18 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> // test functions in wp-includes/user.php
</span><ins>+/**
+ * @group user
+ */
+class TestWPUser extends WP_UnitTestCase {
</ins><span class="cx">
</span><del>-class TestWPUser extends _WPEmptyBlog {
-
- var $user_ids = array();
</del><span class="cx"> protected $_deprecated_errors = array();
</span><span class="cx">
</span><span class="cx"> function setUp() {
</span><span class="cx"> parent::setUp();
</span><del>- // keep track of users we create
- $this->user_ids = array();
</del><span class="cx"> $this->_deprecated_errors = array();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function tearDown() {
- parent::tearDown();
- // delete any users that were created during tests
- $this->_destroy_users();
- }
-
</del><span class="cx"> public function deprecated_handler( $function, $message, $version ) {
</span><span class="cx"> $this->_deprecated_errors[] = array(
</span><span class="cx"> 'function' => $function,
</span><span class="lines">@@ -32,7 +25,7 @@
</span><span class="cx"> // add one of each user role
</span><span class="cx"> $user_role = array();
</span><span class="cx"> foreach ( array('administrator', 'editor', 'author', 'contributor', 'subscriber' ) as $role ) {
</span><del>- $id = $this->_make_user( $role );
</del><ins>+ $id = $this->factory->user->create( array( 'role' => $role ) );
</ins><span class="cx"> $user_role[ $id ] = $role;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -57,7 +50,7 @@
</span><span class="cx"> $key = rand_str();
</span><span class="cx"> $val = rand_str();
</span><span class="cx">
</span><del>- $user_id = $this->_make_user('author');
</del><ins>+ $user_id = $this->factory->user->create( array( 'role' => 'author' ) );
</ins><span class="cx">
</span><span class="cx"> // get an option that doesn't exist
</span><span class="cx"> $this->assertFalse(get_user_option($key, $user_id));
</span><span class="lines">@@ -79,7 +72,7 @@
</span><span class="cx"> $key = rand_str();
</span><span class="cx"> $val = rand_str();
</span><span class="cx">
</span><del>- $user_id = $this->_make_user('author');
</del><ins>+ $user_id = $this->factory->user->create( array( 'role' => 'author' ) );
</ins><span class="cx">
</span><span class="cx"> // get a meta key that doesn't exist
</span><span class="cx"> $this->assertEquals( '', get_usermeta($user_id, $key) );
</span><span class="lines">@@ -117,7 +110,7 @@
</span><span class="cx"> rand_str() => 'val-'.rand_str(),
</span><span class="cx"> );
</span><span class="cx">
</span><del>- $user_id = $this->_make_user('author');
</del><ins>+ $user_id = $this->factory->user->create( array( 'role' => 'author' ) );
</ins><span class="cx">
</span><span class="cx"> // there is already some stuff in the array
</span><span class="cx"> $this->assertTrue(is_array(get_usermeta($user_id)));
</span><span class="lines">@@ -148,7 +141,7 @@
</span><span class="cx">
</span><span class="cx"> // Test property magic functions for property get/set/isset.
</span><span class="cx"> function test_user_properties() {
</span><del>- $user_id = $this->_make_user('author');
</del><ins>+ $user_id = $this->factory->user->create( array( 'role' => 'author' ) );
</ins><span class="cx"> $user = new WP_User( $user_id );
</span><span class="cx">
</span><span class="cx"> foreach ( $user->data as $key => $data ) {
</span><span class="lines">@@ -175,7 +168,7 @@
</span><span class="cx"> $this->knownWPBug( 20043 );
</span><span class="cx">
</span><span class="cx"> // New user
</span><del>- $user_id = $this->_make_user('author');
</del><ins>+ $user_id = $this->factory->user->create( array( 'role' => 'author' ) );
</ins><span class="cx"> $user = new WP_User( $user_id );
</span><span class="cx">
</span><span class="cx"> // Test custom fields
</span><span class="lines">@@ -202,7 +195,7 @@
</span><span class="cx"> function test_user_meta_properties() {
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><del>- $user_id = $this->_make_user('author');
</del><ins>+ $user_id = $this->factory->user->create( array( 'role' => 'author' ) );
</ins><span class="cx"> $user = new WP_User( $user_id );
</span><span class="cx">
</span><span class="cx"> update_user_option( $user_id, 'foo', 'foo', true );
</span><span class="lines">@@ -213,7 +206,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_id_property_back_compat() {
</span><del>- $user_id = $this->_make_user('author');
</del><ins>+ $user_id = $this->factory->user->create( array( 'role' => 'author' ) );
</ins><span class="cx"> $user = new WP_User( $user_id );
</span><span class="cx">
</span><span class="cx"> $this->assertTrue( isset( $user->id ) );
</span><span class="lines">@@ -235,7 +228,7 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> foreach ( $roles as $role => $level ) {
</span><del>- $user_id = $this->_make_user( $role );
</del><ins>+ $user_id = $this->factory->user->create( array( 'role' => $role ) );
</ins><span class="cx"> $user = new WP_User( $user_id );
</span><span class="cx">
</span><span class="cx"> $this->assertTrue( isset( $user->user_level ) );
</span><span class="lines">@@ -244,7 +237,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_construction() {
</span><del>- $user_id = $this->_make_user('author');
</del><ins>+ $user_id = $this->factory->user->create( array( 'role' => 'author' ) );
</ins><span class="cx">
</span><span class="cx"> $user = new WP_User( $user_id );
</span><span class="cx"> $this->assertInstanceOf( 'WP_User', $user );
</span><span class="lines">@@ -275,7 +268,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_get() {
</span><del>- $user_id = $this->_make_user('author', 'test_wp_user_get', 'password', 'test@test.com');
</del><ins>+ $user_id = $this->factory->user->create( array(
+ 'role' => 'author',
+ 'user_login' => 'test_wp_user_get',
+ 'user_pass' => 'password',
+ 'user_email' => 'test@test.com',
+ ) );
</ins><span class="cx">
</span><span class="cx"> $user = new WP_User( $user_id );
</span><span class="cx"> $this->assertEquals( 'test_wp_user_get', $user->get( 'user_login' ) );
</span><span class="lines">@@ -288,7 +286,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_has_prop() {
</span><del>- $user_id = $this->_make_user('author', 'test_wp_user_has_prop', 'password', 'test2@test.com');
</del><ins>+ $user_id = $this->factory->user->create( array(
+ 'role' => 'author',
+ 'user_login' => 'test_wp_user_has_prop',
+ 'user_pass' => 'password',
+ 'user_email' => 'test2@test.com',
+ ) );
</ins><span class="cx">
</span><span class="cx"> $user = new WP_User( $user_id );
</span><span class="cx"> $this->assertTrue( $user->has_prop( 'user_email') );
</span><span class="lines">@@ -300,7 +303,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_update_user() {
</span><del>- $user_id = $this->_make_user('author', 'test_wp_update_user', 'password', 'test3@test.com');
</del><ins>+ $user_id = $this->factory->user->create( array(
+ 'role' => 'author',
+ 'user_login' => 'test_wp_update_user',
+ 'user_pass' => 'password',
+ 'user_email' => 'test3@test.com',
+ ) );
</ins><span class="cx"> $user = new WP_User( $user_id );
</span><span class="cx">
</span><span class="cx"> update_user_meta( $user_id, 'description', 'about me' );
</span><span class="lines">@@ -334,12 +342,15 @@
</span><span class="cx"> // Logged out users don't have blogs.
</span><span class="cx"> $this->assertEquals( array(), get_blogs_of_user( 0 ) );
</span><span class="cx">
</span><del>- $user_id = $this->_make_user( 'subscriber' );
</del><ins>+ $user_id = $this->factory->user->create( array( 'role' => 'subscriber' ) );
</ins><span class="cx"> $blogs = get_blogs_of_user( $user_id );
</span><span class="cx"> $this->assertEquals( array( 1 ), array_keys( $blogs ) );
</span><span class="cx">
</span><span class="cx"> // Non-existent users don't have blogs.
</span><del>- $this->_destroy_user( $user_id );
</del><ins>+ if ( is_multisite() )
+ wpmu_delete_user( $user_id );
+ else
+ wp_delete_user( $user_id );
</ins><span class="cx"> $this->assertEquals( array(), get_blogs_of_user( $user_id ) );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -349,7 +360,7 @@
</span><span class="cx">
</span><span class="cx"> $old_current = get_current_user_id();
</span><span class="cx">
</span><del>- $user_id = $this->_make_user( 'subscriber' );
</del><ins>+ $user_id = $this->factory->user->create( array( 'role' => 'subscriber' ) );
</ins><span class="cx"> wp_set_current_user( $user_id );
</span><span class="cx">
</span><span class="cx"> $this->assertTrue( is_user_member_of_blog() );
</span><span class="lines">@@ -374,7 +385,7 @@
</span><span class="cx"> function test_global_userdata() {
</span><span class="cx"> global $userdata, $wpdb;
</span><span class="cx">
</span><del>- $user_id = $this->_make_user( 'subscriber' );
</del><ins>+ $user_id = $this->factory->user->create( array( 'role' => 'subscriber' ) );
</ins><span class="cx"> wp_set_current_user( $user_id );
</span><span class="cx">
</span><span class="cx"> $this->assertNotEmpty( $userdata );
</span><span class="lines">@@ -395,7 +406,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_exists() {
</span><del>- $user_id = $this->_make_user('author');
</del><ins>+ $user_id = $this->factory->user->create( array( 'role' => 'author' ) );
</ins><span class="cx"> $user = new WP_User( $user_id );
</span><span class="cx">
</span><span class="cx"> $this->assertTrue( $user->exists() );
</span><span class="lines">@@ -414,7 +425,7 @@
</span><span class="cx">
</span><span class="cx"> $old_post_id = $id;
</span><span class="cx">
</span><del>- $user_id = $this->_make_user('author');
</del><ins>+ $user_id = $this->factory->user->create( array( 'role' => 'author' ) );
</ins><span class="cx"> $user = new WP_User( $user_id );
</span><span class="cx">
</span><span class="cx"> $post = array(
</span><span class="lines">@@ -436,12 +447,10 @@
</span><span class="cx"> $this->assertEquals( $authordata->ID, $user_id );
</span><span class="cx">
</span><span class="cx"> setup_postdata( get_post( $old_post_id ) );
</span><del>-
- wp_delete_post( $post_id, true );
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_delete_user() {
</span><del>- $user_id = $this->_make_user('author');
</del><ins>+ $user_id = $this->factory->user->create( array( 'role' => 'author' ) );
</ins><span class="cx"> $user = new WP_User( $user_id );
</span><span class="cx">
</span><span class="cx"> $post = array(
</span></span></pre>
</div>
</div>
</body>
</html>