<!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][955] trunk/tests/user.php: Don't use deprecated user functions in user 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/955">955</a></dd>
<dt>Author</dt> <dd>nbachiyski</dd>
<dt>Date</dt> <dd>2012-08-06 02:49:39 +0000 (Mon, 06 Aug 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't use deprecated user functions in user tests
When we have a valid usecase for deprecated functions, like testing
backeards compatibility, we disable triggering deprecated errors
temporarily.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsuserphp">trunk/tests/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsuserphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/user.php (954 => 955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/user.php 2012-08-06 01:56:01 UTC (rev 954)
+++ trunk/tests/user.php 2012-08-06 02:49:39 UTC (rev 955)
</span><span class="lines">@@ -21,28 +21,31 @@
</span><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ public function disable_deprecated_errors( $value ) {
+ return false;
+ }
+
</ins><span class="cx"> function test_get_users_of_blog() {
</span><span class="cx"> // add one of each user role
</span><del>- $user_role = array();
</del><ins>+ $nusers = array();
</ins><span class="cx"> foreach ( array('administrator', 'editor', 'author', 'contributor', 'subscriber' ) as $role ) {
</span><span class="cx"> $id = $this->factory->user->create( array( 'role' => $role ) );
</span><del>- $user_role[ $id ] = $role;
</del><ins>+ $nusers[ $id ] = $id;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- $user_list = get_users_of_blog();
</del><ins>+ $user_list = get_users();
</ins><span class="cx">
</span><span class="cx"> // find the role of each user as returned by get_users_of_blog
</span><span class="cx"> $found = array();
</span><span class="cx"> foreach ( $user_list as $user ) {
</span><span class="cx"> // only include the users we just created - there might be some others that existed previously
</span><del>- if ( isset( $user_role[$user->user_id] ) ) {
- $roles = array_keys( unserialize( $user->meta_value ) );
- $found[ $user->user_id ] = $roles[0];
</del><ins>+ if ( isset( $nusers[$user->ID] ) ) {
+ $found[ $user->ID] = $user->ID;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // make sure every user we created was returned
</span><del>- $this->assertEquals($user_role, $found);
</del><ins>+ $this->assertEquals($nusers, $found);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // simple get/set tests for user_option functions
</span><span class="lines">@@ -75,29 +78,29 @@
</span><span class="cx"> $user_id = $this->factory->user->create( array( 'role' => 'author' ) );
</span><span class="cx">
</span><span class="cx"> // get a meta key that doesn't exist
</span><del>- $this->assertEquals( '', get_usermeta($user_id, $key) );
</del><ins>+ $this->assertEquals( '', get_user_meta($user_id, $key, true));
</ins><span class="cx">
</span><span class="cx"> // set and get
</span><del>- update_usermeta( $user_id, $key, $val );
- $this->assertEquals( $val, get_usermeta($user_id, $key) );
</del><ins>+ update_user_meta( $user_id, $key, $val );
+ $this->assertEquals( $val, get_user_meta($user_id, $key, true) );
</ins><span class="cx">
</span><span class="cx"> // change and get again
</span><span class="cx"> $val2 = rand_str();
</span><del>- update_usermeta( $user_id, $key, $val2 );
- $this->assertEquals( $val2, get_usermeta($user_id, $key) );
</del><ins>+ update_user_meta( $user_id, $key, $val2 );
+ $this->assertEquals( $val2, get_user_meta($user_id, $key, true) );
</ins><span class="cx">
</span><span class="cx"> // delete and get
</span><del>- delete_usermeta( $user_id, $key );
- $this->assertEquals( '', get_usermeta($user_id, $key) );
</del><ins>+ delete_user_meta( $user_id, $key );
+ $this->assertEquals( '', get_user_meta($user_id, $key, true) );
</ins><span class="cx">
</span><span class="cx"> // delete by key AND value
</span><del>- update_usermeta( $user_id, $key, $val );
</del><ins>+ update_user_meta( $user_id, $key, $val );
</ins><span class="cx"> // incorrect key: key still exists
</span><del>- delete_usermeta( $user_id, $key, rand_str() );
- $this->assertEquals( $val, get_usermeta($user_id, $key) );
</del><ins>+ delete_user_meta( $user_id, $key, rand_str() );
+ $this->assertEquals( $val, get_user_meta($user_id, $key, true) );
</ins><span class="cx"> // correct key: deleted
</span><del>- delete_usermeta( $user_id, $key, $val );
- $this->assertEquals( '', get_usermeta($user_id, $key) );
</del><ins>+ delete_user_meta( $user_id, $key, $val );
+ $this->assertEquals( '', get_user_meta($user_id, $key, true) );
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -113,29 +116,29 @@
</span><span class="cx"> $user_id = $this->factory->user->create( array( 'role' => 'author' ) );
</span><span class="cx">
</span><span class="cx"> // there is already some stuff in the array
</span><del>- $this->assertTrue(is_array(get_usermeta($user_id)));
</del><ins>+ $this->assertTrue(is_array(get_user_meta($user_id)));
</ins><span class="cx">
</span><span class="cx"> foreach ($vals as $k=>$v)
</span><del>- update_usermeta( $user_id, $k, $v );
</del><ins>+ update_user_meta( $user_id, $k, $v );
</ins><span class="cx">
</span><span class="cx"> // get the complete usermeta array
</span><del>- $out = get_usermeta($user_id);
</del><ins>+ $out = get_user_meta($user_id);
</ins><span class="cx">
</span><span class="cx"> // for reasons unclear, the resulting array is indexed numerically; meta keys are not included anywhere.
</span><span class="cx"> // so we'll just check to make sure our values are included somewhere.
</span><del>- foreach ($vals as $v)
- $this->assertTrue(in_array($v, $out));
</del><ins>+ foreach ($vals as $k=>$v)
+ $this->assertTrue(isset($out[$k]) && $out[$k][0] == $v);
</ins><span class="cx">
</span><span class="cx"> // delete one key and check again
</span><span class="cx"> $key_to_delete = array_pop(array_keys($vals));
</span><del>- delete_usermeta($user_id, $key_to_delete);
- $out = get_usermeta($user_id);
</del><ins>+ delete_user_meta($user_id, $key_to_delete);
+ $out = get_user_meta($user_id);
</ins><span class="cx"> // make sure that key is excluded from the results
</span><span class="cx"> foreach ($vals as $k=>$v) {
</span><span class="cx"> if ($k == $key_to_delete)
</span><del>- $this->assertFalse(in_array($v, $out));
</del><ins>+ $this->assertFalse(isset($out[$k]));
</ins><span class="cx"> else
</span><del>- $this->assertTrue(in_array($v, $out));
</del><ins>+ $this->assertTrue(isset($out[$k]) && $out[$k][0] == $v);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -178,10 +181,12 @@
</span><span class="cx">
</span><span class="cx"> // Test 'id' (lowercase)
</span><span class="cx"> add_action( 'deprecated_argument_run', array( $this, 'deprecated_handler' ), 10, 3 );
</span><ins>+ add_filter( 'deprecated_argument_trigger_error', array( $this, 'disable_deprecated_errors' ) );
</ins><span class="cx"> unset( $user->id );
</span><span class="cx"> $this->assertCount( 1, $this->_deprecated_errors );
</span><span class="cx"> $this->assertEquals( 'WP_User->id', $this->_deprecated_errors[0]['function'] );
</span><span class="cx"> $this->assertEquals( '2.1', $this->_deprecated_errors[0]['version'] );
</span><ins>+ remove_filter( 'deprecated_argument_trigger_error', array( $this, 'disable_deprecated_errors' ) );
</ins><span class="cx"> remove_action( 'deprecated_argument_run', array( $this, 'deprecated_handler' ), 10, 3);
</span><span class="cx">
</span><span class="cx"> // Test 'ID'
</span><span class="lines">@@ -208,10 +213,12 @@
</span><span class="cx"> $user_id = $this->factory->user->create( array( 'role' => 'author' ) );
</span><span class="cx"> $user = new WP_User( $user_id );
</span><span class="cx">
</span><ins>+ add_filter( 'deprecated_argument_trigger_error', array( $this, 'disable_deprecated_errors' ) );
</ins><span class="cx"> $this->assertTrue( isset( $user->id ) );
</span><span class="cx"> $this->assertEquals( $user->ID, $user->id );
</span><span class="cx"> $user->id = 1234;
</span><span class="cx"> $this->assertEquals( $user->ID, $user->id );
</span><ins>+ remove_filter( 'deprecated_argument_trigger_error', array( $this, 'disable_deprecated_errors' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -241,7 +248,7 @@
</span><span class="cx"> $user = new WP_User( $user_id );
</span><span class="cx"> $this->assertInstanceOf( 'WP_User', $user );
</span><span class="cx"> $this->assertEquals( $user_id, $user->ID );
</span><del>-
</del><ins>+
</ins><span class="cx"> $user2 = new WP_User( 0, $user->user_login );
</span><span class="cx"> $this->assertInstanceOf( 'WP_User', $user2 );
</span><span class="cx"> $this->assertEquals( $user_id, $user2->ID );
</span></span></pre>
</div>
</div>
</body>
</html>