<!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>[42863] trunk/tests/phpunit: Build/Test Tools: Implement `assertNotWPError()` in appropriate places in the test suite.</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/42863">42863</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/42863","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>2018-03-20 22:34:11 +0000 (Tue, 20 Mar 2018)</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: Implement `assertNotWPError()` in appropriate places in the test suite.
Props birgire
Fixes <a href="https://core.trac.wordpress.org/ticket/42065">#42065</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunitincludestestcaserestposttypecontrollerphp">trunk/tests/phpunit/includes/testcase-rest-post-type-controller.php</a></li>
<li><a href="#trunktestsphpunittestsadminincludesPostphp">trunk/tests/phpunit/tests/admin/includesPost.php</a></li>
<li><a href="#trunktestsphpunittestsajaxCustomizeManagerphp">trunk/tests/phpunit/tests/ajax/CustomizeManager.php</a></li>
<li><a href="#trunktestsphpunittestscustomizemanagerphp">trunk/tests/phpunit/tests/customize/manager.php</a></li>
<li><a href="#trunktestsphpunittestscustomizenavmenusettingphp">trunk/tests/phpunit/tests/customize/nav-menu-setting.php</a></li>
<li><a href="#trunktestsphpunittestsimageeditorGdphp">trunk/tests/phpunit/tests/image/editorGd.php</a></li>
<li><a href="#trunktestsphpunittestsimageeditorImagickphp">trunk/tests/phpunit/tests/image/editorImagick.php</a></li>
<li><a href="#trunktestsphpunittestsimagefunctionsphp">trunk/tests/phpunit/tests/image/functions.php</a></li>
<li><a href="#trunktestsphpunittestspostformatsphp">trunk/tests/phpunit/tests/post/formats.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunitincludestestcaserestposttypecontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/testcase-rest-post-type-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/testcase-rest-post-type-controller.php 2018-03-20 22:14:53 UTC (rev 42862)
+++ trunk/tests/phpunit/includes/testcase-rest-post-type-controller.php 2018-03-20 22:34:11 UTC (rev 42863)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -200,7 +200,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"> protected function check_get_posts_response( $response, $context = 'view' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotInstanceOf( 'WP_Error', $response );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotWPError( $response );
</ins><span class="cx" style="display: block; padding: 0 10px"> $response = rest_ensure_response( $response );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 200, $response->get_status() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -232,7 +232,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"> protected function check_get_post_response( $response, $context = 'view' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotInstanceOf( 'WP_Error', $response );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotWPError( $response );
</ins><span class="cx" style="display: block; padding: 0 10px"> $response = rest_ensure_response( $response );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 200, $response->get_status() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -243,7 +243,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"> protected function check_create_post_response( $response ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotInstanceOf( 'WP_Error', $response );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotWPError( $response );
</ins><span class="cx" style="display: block; padding: 0 10px"> $response = rest_ensure_response( $response );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 201, $response->get_status() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -256,7 +256,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"> protected function check_update_post_response( $response ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotInstanceOf( 'WP_Error', $response );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotWPError( $response );
</ins><span class="cx" style="display: block; padding: 0 10px"> $response = rest_ensure_response( $response );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 200, $response->get_status() );
</span></span></pre></div>
<a id="trunktestsphpunittestsadminincludesPostphp"></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/includesPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/includesPost.php 2018-03-20 22:14:53 UTC (rev 42862)
+++ trunk/tests/phpunit/tests/admin/includesPost.php 2018-03-20 22:34:11 UTC (rev 42863)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,7 +32,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_post_data['saveasdraft'] = true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_results = _wp_translate_postdata( false, $_post_data );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotInstanceOf( 'WP_Error', $_results );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotWPError( $_results );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $_post_data['post_author'], $_results['post_author'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'draft', $_results['post_status'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,7 +43,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_post_data['publish'] = true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_results = _wp_translate_postdata( false, $_post_data );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotInstanceOf( 'WP_Error', $_results );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotWPError( $_results );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $_post_data['post_author'], $_results['post_author'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'pending', $_results['post_status'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,7 +82,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_post_data['saveasdraft'] = true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_results = _wp_translate_postdata( false, $_post_data );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotInstanceOf( 'WP_Error', $_results );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotWPError( $_results );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $_post_data['post_author'], $_results['post_author'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'draft', $_results['post_status'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,7 +93,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_post_data['publish'] = true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_results = _wp_translate_postdata( false, $_post_data );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotInstanceOf( 'WP_Error', $_results );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotWPError( $_results );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $_post_data['post_author'], $_results['post_author'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'publish', $_results['post_status'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,7 +104,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_post_data['saveasdraft'] = true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_results = _wp_translate_postdata( false, $_post_data );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotInstanceOf( 'WP_Error', $_results );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotWPError( $_results );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $_post_data['post_author'], $_results['post_author'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'draft', $_results['post_status'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> $_post_data['saveasdraft'] = true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_results = _wp_translate_postdata( true, $_post_data );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotInstanceOf( 'WP_Error', $_results );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotWPError( $_results );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $_post_data['post_author'], $_results['post_author'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'draft', $_results['post_status'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsajaxCustomizeManagerphp"></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/ajax/CustomizeManager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/CustomizeManager.php 2018-03-20 22:14:53 UTC (rev 42862)
+++ trunk/tests/phpunit/tests/ajax/CustomizeManager.php 2018-03-20 22:34:11 UTC (rev 42863)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -645,7 +645,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'changeset_lock_dismissed', $this->_last_response_parsed['data'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['dismiss_autosave'] = $_GET['dismiss_autosave'] = $_REQUEST['dismiss_autosave'] = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotInstanceOf( 'WP_Error', $r );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotWPError( $r );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_get_post_autosave( $wp_customize->changeset_post_id() ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'Foo', get_post( $wp_customize->changeset_post_id() )->post_content );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -665,7 +665,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'autosave' => true,
</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">- $this->assertNotInstanceOf( 'WP_Error', $r );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotWPError( $r );
</ins><span class="cx" style="display: block; padding: 0 10px"> $autosave_revision = wp_get_post_autosave( $wp_customize->changeset_post_id() );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Post', $autosave_revision );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'Foo', get_post( $wp_customize->changeset_post_id() )->post_content );
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizemanagerphp"></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/customize/manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/manager.php 2018-03-20 22:14:53 UTC (rev 42862)
+++ trunk/tests/phpunit/tests/customize/manager.php 2018-03-20 22:34:11 UTC (rev 42863)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -495,7 +495,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'autosave' => true,
</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">- $this->assertNotInstanceOf( 'WP_Error', $r );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotWPError( $r );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // No change to data if not requesting autosave.
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize = new WP_Customize_Manager(
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizenavmenusettingphp"></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/customize/nav-menu-setting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/nav-menu-setting.php 2018-03-20 22:14:53 UTC (rev 42862)
+++ trunk/tests/phpunit/tests/customize/nav-menu-setting.php 2018-03-20 22:34:11 UTC (rev 42863)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -253,7 +253,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $term = (array) wp_get_nav_menu_object( $menu_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $term );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotInstanceOf( 'WP_Error', $term );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotWPError( $term );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets( $post_value, wp_array_slice_assoc( $term, array_keys( $value ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $menu_id, $term['term_id'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $menu_id, $term['term_taxonomy_id'] );
</span></span></pre></div>
<a id="trunktestsphpunittestsimageeditorGdphp"></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/image/editorGd.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/editorGd.php 2018-03-20 22:14:53 UTC (rev 42862)
+++ trunk/tests/phpunit/tests/image/editorGd.php 2018-03-20 22:34:11 UTC (rev 42863)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -476,7 +476,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $editor = wp_get_image_editor( $file );
</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->assertNotInstanceOf( 'WP_Error', $editor );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotWPError( $editor );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $editor->load();
</span><span class="cx" style="display: block; padding: 0 10px"> $editor->resize( 5, 5 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -503,7 +503,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $editor = wp_get_image_editor( $file );
</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->assertNotInstanceOf( 'WP_Error', $editor );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotWPError( $editor );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $editor->load();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -531,7 +531,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = imagecolorsforindex( $image, $rgb );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $editor = new WP_Image_Editor_GD( $file );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotInstanceOf( 'WP_Error', $editor );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotWPError( $editor );
</ins><span class="cx" style="display: block; padding: 0 10px"> $editor->load();
</span><span class="cx" style="display: block; padding: 0 10px"> $editor->rotate( 180 );
</span><span class="cx" style="display: block; padding: 0 10px"> $save_to_file = tempnam( get_temp_dir(), '' ) . '.png';
</span></span></pre></div>
<a id="trunktestsphpunittestsimageeditorImagickphp"></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/image/editorImagick.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/editorImagick.php 2018-03-20 22:14:53 UTC (rev 42862)
+++ trunk/tests/phpunit/tests/image/editorImagick.php 2018-03-20 22:34:11 UTC (rev 42863)
</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"> $editor = new WP_Image_Editor_Imagick( $file );
</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->assertNotInstanceOf( 'WP_Error', $editor );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotWPError( $editor );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $editor->load();
</span><span class="cx" style="display: block; padding: 0 10px"> $editor->resize( 5, 5 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -492,7 +492,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $editor = new WP_Image_Editor_Imagick( $file );
</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->assertNotInstanceOf( 'WP_Error', $editor );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotWPError( $editor );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $editor->load();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -524,7 +524,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $image_editor = new WP_Image_Editor_Imagick( $save_to_file );
</span><span class="cx" style="display: block; padding: 0 10px"> $image_editor->load();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotInstanceOf( 'WP_Error', $image_editor );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotWPError( $image_editor );
</ins><span class="cx" style="display: block; padding: 0 10px"> $image_editor->rotate( 180 );
</span><span class="cx" style="display: block; padding: 0 10px"> $image_editor->save( $save_to_file );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsimagefunctionsphp"></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/image/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/functions.php 2018-03-20 22:14:53 UTC (rev 42862)
+++ trunk/tests/phpunit/tests/image/functions.php 2018-03-20 22:34:11 UTC (rev 42863)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,7 +163,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $file = wp_tempnam();
</span><span class="cx" style="display: block; padding: 0 10px"> $ret = wp_save_image_file( $file, $img, $mime_type, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $ret );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotInstanceOf( 'WP_Error', $ret );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotWPError( $ret );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $mime_type, $this->get_mime_type( $ret['path'] ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Clean up
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -205,7 +205,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make assertions
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $ret );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotInstanceOf( 'WP_Error', $ret );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotWPError( $ret );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $mime_type, $this->get_mime_type( $ret['path'] ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Clean up
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -249,7 +249,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Save the image as each file extension, check the mime type
</span><span class="cx" style="display: block; padding: 0 10px"> $img = wp_get_image_editor( DIR_TESTDATA . '/images/canola.jpg' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotInstanceOf( 'WP_Error', $img );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotWPError( $img );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $temp = get_temp_dir();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $mime_types as $ext => $mime_type ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -260,7 +260,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $file = wp_unique_filename( $temp, uniqid() . ".$ext" );
</span><span class="cx" style="display: block; padding: 0 10px"> $ret = $img->save( trailingslashit( $temp ) . $file );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $ret );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotInstanceOf( 'WP_Error', $ret );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotWPError( $ret );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $mime_type, $this->get_mime_type( $ret['path'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> unlink( $ret['path'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -310,7 +310,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> DIR_TESTDATA . '/images/canola.jpg',
</span><span class="cx" style="display: block; padding: 0 10px"> 0, 0, 100, 100, 100, 100
</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->assertNotInstanceOf( 'WP_Error', $file );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotWPError( $file );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFileExists( $file );
</span><span class="cx" style="display: block; padding: 0 10px"> $image = wp_get_image_editor( $file );
</span><span class="cx" style="display: block; padding: 0 10px"> $size = $image->get_size();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -334,7 +334,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 0, 0, 100, 100, 100, 100, false,
</span><span class="cx" style="display: block; padding: 0 10px"> DIR_TESTDATA . '/images/' . __FUNCTION__ . '.jpg'
</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->assertNotInstanceOf( 'WP_Error', $file );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotWPError( $file );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFileExists( $file );
</span><span class="cx" style="display: block; padding: 0 10px"> $image = wp_get_image_editor( $file );
</span><span class="cx" style="display: block; padding: 0 10px"> $size = $image->get_size();
</span></span></pre></div>
<a id="trunktestsphpunittestspostformatsphp"></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/post/formats.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/formats.php 2018-03-20 22:14:53 UTC (rev 42862)
+++ trunk/tests/phpunit/tests/post/formats.php 2018-03-20 22:34:11 UTC (rev 42863)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,7 +15,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $format );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = set_post_format( $post_id, 'aside' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotInstanceOf( 'WP_Error', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotWPError( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'array', $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, count( $result ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,12 +23,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'aside', $format );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = set_post_format( $post_id, 'standard' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotInstanceOf( 'WP_Error', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotWPError( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'array', $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, count( $result ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = set_post_format( $post_id, '' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotInstanceOf( 'WP_Error', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotWPError( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'array', $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, count( $result ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,7 +43,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $format );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = set_post_format( $post_id, 'aside' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotInstanceOf( 'WP_Error', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotWPError( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'array', $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, count( $result ) );
</span><span class="cx" style="display: block; padding: 0 10px"> // The format can be set but not retrieved until it is registered.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,12 +56,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'aside', $format );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = set_post_format( $post_id, 'standard' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotInstanceOf( 'WP_Error', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotWPError( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'array', $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, count( $result ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = set_post_format( $post_id, '' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotInstanceOf( 'WP_Error', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotWPError( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'array', $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, count( $result ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,13 +75,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( has_post_format( '', $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = set_post_format( $post_id, 'aside' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotInstanceOf( 'WP_Error', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotWPError( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'array', $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, count( $result ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( has_post_format( 'aside', $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = set_post_format( $post_id, 'standard' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotInstanceOf( 'WP_Error', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotWPError( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'array', $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, count( $result ) );
</span><span class="cx" style="display: block; padding: 0 10px"> // Standard is a special case. It shows as false when set.
</span></span></pre>
</div>
</div>
</body>
</html>