<!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>[53533] trunk/tests/phpunit/tests/image/functions.php: Tests: Use consistent punctuation in failure messages in `Tests_Image_Functions`.</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 { white-space: pre-line; 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/53533">53533</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/53533","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-06-20 12:48:35 +0000 (Mon, 20 Jun 2022)</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'>Tests: Use consistent punctuation in failure messages in `Tests_Image_Functions`.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/53523">[53523]</a>, <a href="https://core.trac.wordpress.org/changeset/53524">[53524]</a>, <a href="https://core.trac.wordpress.org/changeset/53525">[53525]</a>, <a href="https://core.trac.wordpress.org/changeset/53526">[53526]</a>, <a href="https://core.trac.wordpress.org/changeset/53529">[53529]</a>, <a href="https://core.trac.wordpress.org/changeset/53530">[53530]</a>, <a href="https://core.trac.wordpress.org/changeset/53531">[53531]</a>.
See <a href="https://core.trac.wordpress.org/ticket/55652">#55652</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsimagefunctionsphp">trunk/tests/phpunit/tests/image/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2022-06-19 17:26:52 UTC (rev 53532)
+++ trunk/tests/phpunit/tests/image/functions.php 2022-06-20 12:48:35 UTC (rev 53533)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,7 +74,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_file_is_valid_image_positive( $file ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue(
</span><span class="cx" style="display: block; padding: 0 10px"> file_is_valid_image( DIR_TESTDATA . '/images/' . $file ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "file_is_valid_image( '$file' ) should return true"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "file_is_valid_image( '$file' ) should return true."
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,7 +118,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_file_is_valid_image_negative( $file ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse(
</span><span class="cx" style="display: block; padding: 0 10px"> file_is_valid_image( DIR_TESTDATA . '/images/' . $file ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "file_is_valid_image( '$file' ) should return false"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "file_is_valid_image( '$file' ) should return false."
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,7 +148,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_file_is_displayable_image_positive( $file ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue(
</span><span class="cx" style="display: block; padding: 0 10px"> file_is_displayable_image( DIR_TESTDATA . '/images/' . $file ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "file_is_displayable_image( '$file' ) should return true"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "file_is_displayable_image( '$file' ) should return true."
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -190,7 +190,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_file_is_displayable_image_negative( $file ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse(
</span><span class="cx" style="display: block; padding: 0 10px"> file_is_displayable_image( DIR_TESTDATA . '/images/' . $file ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "file_is_displayable_image( '$file' ) should return false"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "file_is_displayable_image( '$file' ) should return false."
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -257,12 +257,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $img = new $class_name( DIR_TESTDATA . '/images/canola.jpg' );
</span><span class="cx" style="display: block; padding: 0 10px"> $loaded = $img->load();
</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->assertNotWPError( $loaded, 'Image failed to load - WP_Error returned' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotWPError( $loaded, 'Image failed to load - WP_Error returned.' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $img->supports_mime_type( $mime_type ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped(
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'The %s mime type is not supported by the %s engine',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'The %s mime type is not supported by the %s engine.',
</ins><span class="cx" style="display: block; padding: 0 10px"> $mime_type,
</span><span class="cx" style="display: block; padding: 0 10px"> str_replace( 'WP_Image_Editor_', '', $class_name )
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -274,9 +274,9 @@
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make assertions.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotEmpty( $ret, 'Image failed to save - "empty" response returned' );
- $this->assertNotWPError( $ret, 'Image failed to save - WP_Error returned' );
- $this->assertSame( $mime_type, $this->get_mime_type( $ret['path'] ), 'Mime type of the saved image does not match' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotEmpty( $ret, 'Image failed to save - "empty" response returned.' );
+ $this->assertNotWPError( $ret, 'Image failed to save - WP_Error returned.' );
+ $this->assertSame( $mime_type, $this->get_mime_type( $ret['path'] ), 'Mime type of the saved image does not match.' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Clean up.
</span><span class="cx" style="display: block; padding: 0 10px"> unlink( $file );
</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"> $img = new $class_name( DIR_TESTDATA . '/images/canola.jpg' );
</span><span class="cx" style="display: block; padding: 0 10px"> $loaded = $img->load();
</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->assertNotWPError( $loaded, 'Image failed to load - WP_Error returned' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotWPError( $loaded, 'Image failed to load - WP_Error returned.' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Save the file.
</span><span class="cx" style="display: block; padding: 0 10px"> $mime_type = 'image/gif';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -342,9 +342,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $ret = $img->save( $file, $mime_type );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make assertions.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotEmpty( $ret, 'Image failed to save - "empty" response returned' );
- $this->assertNotWPError( $ret, 'Image failed to save - WP_Error returned' );
- $this->assertSame( $mime_type, $this->get_mime_type( $ret['path'] ), 'Mime type of the saved image did not override file name' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotEmpty( $ret, 'Image failed to save - "empty" response returned.' );
+ $this->assertNotWPError( $ret, 'Image failed to save - WP_Error returned.' );
+ $this->assertSame( $mime_type, $this->get_mime_type( $ret['path'] ), 'Mime type of the saved image did not override file name.' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Clean up.
</span><span class="cx" style="display: block; padding: 0 10px"> unlink( $file );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -379,12 +379,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $img = new $class_name( DIR_TESTDATA . '/images/canola.jpg' );
</span><span class="cx" style="display: block; padding: 0 10px"> $loaded = $img->load();
</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->assertNotWPError( $loaded, 'Image failed to load - WP_Error returned' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotWPError( $loaded, 'Image failed to load - WP_Error returned.' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $img->supports_mime_type( $mime_type ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped(
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'The %s mime type is not supported by the %s engine',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'The %s mime type is not supported by the %s engine.',
</ins><span class="cx" style="display: block; padding: 0 10px"> $mime_type,
</span><span class="cx" style="display: block; padding: 0 10px"> str_replace( 'WP_Image_Editor_', '', $class_name )
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -397,9 +397,9 @@
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make assertions.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotEmpty( $ret, 'Image failed to save - "empty" response returned' );
- $this->assertNotWPError( $ret, 'Image failed to save - WP Error returned' );
- $this->assertSame( $mime_type, $this->get_mime_type( $ret['path'] ), 'Mime type of the saved image was not inferred correctly' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotEmpty( $ret, 'Image failed to save - "empty" response returned.' );
+ $this->assertNotWPError( $ret, 'Image failed to save - WP Error returned.' );
+ $this->assertSame( $mime_type, $this->get_mime_type( $ret['path'] ), 'Mime type of the saved image was not inferred correctly.' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Clean up.
</span><span class="cx" style="display: block; padding: 0 10px"> unlink( $ret['path'] );
</span></span></pre>
</div>
</div>
</body>
</html>