<!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>[40388] branches/4.7: Build/Test Tools: Add assertNotFalse() method to WP_UnitTestCase and use it where appropriate.</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/40388">40388</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/40388","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>swissspidy</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-04-06 18:19:02 +0000 (Thu, 06 Apr 2017)</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: Add assertNotFalse() method to WP_UnitTestCase and use it where appropriate.
Props peterwilsoncc.
Fixes <a href="https://core.trac.wordpress.org/ticket/39219">#39219</a>.
Merges <a href="https://core.trac.wordpress.org/changeset/39919">[39919]</a> to the 4.7 branch.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches47testsphpunitincludestestcasephp">branches/4.7/tests/phpunit/includes/testcase.php</a></li>
<li><a href="#branches47testsphpunittestscustomizecustomcsssettingphp">branches/4.7/tests/phpunit/tests/customize/custom-css-setting.php</a></li>
<li><a href="#branches47testsphpunittestscustomizesettingphp">branches/4.7/tests/phpunit/tests/customize/setting.php</a></li>
<li><a href="#branches47testsphpunittestsmediaphp">branches/4.7/tests/phpunit/tests/media.php</a></li>
<li><a href="#branches47testsphpunittestsoembedtemplatephp">branches/4.7/tests/phpunit/tests/oembed/template.php</a></li>
<li><a href="#branches47testsphpunittestsoembedwpOembedphp">branches/4.7/tests/phpunit/tests/oembed/wpOembed.php</a></li>
<li><a href="#branches47testsphpunittestspostthumbnailsphp">branches/4.7/tests/phpunit/tests/post/thumbnails.php</a></li>
<li><a href="#branches47testsphpunittestspostwpPostTypephp">branches/4.7/tests/phpunit/tests/post/wpPostType.php</a></li>
<li><a href="#branches47testsphpunitteststermwpTaxonomyphp">branches/4.7/tests/phpunit/tests/term/wpTaxonomy.php</a></li>
<li><a href="#branches47testsphpunitteststhemesupportphp">branches/4.7/tests/phpunit/tests/theme/support.php</a></li>
<li><a href="#branches47testsphpunitteststhemephp">branches/4.7/tests/phpunit/tests/theme.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches47">branches/4.7/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.7
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/4.7 2017-04-06 18:00:16 UTC (rev 40387)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.7 2017-04-06 18:19:02 UTC (rev 40388)
</ins><a id="branches47"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.7</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/3.1:18031
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.3:20543
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.4:21757
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:18512,39365,39367,39369,39371,39373,39375-39376,39378,39380,39382,39384,39386,39388,39390,39392-39393,39396-39397,39400,39402,39404,39406,39409,39411,39413,39415,39417-39420,39424,39426,39428,39430,39432-39434,39436,39438,39440,39442-39444,39447,39449-39451,39453,39455-39457,39460,39462,39464,39466,39468,39470-39471,39475,39477-39478,39482-39483,39487-39488,39490,39495-39496,39499,39502,39504,39506,39508,39510,39512,39514,39517,39520,39522,39545-39547,39557-39563,39565,39578,39580-39581,39584,39586,39594-39595,39597-39599,39601,39603,39612-39613,39616-39617,39619-39623,39626,39635,39640,39645,39649,39657,39659,39663,39677-39678,39680-39681,39684-39686,39688-39689,39692,39720,39742,39744,39759-39760,39772,39795,39807-39808,39831,39843,39848,39850,39912,39914,39923-39924,39949,39951-39952,39954,39956,39968,39992,39994,40030,40036-40037,40039-40041,40045,40049,40055-40056,40058,40061
,40063-40066,40068,40070,40074,40077,40080,40082,40086,40089,40101,40104-40106,40108-40110,40118,40120-40126,40129-40131,40148,40160,40169,40181,40183,40195,40235,40238,40241,40252,40255,40257-40259,40263-40264,40269,40271,40284,40290,40300-40306,40311,40313-40316,40318-40320,40324,40333,40353,40357-40358,40368,40379-40381
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:18512,39365,39367,39369,39371,39373,39375-39376,39378,39380,39382,39384,39386,39388,39390,39392-39393,39396-39397,39400,39402,39404,39406,39409,39411,39413,39415,39417-39420,39424,39426,39428,39430,39432-39434,39436,39438,39440,39442-39444,39447,39449-39451,39453,39455-39457,39460,39462,39464,39466,39468,39470-39471,39475,39477-39478,39482-39483,39487-39488,39490,39495-39496,39499,39502,39504,39506,39508,39510,39512,39514,39517,39520,39522,39545-39547,39557-39563,39565,39578,39580-39581,39584,39586,39594-39595,39597-39599,39601,39603,39612-39613,39616-39617,39619-39623,39626,39635,39640,39645,39649,39657,39659,39663,39677-39678,39680-39681,39684-39686,39688-39689,39692,39720,39742,39744,39759-39760,39772,39795,39807-39808,39831,39843,39848,39850,39912,39914,39919,39923-39924,39949,39951-39952,39954,39956,39968,39992,39994,40030,40036-40037,40039-40041,40045,40049,40055-40056,40058,
40061,40063-40066,40068,40070,40074,40077,40080,40082,40086,40089,40101,40104-40106,40108-40110,40118,40120-40126,40129-40131,40148,40160,40169,40181,40183,40195,40235,40238,40241,40252,40255,40257-40259,40263-40264,40269,40271,40284,40290,40300-40306,40311,40313-40316,40318-40320,40324,40333,40353,40357-40358,40368,40379-40381
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches47testsphpunitincludestestcasephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.7/tests/phpunit/includes/testcase.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/tests/phpunit/includes/testcase.php 2017-04-06 18:00:16 UTC (rev 40387)
+++ branches/4.7/tests/phpunit/includes/testcase.php 2017-04-06 18:19:02 UTC (rev 40388)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -461,6 +461,18 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Asserts that a condition is not false.
+ *
+ * @param bool $condition
+ * @param string $message
+ *
+ * @throws PHPUnit_Framework_AssertionFailedError
+ */
+ public static function assertNotFalse( $condition, $message = '' ) {
+ self::assertThat( $condition, self::logicalNot( self::isFalse() ), $message );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Modify WordPress's query internals as if a given URL has been requested.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $url The URL for the request.
</span></span></pre></div>
<a id="branches47testsphpunittestscustomizecustomcsssettingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.7/tests/phpunit/tests/customize/custom-css-setting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/tests/phpunit/tests/customize/custom-css-setting.php 2017-04-06 18:00:16 UTC (rev 40387)
+++ branches/4.7/tests/phpunit/tests/customize/custom-css-setting.php 2017-04-06 18:19:02 UTC (rev 40388)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,7 +150,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->wp_customize->set_post_value( $this->setting->id, $updated_css );
</span><span class="cx" style="display: block; padding: 0 10px"> $saved = $this->setting->save();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( false !== $saved );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotFalse( $saved );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $updated_css, $this->setting->value() );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $updated_css, wp_get_custom_css( $this->setting->stylesheet ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $updated_css, get_post( $post_id )->post_content );
</span></span></pre></div>
<a id="branches47testsphpunittestscustomizesettingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.7/tests/phpunit/tests/customize/setting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/tests/phpunit/tests/customize/setting.php 2017-04-06 18:00:16 UTC (rev 40387)
+++ branches/4.7/tests/phpunit/tests/customize/setting.php 2017-04-06 18:19:02 UTC (rev 40388)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -465,7 +465,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Satisfy all requirements for save to happen.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( false !== $setting->save() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotFalse( $setting->save() );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( 1 === did_action( 'customize_update_custom' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( 1 === did_action( 'customize_save_foo' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches47testsphpunittestsmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.7/tests/phpunit/tests/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/tests/phpunit/tests/media.php 2017-04-06 18:00:16 UTC (rev 40387)
+++ branches/4.7/tests/phpunit/tests/media.php 2017-04-06 18:19:02 UTC (rev 40388)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1258,7 +1258,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Test to confirm all sources in the array include the same edit hash.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $sizes as $size ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( false !== strpos( $size, $hash ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotFalse( strpos( $size, $hash ) );
</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="branches47testsphpunittestsoembedtemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.7/tests/phpunit/tests/oembed/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/tests/phpunit/tests/oembed/template.php 2017-04-06 18:00:16 UTC (rev 40387)
+++ branches/4.7/tests/phpunit/tests/oembed/template.php 2017-04-06 18:19:02 UTC (rev 40388)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,8 +25,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $doc = new DOMDocument();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $doc->loadHTML( $actual ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( false === strpos( $actual, 'That embed can’t be found.' ) );
- $this->assertTrue( false !== strpos( $actual, 'Hello World' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertFalse( strpos( $actual, 'That embed can’t be found.' ) );
+ $this->assertNotFalse( strpos( $actual, 'Hello World' ) );
</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_oembed_output_post_with_thumbnail() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,8 +52,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $doc = new DOMDocument();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $doc->loadHTML( $actual ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( strpos( $actual, 'That embed can’t be found.' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( false !== strpos( $actual, 'Hello World' ) );
- $this->assertTrue( false !== strpos( $actual, 'canola.jpg' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotFalse( strpos( $actual, 'Hello World' ) );
+ $this->assertNotFalse( strpos( $actual, 'canola.jpg' ) );
</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_oembed_output_404() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,7 +68,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $doc = new DOMDocument();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $doc->loadHTML( $actual ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( false !== strpos( $actual, 'That embed can’t be found.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotFalse( strpos( $actual, 'That embed can’t be found.' ) );
</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_oembed_output_attachment() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,8 +92,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $doc = new DOMDocument();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $doc->loadHTML( $actual ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( strpos( $actual, 'That embed can’t be found.' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( false !== strpos( $actual, 'Hello World' ) );
- $this->assertTrue( false !== strpos( $actual, 'canola.jpg' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotFalse( strpos( $actual, 'Hello World' ) );
+ $this->assertNotFalse( strpos( $actual, 'canola.jpg' ) );
</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_oembed_output_draft_post() {
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> $doc = new DOMDocument();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $doc->loadHTML( $actual ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( false !== strpos( $actual, 'That embed can’t be found.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotFalse( strpos( $actual, 'That embed can’t be found.' ) );
</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_oembed_output_scheduled_post() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,7 +136,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $doc = new DOMDocument();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $doc->loadHTML( $actual ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( false !== strpos( $actual, 'That embed can’t be found.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotFalse( strpos( $actual, 'That embed can’t be found.' ) );
</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_oembed_output_private_post() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,7 +157,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $doc = new DOMDocument();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $doc->loadHTML( $actual ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( false !== strpos( $actual, 'That embed can’t be found.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotFalse( strpos( $actual, 'That embed can’t be found.' ) );
</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_oembed_output_private_post_with_permissions() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -182,8 +182,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $doc = new DOMDocument();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $doc->loadHTML( $actual ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( false === strpos( $actual, 'That embed can’t be found.' ) );
- $this->assertTrue( false !== strpos( $actual, 'Hello World' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertFalse( strpos( $actual, 'That embed can’t be found.' ) );
+ $this->assertNotFalse( strpos( $actual, 'Hello World' ) );
</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_embed_excerpt_more_no_embed() {
</span></span></pre></div>
<a id="branches47testsphpunittestsoembedwpOembedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.7/tests/phpunit/tests/oembed/wpOembed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/tests/phpunit/tests/oembed/wpOembed.php 2017-04-06 18:00:16 UTC (rev 40387)
+++ branches/4.7/tests/phpunit/tests/oembed/wpOembed.php 2017-04-06 18:19:02 UTC (rev 40388)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,7 +36,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = $this->oembed->get_html( $permalink );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'pre_oembed_result', array( $this, '_filter_pre_oembed_result' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( false !== $this->pre_oembed_result_filtered );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotFalse( $this->pre_oembed_result_filtered );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $this->pre_oembed_result_filtered, $actual );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,7 +51,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = $this->oembed->get_html( $permalink );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'pre_oembed_result', array( $this, '_filter_pre_oembed_result' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( false !== $this->pre_oembed_result_filtered );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotFalse( $this->pre_oembed_result_filtered );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $this->pre_oembed_result_filtered, $actual );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> $actual = $this->oembed->get_html( 'https://example.com/' );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'pre_oembed_result', array( $this, '_filter_pre_oembed_result' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( false !== $this->pre_oembed_result_filtered );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotFalse( $this->pre_oembed_result_filtered );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $actual );
</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="branches47testsphpunittestspostthumbnailsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.7/tests/phpunit/tests/post/thumbnails.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/tests/phpunit/tests/post/thumbnails.php 2017-04-06 18:00:16 UTC (rev 40387)
+++ branches/4.7/tests/phpunit/tests/post/thumbnails.php 2017-04-06 18:19:02 UTC (rev 40388)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -194,7 +194,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_the_post_thumbnail_url_with_invalid_post() {
</span><span class="cx" style="display: block; padding: 0 10px"> set_post_thumbnail( self::$post, self::$attachment_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( false !== get_the_post_thumbnail_url( self::$post->ID ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotFalse( get_the_post_thumbnail_url( self::$post->ID ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $deleted = wp_delete_post( self::$post->ID, true );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $deleted );
</span></span></pre></div>
<a id="branches47testsphpunittestspostwpPostTypephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.7/tests/phpunit/tests/post/wpPostType.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/tests/phpunit/tests/post/wpPostType.php 2017-04-06 18:00:16 UTC (rev 40387)
+++ branches/4.7/tests/phpunit/tests/post/wpPostType.php 2017-04-06 18:19:02 UTC (rev 40388)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,7 +101,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_object->remove_rewrite_rules();
</span><span class="cx" style="display: block; padding: 0 10px"> $rewrite_tags_after = $wp_rewrite->rewritecode;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( false !== array_search( "%$post_type%", $rewrite_tags ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotFalse( array_search( "%$post_type%", $rewrite_tags ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( array_search( "%$post_type%", $rewrite_tags_after ) );
</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="branches47testsphpunitteststermwpTaxonomyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.7/tests/phpunit/tests/term/wpTaxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/tests/phpunit/tests/term/wpTaxonomy.php 2017-04-06 18:00:16 UTC (rev 40387)
+++ branches/4.7/tests/phpunit/tests/term/wpTaxonomy.php 2017-04-06 18:19:02 UTC (rev 40388)
</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"> $taxonomy_object->remove_rewrite_rules();
</span><span class="cx" style="display: block; padding: 0 10px"> $rewrite_tags_after = $wp_rewrite->rewritecode;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( false !== array_search( "%$taxonomy%", $rewrite_tags ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotFalse( array_search( "%$taxonomy%", $rewrite_tags ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( array_search( "%$taxonomy%", $rewrite_tags_after ) );
</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="branches47testsphpunitteststhemesupportphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.7/tests/phpunit/tests/theme/support.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/tests/phpunit/tests/theme/support.php 2017-04-06 18:00:16 UTC (rev 40387)
+++ branches/4.7/tests/phpunit/tests/theme/support.php 2017-04-06 18:19:02 UTC (rev 40388)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,7 +90,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> remove_theme_support( 'html5' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( current_theme_supports( 'html5' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( current_theme_supports( 'html5', 'comment-form' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotSame( false, add_theme_support( 'html5' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotFalse( add_theme_support( 'html5' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( current_theme_supports( 'html5' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( current_theme_supports( 'html5', 'comment-form' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( current_theme_supports( 'html5', 'comment-list' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,7 +108,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( current_theme_supports( 'html5' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( current_theme_supports( 'html5', 'comment-form' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( add_theme_support( 'html5', 'comment-form' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotSame( false, add_theme_support( 'html5', array( 'comment-form' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotFalse( add_theme_support( 'html5', array( 'comment-form' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( current_theme_supports( 'html5', 'comment-form' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // This will return true, which might help a plugin author decide what markup to serve,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,7 +117,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // It appends, rather than replaces.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( current_theme_supports( 'html5', 'comment-list' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotSame( false, add_theme_support( 'html5', array( 'comment-list' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotFalse( add_theme_support( 'html5', array( 'comment-list' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( current_theme_supports( 'html5', 'comment-form' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( current_theme_supports( 'html5', 'comment-list' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( current_theme_supports( 'html5', 'search-form' ) );
</span></span></pre></div>
<a id="branches47testsphpunitteststhemephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.7/tests/phpunit/tests/theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/tests/phpunit/tests/theme.php 2017-04-06 18:00:16 UTC (rev 40387)
+++ branches/4.7/tests/phpunit/tests/theme.php 2017-04-06 18:19:02 UTC (rev 40388)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -302,7 +302,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $theme = wp_get_theme();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $style, (string) $theme );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotSame( false, $theme->errors() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotFalse( $theme->errors() );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $theme->exists() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // these return the bogus name - perhaps not ideal behaviour?
</span></span></pre>
</div>
</div>
</body>
</html>