<!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>[32149] branches/3.9/tests/phpunit/tests: Backport the PHPUnit test fixes from [31622] to the 3.9 branch.</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/32149">32149</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/32149","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>pento</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-04-19 08:01:25 +0000 (Sun, 19 Apr 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'>Backport the PHPUnit test fixes from <a href="https://core.trac.wordpress.org/changeset/31622">[31622]</a> to the 3.9 branch.
Props boonebgorges.
See <a href="https://core.trac.wordpress.org/ticket/31537">#31537</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches39testsphpunittestsadminincludesScreenphp">branches/3.9/tests/phpunit/tests/admin/includesScreen.php</a></li>
<li><a href="#branches39testsphpunittestsajaxAutosavephp">branches/3.9/tests/phpunit/tests/ajax/Autosave.php</a></li>
<li><a href="#branches39testsphpunittestsajaxResponsephp">branches/3.9/tests/phpunit/tests/ajax/Response.php</a></li>
<li><a href="#branches39testsphpunittestsbasicphp">branches/3.9/tests/phpunit/tests/basic.php</a></li>
<li><a href="#branches39testsphpunittestscachephp">branches/3.9/tests/phpunit/tests/cache.php</a></li>
<li><a href="#branches39testsphpunittestscanonicalphp">branches/3.9/tests/phpunit/tests/canonical.php</a></li>
<li><a href="#branches39testsphpunittestscommentgetCommentsPagesCountphp">branches/3.9/tests/phpunit/tests/comment/getCommentsPagesCount.php</a></li>
<li><a href="#branches39testsphpunittestscronphp">branches/3.9/tests/phpunit/tests/cron.php</a></li>
<li><a href="#branches39testsphpunittestsmailphp">branches/3.9/tests/phpunit/tests/mail.php</a></li>
<li><a href="#branches39testsphpunittestspostmetaphp">branches/3.9/tests/phpunit/tests/post/meta.php</a></li>
<li><a href="#branches39testsphpunittestspostrevisionsphp">branches/3.9/tests/phpunit/tests/post/revisions.php</a></li>
<li><a href="#branches39testsphpunittestsqueryconditionalsphp">branches/3.9/tests/phpunit/tests/query/conditionals.php</a></li>
<li><a href="#branches39testsphpunittestsquerysearchphp">branches/3.9/tests/phpunit/tests/query/search.php</a></li>
<li><a href="#branches39testsphpunittestsrewritephp">branches/3.9/tests/phpunit/tests/rewrite.php</a></li>
<li><a href="#branches39testsphpunittestsshortcodephp">branches/3.9/tests/phpunit/tests/shortcode.php</a></li>
<li><a href="#branches39testsphpunittestsusermapMetaCapphp">branches/3.9/tests/phpunit/tests/user/mapMetaCap.php</a></li>
<li><a href="#branches39testsphpunittestsxmlrpcwpgetPagephp">branches/3.9/tests/phpunit/tests/xmlrpc/wp/getPage.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches39testsphpunittestsadminincludesScreenphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.9/tests/phpunit/tests/admin/includesScreen.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.9/tests/phpunit/tests/admin/includesScreen.php 2015-04-19 07:42:52 UTC (rev 32148)
+++ branches/3.9/tests/phpunit/tests/admin/includesScreen.php 2015-04-19 08:01:25 UTC (rev 32149)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,9 +37,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 tearDown() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- parent::tearDown();
</del><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS['wp_taxonomies']['old-or-new'] );
</span><span class="cx" style="display: block; padding: 0 10px"> set_current_screen( 'front' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ parent::tearDown();
</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"> function test_set_current_screen_with_hook_suffix() {
</span></span></pre></div>
<a id="branches39testsphpunittestsajaxAutosavephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.9/tests/phpunit/tests/ajax/Autosave.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.9/tests/phpunit/tests/ajax/Autosave.php 2015-04-19 07:42:52 UTC (rev 32148)
+++ branches/3.9/tests/phpunit/tests/ajax/Autosave.php 2015-04-19 08:01:25 UTC (rev 32149)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,8 +46,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Reset the current user
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function tearDown() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_current_user( 0 );
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::tearDown();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_set_current_user( 0 );
</del><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></span></pre></div>
<a id="branches39testsphpunittestsajaxResponsephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.9/tests/phpunit/tests/ajax/Response.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.9/tests/phpunit/tests/ajax/Response.php 2015-04-19 07:42:52 UTC (rev 32148)
+++ branches/3.9/tests/phpunit/tests/ajax/Response.php 2015-04-19 08:01:25 UTC (rev 32149)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,9 +36,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Remove the wp_die() override, restore error reporting
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function tearDown() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- parent::tearDown();
</del><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'wp_die_ajax_handler', array( $this, 'getDieHandler' ), 1, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> error_reporting( $this->_error_level );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ parent::tearDown();
</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"> /**
</span></span></pre></div>
<a id="branches39testsphpunittestsbasicphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.9/tests/phpunit/tests/basic.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.9/tests/phpunit/tests/basic.php 2015-04-19 07:42:52 UTC (rev 32148)
+++ branches/3.9/tests/phpunit/tests/basic.php 2015-04-19 08:01:25 UTC (rev 32149)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,8 +14,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 tearDown() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->val = false;
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::tearDown();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->val = false;
</del><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_true() {
</span></span></pre></div>
<a id="branches39testsphpunittestscachephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.9/tests/phpunit/tests/cache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.9/tests/phpunit/tests/cache.php 2015-04-19 07:42:52 UTC (rev 32148)
+++ branches/3.9/tests/phpunit/tests/cache.php 2015-04-19 08:01:25 UTC (rev 32149)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,8 +14,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 tearDown() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->flush_cache();
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::tearDown();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->flush_cache();
</del><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 &init_cache() {
</span></span></pre></div>
<a id="branches39testsphpunittestscanonicalphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.9/tests/phpunit/tests/canonical.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.9/tests/phpunit/tests/canonical.php 2015-04-19 07:42:52 UTC (rev 32148)
+++ branches/3.9/tests/phpunit/tests/canonical.php 2015-04-19 08:01:25 UTC (rev 32149)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,10 +80,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 tearDown() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- parent::tearDown();
</del><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $this->old_current_user );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['wp_rewrite']->init();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ parent::tearDown();
</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"> // URL's are relative to the site "front", ie. /category/uncategorized/ instead of http://site.../category..
</span></span></pre></div>
<a id="branches39testsphpunittestscommentgetCommentsPagesCountphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.9/tests/phpunit/tests/comment/getCommentsPagesCount.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.9/tests/phpunit/tests/comment/getCommentsPagesCount.php 2015-04-19 07:42:52 UTC (rev 32148)
+++ branches/3.9/tests/phpunit/tests/comment/getCommentsPagesCount.php 2015-04-19 08:01:25 UTC (rev 32149)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,11 +26,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * tearDown options
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function tearDown() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- parent::tearDown();
</del><span class="cx" style="display: block; padding: 0 10px"> update_option( 'page_comments', $this->option_page_comments );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'comments_per_page', $this->option_page_comments );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'thread_comments', $this->option_page_comments );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'posts_per_rss', $this->option_posts_per_rss );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ parent::tearDown();
</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"> /**
</span></span></pre></div>
<a id="branches39testsphpunittestscronphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.9/tests/phpunit/tests/cron.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.9/tests/phpunit/tests/cron.php 2015-04-19 07:42:52 UTC (rev 32148)
+++ branches/3.9/tests/phpunit/tests/cron.php 2015-04-19 08:01:25 UTC (rev 32149)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,9 +13,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 tearDown() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- parent::tearDown();
</del><span class="cx" style="display: block; padding: 0 10px"> // make sure the schedule is clear
</span><span class="cx" style="display: block; padding: 0 10px"> _set_cron_array(array());
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ parent::tearDown();
</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"> function test_wp_get_schedule_empty() {
</span></span></pre></div>
<a id="branches39testsphpunittestsmailphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.9/tests/phpunit/tests/mail.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.9/tests/phpunit/tests/mail.php 2015-04-19 07:42:52 UTC (rev 32148)
+++ branches/3.9/tests/phpunit/tests/mail.php 2015-04-19 08:01:25 UTC (rev 32149)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,8 +11,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 tearDown() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ unset( $_SERVER['SERVER_NAME'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::tearDown();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unset( $_SERVER['SERVER_NAME'] );
</del><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_wp_mail_custom_boundaries() {
</span></span></pre></div>
<a id="branches39testsphpunittestspostmetaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.9/tests/phpunit/tests/post/meta.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.9/tests/phpunit/tests/post/meta.php 2015-04-19 07:42:52 UTC (rev 32148)
+++ branches/3.9/tests/phpunit/tests/post/meta.php 2015-04-19 08:01:25 UTC (rev 32149)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,9 +33,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 tearDown() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- parent::tearDown();
</del><span class="cx" style="display: block; padding: 0 10px"> wp_delete_post($this->post_id);
</span><span class="cx" style="display: block; padding: 0 10px"> wp_delete_post($this->post_id_2);
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ parent::tearDown();
</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"> function test_unique_postmeta() {
</span></span></pre></div>
<a id="branches39testsphpunittestspostrevisionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.9/tests/phpunit/tests/post/revisions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.9/tests/phpunit/tests/post/revisions.php 2015-04-19 07:42:52 UTC (rev 32148)
+++ branches/3.9/tests/phpunit/tests/post/revisions.php 2015-04-19 08:01:25 UTC (rev 32149)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,8 +12,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 tearDown() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ unset( $GLOBALS['wp_post_types'][ $this->post_type ] );
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::tearDown();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unset( $GLOBALS['wp_post_types'][ $this->post_type ] );
</del><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></span></pre></div>
<a id="branches39testsphpunittestsqueryconditionalsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.9/tests/phpunit/tests/query/conditionals.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.9/tests/phpunit/tests/query/conditionals.php 2015-04-19 07:42:52 UTC (rev 32148)
+++ branches/3.9/tests/phpunit/tests/query/conditionals.php 2015-04-19 08:01:25 UTC (rev 32149)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,8 +30,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 tearDown() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $GLOBALS['wp_rewrite']->init();
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::tearDown();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $GLOBALS['wp_rewrite']->init();
</del><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_home() {
</span></span></pre></div>
<a id="branches39testsphpunittestsquerysearchphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.9/tests/phpunit/tests/query/search.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.9/tests/phpunit/tests/query/search.php 2015-04-19 07:42:52 UTC (rev 32148)
+++ branches/3.9/tests/phpunit/tests/query/search.php 2015-04-19 08:01:25 UTC (rev 32149)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,10 +18,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 tearDown() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- parent::tearDown();
-
</del><span class="cx" style="display: block; padding: 0 10px"> _unregister_post_type( $this->post_type );
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $this->q );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ parent::tearDown();
</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"> function get_search_results( $terms ) {
</span></span></pre></div>
<a id="branches39testsphpunittestsrewritephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.9/tests/phpunit/tests/rewrite.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.9/tests/phpunit/tests/rewrite.php 2015-04-19 07:42:52 UTC (rev 32148)
+++ branches/3.9/tests/phpunit/tests/rewrite.php 2015-04-19 08:01:25 UTC (rev 32149)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,8 +19,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 tearDown() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $GLOBALS['wp_rewrite']->init();
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::tearDown();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $GLOBALS['wp_rewrite']->init();
</del><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_url_to_postid() {
</span></span></pre></div>
<a id="branches39testsphpunittestsshortcodephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.9/tests/phpunit/tests/shortcode.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.9/tests/phpunit/tests/shortcode.php 2015-04-19 07:42:52 UTC (rev 32148)
+++ branches/3.9/tests/phpunit/tests/shortcode.php 2015-04-19 08:01:25 UTC (rev 32149)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,9 +20,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function tearDown() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $shortcode_tags;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- parent::tearDown();
</del><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->shortcodes as $shortcode )
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $shortcode_tags[ $shortcode ] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ parent::tearDown();
</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"> function _shortcode_test_shortcode_tag( $atts, $content = null, $tagname = null ) {
</span></span></pre></div>
<a id="branches39testsphpunittestsusermapMetaCapphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.9/tests/phpunit/tests/user/mapMetaCap.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.9/tests/phpunit/tests/user/mapMetaCap.php 2015-04-19 07:42:52 UTC (rev 32148)
+++ branches/3.9/tests/phpunit/tests/user/mapMetaCap.php 2015-04-19 08:01:25 UTC (rev 32149)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,10 +32,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 tearDown() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- parent::tearDown();
-
</del><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['super_admins'] = $this->super_admins;
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS['wp_post_types'][ $this->post_type ] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ parent::tearDown();
</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"> function test_capability_type_post_with_no_extra_caps() {
</span></span></pre></div>
<a id="branches39testsphpunittestsxmlrpcwpgetPagephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.9/tests/phpunit/tests/xmlrpc/wp/getPage.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.9/tests/phpunit/tests/xmlrpc/wp/getPage.php 2015-04-19 07:42:52 UTC (rev 32148)
+++ branches/3.9/tests/phpunit/tests/xmlrpc/wp/getPage.php 2015-04-19 08:01:25 UTC (rev 32149)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,9 +24,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 tearDown() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_delete_post( $this->post_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::tearDown();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- wp_delete_post( $this->post_id );
</del><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_invalid_username_password() {
</span></span></pre>
</div>
</div>
</body>
</html>