<!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>[53541] trunk/tests/phpunit/tests/image/functions.php: Tests: Further improve `Tests_Image_Functions::test_wp_crop_image*()` tests.</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/53541">53541</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/53541","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 22:04:24 +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: Further improve `Tests_Image_Functions::test_wp_crop_image*()` tests.
Includes:
* Making the test method names more specific.
* Converting one-off helper methods to static closures.
* Adding a failure message to each assertion when multiple assertions are used in the test.
Follow-up to [1126/tests], [1201/tests], <a href="https://core.trac.wordpress.org/changeset/53292">[53292]</a>, <a href="https://core.trac.wordpress.org/changeset/53495">[53495]</a>, <a href="https://core.trac.wordpress.org/changeset/53522">[53522]</a>, <a href="https://core.trac.wordpress.org/changeset/53538">[53538]</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-20 21:46:27 UTC (rev 53540)
+++ trunk/tests/phpunit/tests/image/functions.php 2022-06-20 22:04:24 UTC (rev 53541)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -483,36 +483,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @ticket 55403
</del><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_crop_image
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- */
- public function test_wp_crop_image_with_filtered_extension() {
- add_filter( 'image_editor_output_format', array( $this, 'filter_image_editor_output_format' ) );
- $file = wp_crop_image(
- DIR_TESTDATA . '/images/canola.jpg',
- 0,
- 0,
- 100,
- 100,
- 100,
- 100
- );
-
- $this->assertNotWPError( $file );
- $this->assertFileExists( $file );
-
- unlink( $file );
- }
-
- public function filter_image_editor_output_format() {
- return array_fill_keys( array( 'image/jpg', 'image/jpeg', 'image/png' ), 'image/webp' );
- }
-
- /**
- * @covers ::wp_crop_image
</del><span class="cx" style="display: block; padding: 0 10px"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_wp_crop_image_file() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_crop_image_with_file() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $file = wp_crop_image(
</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,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -539,7 +513,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires extension openssl
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_wp_crop_image_url() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_crop_image_with_url() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $file = wp_crop_image(
</span><span class="cx" style="display: block; padding: 0 10px"> 'https://asdftestblog1.files.wordpress.com/2008/04/canola.jpg',
</span><span class="cx" style="display: block; padding: 0 10px"> 0,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -571,7 +545,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_crop_image
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_wp_crop_image_file_not_exists() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_crop_image_should_fail_with_wp_error_object_if_file_does_not_exists() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $file = wp_crop_image(
</span><span class="cx" style="display: block; padding: 0 10px"> DIR_TESTDATA . '/images/canoladoesnotexist.jpg',
</span><span class="cx" style="display: block; padding: 0 10px"> 0,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -588,7 +562,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_crop_image
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires extension openssl
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_wp_crop_image_url_not_exists() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_crop_image_should_fail_with_wp_error_object_if_url_does_not_exist() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $file = wp_crop_image(
</span><span class="cx" style="display: block; padding: 0 10px"> 'https://asdftestblog1.files.wordpress.com/2008/04/canoladoesnotexist.jpg',
</span><span class="cx" style="display: block; padding: 0 10px"> 0,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -605,10 +579,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23325
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_crop_image
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_wp_crop_image_error_on_saving() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_crop_image_should_fail_with_wp_error_object_if_there_was_an_error_on_saving() {
</ins><span class="cx" style="display: block; padding: 0 10px"> WP_Image_Editor_Mock::$save_return = new WP_Error();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'wp_image_editors', array( $this, 'mock_image_editor' ) );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter(
+ 'wp_image_editors',
+ static function( $editors ) {
+ return array( 'WP_Image_Editor_Mock' );
+ }
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $file = wp_crop_image(
</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,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -620,15 +600,35 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', $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">- remove_filter( 'wp_image_editors', array( $this, 'mock_image_editor' ) );
</del><span class="cx" style="display: block; padding: 0 10px"> WP_Image_Editor_Mock::$save_return = array();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @see test_wp_crop_image_error_on_saving()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket 55403
+ * @covers ::wp_crop_image
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function mock_image_editor( $editors ) {
- return array( 'WP_Image_Editor_Mock' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_crop_image_should_return_correct_file_extension_if_output_format_was_modified() {
+ add_filter(
+ 'image_editor_output_format',
+ static function() {
+ return array_fill_keys( array( 'image/jpg', 'image/jpeg', 'image/png' ), 'image/webp' );
+ }
+ );
+
+ $file = wp_crop_image(
+ DIR_TESTDATA . '/images/canola.jpg',
+ 0,
+ 0,
+ 100,
+ 100,
+ 100,
+ 100
+ );
+
+ $this->assertNotWPError( $file, 'Cropping the image resulted in a WP_Error.' );
+ $this->assertFileExists( $file, "The file $file does not exist." );
+
+ unlink( $file );
</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>
</div>
</body>
</html>