<!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>[38382] trunk/tests/phpunit/tests: Build/Test Tools: Remove many unnecessary calls to `rand_str()` which can, in theory, fail at random.</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/38382">38382</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/38382","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnbillion</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-08-26 20:21:30 +0000 (Fri, 26 Aug 2016)</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'>Build/Test Tools: Remove many unnecessary calls to `rand_str()` which can, in theory, fail at random. Static strings are much more appropriate.
See <a href="https://core.trac.wordpress.org/ticket/37371">#37371</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsactionsphp">trunk/tests/phpunit/tests/actions.php</a></li>
<li><a href="#trunktestsphpunittestsadminincludesScreenphp">trunk/tests/phpunit/tests/admin/includesScreen.php</a></li>
<li><a href="#trunktestsphpunittestscronphp">trunk/tests/phpunit/tests/cron.php</a></li>
<li><a href="#trunktestsphpunittestsdbcharsetphp">trunk/tests/phpunit/tests/db/charset.php</a></li>
<li><a href="#trunktestsphpunittestsoptionoptionphp">trunk/tests/phpunit/tests/option/option.php</a></li>
<li><a href="#trunktestsphpunittestsoptionsiteOptionphp">trunk/tests/phpunit/tests/option/siteOption.php</a></li>
<li><a href="#trunktestsphpunittestsoptionsiteTransientphp">trunk/tests/phpunit/tests/option/siteTransient.php</a></li>
<li><a href="#trunktestsphpunittestsoptiontransientphp">trunk/tests/phpunit/tests/option/transient.php</a></li>
<li><a href="#trunktestsphpunittestsqueryresultsphp">trunk/tests/phpunit/tests/query/results.php</a></li>
<li><a href="#trunktestsphpunitteststermgetTermsphp">trunk/tests/phpunit/tests/term/getTerms.php</a></li>
<li><a href="#trunktestsphpunitteststermwpInsertTermphp">trunk/tests/phpunit/tests/term/wpInsertTerm.php</a></li>
<li><a href="#trunktestsphpunitteststermwpSetObjectTermsphp">trunk/tests/phpunit/tests/term/wpSetObjectTerms.php</a></li>
<li><a href="#trunktestsphpunittestsuserphp">trunk/tests/phpunit/tests/user.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpgetPostsphp">trunk/tests/phpunit/tests/xmlrpc/wp/getPosts.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpgetTermsphp">trunk/tests/phpunit/tests/xmlrpc/wp/getTerms.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpnewPostphp">trunk/tests/phpunit/tests/xmlrpc/wp/newPost.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsactionsphp"></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/actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/actions.php 2016-08-26 19:08:23 UTC (rev 38381)
+++ trunk/tests/phpunit/tests/actions.php 2016-08-26 20:21:30 UTC (rev 38382)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,8 +144,8 @@
</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"> function test_did_action() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag1 = rand_str();
- $tag2 = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag1 = 'action1';
+ $tag2 = 'action2';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // do action tag1 but not tag2
</span><span class="cx" style="display: block; padding: 0 10px"> do_action($tag1);
</span></span></pre></div>
<a id="trunktestsphpunittestsadminincludesScreenphp"></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/admin/includesScreen.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/includesScreen.php 2016-08-26 19:08:23 UTC (rev 38381)
+++ trunk/tests/phpunit/tests/admin/includesScreen.php 2016-08-26 20:21:30 UTC (rev 38382)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -186,7 +186,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 19828
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_help_tabs_priority() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tab_1 = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tab_1 = 'tab1';
</ins><span class="cx" style="display: block; padding: 0 10px"> $tab_1_args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => 'Help!',
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => $tab_1,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -195,7 +195,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 10,
</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">- $tab_2 = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tab_2 = 'tab2';
</ins><span class="cx" style="display: block; padding: 0 10px"> $tab_2_args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => 'Help!',
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => $tab_2,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -203,7 +203,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tab_3 = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tab_3 = 'tab3';
</ins><span class="cx" style="display: block; padding: 0 10px"> $tab_3_args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => 'help!',
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => $tab_3,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -211,7 +211,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 40,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tab_4 = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tab_4 = 'tab4';
</ins><span class="cx" style="display: block; padding: 0 10px"> $tab_4_args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => 'help!',
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => $tab_4,
</span></span></pre></div>
<a id="trunktestsphpunittestscronphp"></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/cron.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/cron.php 2016-08-26 19:08:23 UTC (rev 38381)
+++ trunk/tests/phpunit/tests/cron.php 2016-08-26 20:21:30 UTC (rev 38382)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,16 +39,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_schedule_event_single_args() {
</span><span class="cx" style="display: block; padding: 0 10px"> // schedule an event with arguments and make sure it's returned by wp_next_scheduled
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $hook = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $hook = 'event';
</ins><span class="cx" style="display: block; padding: 0 10px"> $timestamp = strtotime('+1 hour');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args = array(rand_str());
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args = array('foo');
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_schedule_single_event( $timestamp, $hook, $args );
</span><span class="cx" style="display: block; padding: 0 10px"> // this returns the timestamp only if we provide matching args
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $timestamp, wp_next_scheduled($hook, $args) );
</span><span class="cx" style="display: block; padding: 0 10px"> // these don't match so return nothing
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( false, wp_next_scheduled($hook) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( false, wp_next_scheduled($hook, array(rand_str())) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( false, wp_next_scheduled($hook, array('bar')) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // it's a non recurring event
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '', wp_get_schedule($hook, $args) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,17 +69,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_schedule_event_args() {
</span><span class="cx" style="display: block; padding: 0 10px"> // schedule an event and make sure it's returned by wp_next_scheduled
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $hook = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $hook = 'event';
</ins><span class="cx" style="display: block; padding: 0 10px"> $timestamp = strtotime('+1 hour');
</span><span class="cx" style="display: block; padding: 0 10px"> $recur = 'hourly';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args = array(rand_str());
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args = array('foo');
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_schedule_event( $timestamp, 'hourly', $hook, $args );
</span><span class="cx" style="display: block; padding: 0 10px"> // this returns the timestamp only if we provide matching args
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $timestamp, wp_next_scheduled($hook, $args) );
</span><span class="cx" style="display: block; padding: 0 10px"> // these don't match so return nothing
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( false, wp_next_scheduled($hook) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( false, wp_next_scheduled($hook, array(rand_str())) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( false, wp_next_scheduled($hook, array('bar')) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $recur, wp_get_schedule($hook, $args) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsdbcharsetphp"></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/db/charset.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/db/charset.php 2016-08-26 19:08:23 UTC (rev 38381)
+++ trunk/tests/phpunit/tests/db/charset.php 2016-08-26 20:21:30 UTC (rev 38382)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -543,8 +543,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $table_name = 'test_get_table_charset';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $vars = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $this->table_and_column_defs as $value ) {
- $this_table_name = $table_name . '_' . rand_str( 5 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach( $this->table_and_column_defs as $i => $value ) {
+ $this_table_name = $table_name . '_' . $i;
</ins><span class="cx" style="display: block; padding: 0 10px"> $drop = "DROP TABLE IF EXISTS $this_table_name";
</span><span class="cx" style="display: block; padding: 0 10px"> $create = "CREATE TABLE $this_table_name {$value['definition']}";
</span><span class="cx" style="display: block; padding: 0 10px"> $vars[] = array( $drop, $create, $this_table_name, $value['table_expected'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -583,8 +583,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $table_name = 'test_get_column_charset';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $vars = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $this->table_and_column_defs as $value ) {
- $this_table_name = $table_name . '_' . rand_str( 5 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach( $this->table_and_column_defs as $i => $value ) {
+ $this_table_name = $table_name . '_' . $i;
</ins><span class="cx" style="display: block; padding: 0 10px"> $drop = "DROP TABLE IF EXISTS $this_table_name";
</span><span class="cx" style="display: block; padding: 0 10px"> $create = "CREATE TABLE $this_table_name {$value['definition']}";
</span><span class="cx" style="display: block; padding: 0 10px"> $vars[] = array( $drop, $create, $this_table_name, $value['column_expected'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -687,8 +687,8 @@
</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">- foreach( $data as &$value ) {
- $this_table_name = $table_name . '_' . rand_str( 5 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach( $data as $i => &$value ) {
+ $this_table_name = $table_name . '_' . $i;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $value[0] = "CREATE TABLE $this_table_name {$value[0]}";
</span><span class="cx" style="display: block; padding: 0 10px"> $value[1] = "INSERT INTO $this_table_name VALUES {$value[1]}";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -801,8 +801,8 @@
</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">- foreach( $data as &$value ) {
- $this_table_name = $table_name . '_' . rand_str( 5 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach( $data as $i => &$value ) {
+ $this_table_name = $table_name . '_' . $i;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $value[0] = "CREATE TABLE $this_table_name {$value[0]}";
</span><span class="cx" style="display: block; padding: 0 10px"> $value[2] = "SELECT * FROM $this_table_name WHERE a='\xf0\x9f\x98\x88'";
</span></span></pre></div>
<a id="trunktestsphpunittestsoptionoptionphp"></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/option/option.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/option/option.php 2016-08-26 19:08:23 UTC (rev 38381)
+++ trunk/tests/phpunit/tests/option/option.php 2016-08-26 20:21:30 UTC (rev 38382)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,10 +10,10 @@
</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"> function test_the_basics() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $key = rand_str();
- $key2 = rand_str();
- $value = rand_str();
- $value2 = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $key = 'key1';
+ $key2 = 'key2';
+ $value = 'value1';
+ $value2 = 'value2';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( get_option( 'doesnotexist' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( add_option( $key, $value ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,7 +35,7 @@
</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"> function test_default_filter() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $random = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $value = 'value';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( get_option( 'doesnotexist' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,10 +48,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'bar', get_option( 'doesnotexist', 'bar' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Once the option exists, the $default arg and the default filter are ignored.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_option( 'doesnotexist', $random );
- $this->assertEquals( $random, get_option( 'doesnotexist', 'foo' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_option( 'doesnotexist', $value );
+ $this->assertEquals( $value, get_option( 'doesnotexist', 'foo' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'default_option_doesnotexist', array( $this, '__return_foo' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( $random, get_option( 'doesnotexist', 'foo' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( $value, get_option( 'doesnotexist', 'foo' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'default_option_doesnotexist', array( $this, '__return_foo' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Cleanup
</span></span></pre></div>
<a id="trunktestsphpunittestsoptionsiteOptionphp"></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/option/siteOption.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/option/siteOption.php 2016-08-26 19:08:23 UTC (rev 38381)
+++ trunk/tests/phpunit/tests/option/siteOption.php 2016-08-26 20:21:30 UTC (rev 38382)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,9 +92,9 @@
</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"> function test_update_site_option_returns_true_for_new_value() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $key = rand_str();
- $value = rand_str();
- $new_value = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $key = 'key';
+ $value = 'value1';
+ $new_value = 'value2';
</ins><span class="cx" style="display: block; padding: 0 10px"> add_site_option( $key, $value );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( update_site_option( $key, $new_value ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsoptionsiteTransientphp"></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/option/siteTransient.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/option/siteTransient.php 2016-08-26 19:08:23 UTC (rev 38381)
+++ trunk/tests/phpunit/tests/option/siteTransient.php 2016-08-26 20:21:30 UTC (rev 38382)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,9 +14,9 @@
</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"> function test_the_basics() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $key = rand_str();
- $value = rand_str();
- $value2 = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $key = 'key1';
+ $value = 'value1';
+ $value2 = 'value2';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( get_site_transient( 'doesnotexist' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( set_site_transient( $key, $value ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsoptiontransientphp"></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/option/transient.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/option/transient.php 2016-08-26 19:08:23 UTC (rev 38381)
+++ trunk/tests/phpunit/tests/option/transient.php 2016-08-26 20:21:30 UTC (rev 38382)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,9 +14,9 @@
</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"> function test_the_basics() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $key = rand_str();
- $value = rand_str();
- $value2 = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $key = 'key1';
+ $value = 'value1';
+ $value2 = 'value2';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( get_transient( 'doesnotexist' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( set_transient( $key, $value ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsqueryresultsphp"></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/query/results.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query/results.php 2016-08-26 19:08:23 UTC (rev 38381)
+++ trunk/tests/phpunit/tests/query/results.php 2016-08-26 20:21:30 UTC (rev 38382)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -456,17 +456,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 16854
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_query_author_vars() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $author_1 = self::factory()->user->create( array( 'user_login' => 'admin1', 'user_pass' => rand_str(), 'role' => 'author' ) );
- $post_1 = self::factory()->post->create( array( 'post_title' => rand_str(), 'post_author' => $author_1, 'post_date' => '2007-01-01 00:00:00' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $author_1 = self::factory()->user->create( array( 'user_login' => 'author1', 'role' => 'author' ) );
+ $post_1 = self::factory()->post->create( array( 'post_title' => 'Post 1', 'post_author' => $author_1, 'post_date' => '2007-01-01 00:00:00' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $author_2 = self::factory()->user->create( array( 'user_login' => rand_str(), 'user_pass' => rand_str(), 'role' => 'author' ) );
- $post_2 = self::factory()->post->create( array( 'post_title' => rand_str(), 'post_author' => $author_2, 'post_date' => '2007-01-01 00:00:00' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $author_2 = self::factory()->user->create( array( 'user_login' => 'author2', 'role' => 'author' ) );
+ $post_2 = self::factory()->post->create( array( 'post_title' => 'Post 2', 'post_author' => $author_2, 'post_date' => '2007-01-01 00:00:00' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $author_3 = self::factory()->user->create( array( 'user_login' => rand_str(), 'user_pass' => rand_str(), 'role' => 'author' ) );
- $post_3 = self::factory()->post->create( array( 'post_title' => rand_str(), 'post_author' => $author_3, 'post_date' => '2007-01-01 00:00:00' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $author_3 = self::factory()->user->create( array( 'user_login' => 'author3', 'role' => 'author' ) );
+ $post_3 = self::factory()->post->create( array( 'post_title' => 'Post 3', 'post_author' => $author_3, 'post_date' => '2007-01-01 00:00:00' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $author_4 = self::factory()->user->create( array( 'user_login' => rand_str(), 'user_pass' => rand_str(), 'role' => 'author' ) );
- $post_4 = self::factory()->post->create( array( 'post_title' => rand_str(), 'post_author' => $author_4, 'post_date' => '2007-01-01 00:00:00' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $author_4 = self::factory()->user->create( array( 'user_login' => 'author4', 'role' => 'author' ) );
+ $post_4 = self::factory()->post->create( array( 'post_title' => 'Post 4', 'post_author' => $author_4, 'post_date' => '2007-01-01 00:00:00' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->q->query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'author' => '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -549,7 +549,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets( array( $author_3, $author_4 ), $author_ids );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->q->query( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'author_name' => 'admin1',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'author_name' => 'author1',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post__in' => array( $post_1, $post_2, $post_3, $post_4 )
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $author_ids = array_unique( wp_list_pluck( $posts, 'post_author' ) );
</span></span></pre></div>
<a id="trunktestsphpunitteststermgetTermsphp"></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/term/getTerms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/getTerms.php 2016-08-26 19:08:23 UTC (rev 38381)
+++ trunk/tests/phpunit/tests/term/getTerms.php 2016-08-26 20:21:30 UTC (rev 38382)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2314,8 +2314,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> protected function set_up_three_posts_and_tags() {
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = self::factory()->post->create_many( 3, array( 'post_type' => 'post' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $posts as $post ) {
- wp_set_object_terms( $post, rand_str(), 'post_tag' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $posts as $i => $post ) {
+ wp_set_object_terms( $post, "term_{$i}", 'post_tag' );
</ins><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"> wp_cache_delete( 'last_changed', 'terms' );
</span></span></pre></div>
<a id="trunktestsphpunitteststermwpInsertTermphp"></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/term/wpInsertTerm.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/wpInsertTerm.php 2016-08-26 19:08:23 UTC (rev 38381)
+++ trunk/tests/phpunit/tests/term/wpInsertTerm.php 2016-08-26 20:21:30 UTC (rev 38382)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _clean_term_filters();
</span><span class="cx" style="display: block; padding: 0 10px"> // insert one term into every post taxonomy
</span><span class="cx" style="display: block; padding: 0 10px"> // otherwise term_ids and term_taxonomy_ids might be identical, which could mask bugs
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term = 'seed_term';
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach(get_object_taxonomies('post') as $tax)
</span><span class="cx" style="display: block; padding: 0 10px"> wp_insert_term( $term, $tax );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +20,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( $taxonomy, 'post' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // a new unused term
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term = 'term';
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( term_exists($term) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $initial_count = wp_count_terms( $taxonomy );
</span></span></pre></div>
<a id="trunktestsphpunitteststermwpSetObjectTermsphp"></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/term/wpSetObjectTerms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/wpSetObjectTerms.php 2016-08-26 19:08:23 UTC (rev 38381)
+++ trunk/tests/phpunit/tests/term/wpSetObjectTerms.php 2016-08-26 20:21:30 UTC (rev 38382)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,7 +110,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = array();
</span><span class="cx" style="display: block; padding: 0 10px"> for ($i=0; $i<3; $i++ ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term = "term_{$i}";
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = wp_insert_term( $term, $this->taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'array', $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $term_id[$term] = $result['term_id'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -245,7 +245,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // first set: 3 terms
</span><span class="cx" style="display: block; padding: 0 10px"> $terms_1 = array();
</span><span class="cx" style="display: block; padding: 0 10px"> for ($i=0; $i<3; $i++ ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term = "term_{$i}";
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = wp_insert_term( $term, $this->taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'array', $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $terms_1[$i] = $result['term_id'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -255,7 +255,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $terms_2 = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $terms_2[0] = $terms_1[1];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term = 'term';
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = wp_insert_term( $term, $this->taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px"> $terms_2[1] = $result['term_id'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span></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 2016-08-26 19:08:23 UTC (rev 38381)
+++ trunk/tests/phpunit/tests/user.php 2016-08-26 20:21:30 UTC (rev 38382)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,8 +103,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // simple tests for usermeta functions
</span><span class="cx" style="display: block; padding: 0 10px"> function test_usermeta() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $key = rand_str();
- $val = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $key = 'key';
+ $val = 'value1';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // get a meta key that doesn't exist
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '', get_user_meta( self::$author_id, $key, true ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -114,7 +114,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $val, get_user_meta( self::$author_id, $key, true ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // change and get again
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $val2 = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $val2 = 'value2';
</ins><span class="cx" style="display: block; padding: 0 10px"> update_user_meta( self::$author_id, $key, $val2 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $val2, get_user_meta( self::$author_id, $key, true ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -581,14 +581,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_user_update_email_error() {
</span><span class="cx" style="display: block; padding: 0 10px"> $id1 = wp_insert_user( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'user_login' => rand_str(),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'user_login' => 'blackburn',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_pass' => 'password',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_email' => 'blackburn@battlefield4.com',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $id1, email_exists( 'blackburn@battlefield4.com' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id2 = wp_insert_user( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'user_login' => rand_str(),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'user_login' => 'miller',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_pass' => 'password',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_email' => 'miller@battlefield4.com',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetPostsphp"></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/xmlrpc/wp/getPosts.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getPosts.php 2016-08-26 19:08:23 UTC (rev 38381)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getPosts.php 2016-08-26 20:21:30 UTC (rev 38382)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,11 +136,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_search() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_ids[] = self::factory()->post->create( array( 'post_title' => 'First: ' . rand_str() ) );
- $post_ids[] = self::factory()->post->create( array( 'post_title' => 'Second: ' . rand_str() ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_ids[] = self::factory()->post->create( array( 'post_title' => 'First: Hello, World!' ) );
+ $post_ids[] = self::factory()->post->create( array( 'post_title' => 'Second: Hello, World!' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Search for none of them
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $filter = array( 's' => rand_str() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $filter = array( 's' => 'Third' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $results = $this->myxmlrpcserver->wp_getPosts( array( 1, 'editor', 'editor', $filter ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotInstanceOf( 'IXR_Error', $results );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, count( $results ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetTermsphp"></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/xmlrpc/wp/getTerms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getTerms.php 2016-08-26 19:08:23 UTC (rev 38381)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getTerms.php 2016-08-26 20:21:30 UTC (rev 38382)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,7 +66,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $num_terms = 12;
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( $tax_name, 'post' );
</span><span class="cx" style="display: block; padding: 0 10px"> for( $i = 0; $i < $num_terms; $i++ )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_insert_term( rand_str( 10 ), $tax_name );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_insert_term( "term_{$i}", $tax_name );
</ins><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"> // test fetching all terms
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpnewPostphp"></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/xmlrpc/wp/newPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/newPost.php 2016-08-26 19:08:23 UTC (rev 38381)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/newPost.php 2016-08-26 20:21:30 UTC (rev 38382)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -233,11 +233,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_terms() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag1 = wp_create_tag ( rand_str( 30 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag1 = wp_create_tag( 'tag1' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'array', $tag1 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag2 = wp_create_tag ( rand_str( 30 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag2 = wp_create_tag( 'tag2' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'array', $tag2 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag3 = wp_create_tag ( rand_str( 30 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag3 = wp_create_tag( 'tag3' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'array', $tag3 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -258,13 +258,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_terms_names() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $ambiguous_name = rand_str( 30 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $ambiguous_name = 'foo';
</ins><span class="cx" style="display: block; padding: 0 10px"> $parent_cat = wp_create_category( $ambiguous_name );
</span><span class="cx" style="display: block; padding: 0 10px"> $child_cat = wp_create_category( $ambiguous_name, $parent_cat );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cat1_name = rand_str( 30 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cat1_name = 'cat1';
</ins><span class="cx" style="display: block; padding: 0 10px"> $cat1 = wp_create_category( $cat1_name, $parent_cat );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cat2_name = rand_str( 30 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cat2_name = 'cat2';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // first a post with valid categories; one that already exists and one to be created
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span></span></pre>
</div>
</div>
</body>
</html>