<!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>[Tests][1201] trunk: wp_crop_image() test for error on saving.</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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/1201/tests">1201</a></dd>
<dt>Author</dt> <dd>SergeyBiryukov</dd>
<dt>Date</dt> <dd>2013-02-02 01:50:23 +0000 (Sat, 02 Feb 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>wp_crop_image() test for error on saving. see <a href="http://core.trac.wordpress.org/ticket/23325">#23325</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkincludesmockimageeditorphp">trunk/includes/mock-image-editor.php</a></li>
<li><a href="#trunktestsimagefunctionsphp">trunk/tests/image/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkincludesmockimageeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/includes/mock-image-editor.php (1200 => 1201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/includes/mock-image-editor.php 2013-02-02 01:37:20 UTC (rev 1200)
+++ trunk/includes/mock-image-editor.php 2013-02-02 01:50:23 UTC (rev 1201)
</span><span class="lines">@@ -6,6 +6,7 @@
</span><span class="cx">
</span><span class="cx"> public static $load_return = true;
</span><span class="cx"> public static $test_return = true;
</span><ins>+ public static $save_return = array();
</ins><span class="cx">
</span><span class="cx"> public function load() {
</span><span class="cx"> return self::$load_return;
</span><span class="lines">@@ -32,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx"> public function save( $destfilename = null, $mime_type = null ) {
</span><del>-
</del><ins>+ return self::$save_return;
</ins><span class="cx"> }
</span><span class="cx"> public function stream( $mime_type = null ) {
</span><span class="cx">
</span></span></pre></div>
<a id="trunktestsimagefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/image/functions.php (1200 => 1201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/image/functions.php 2013-02-02 01:37:20 UTC (rev 1200)
+++ trunk/tests/image/functions.php 2013-02-02 01:50:23 UTC (rev 1201)
</span><span class="lines">@@ -6,14 +6,15 @@
</span><span class="cx"> * @group upload
</span><span class="cx"> */
</span><span class="cx"> class Tests_Image_Functions extends WP_UnitTestCase {
</span><del>-
</del><span class="cx"> /**
</span><span class="cx"> * Setup test fixture
</span><span class="cx"> */
</span><span class="cx"> public function setup() {
</span><del>- require_once ABSPATH . WPINC . '/class-wp-image-editor.php';
- require_once ABSPATH . WPINC . '/class-wp-image-editor-gd.php';
- require_once ABSPATH . WPINC . '/class-wp-image-editor-imagick.php';
</del><ins>+ require_once( ABSPATH . WPINC . '/class-wp-image-editor.php' );
+ require_once( ABSPATH . WPINC . '/class-wp-image-editor-gd.php' );
+ require_once( ABSPATH . WPINC . '/class-wp-image-editor-imagick.php' );
+
+ include_once( DIR_TESTDATA . '/../includes/mock-image-editor.php' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -298,4 +299,23 @@
</span><span class="cx"> 0, 0, 100, 100, 100, 100 );
</span><span class="cx"> $this->assertInstanceOf( 'WP_Error', $file );
</span><span class="cx"> }
</span><ins>+
+ function mock_image_editor( $editors ) {
+ return array( 'WP_Image_Editor_Mock' );
+ }
+
+ /**
+ * @ticket 23325
+ */
+ public function test_wp_crop_image_error_on_saving() {
+ WP_Image_Editor_Mock::$save_return = new WP_Error();
+ add_filter( 'wp_image_editors', array( $this, 'mock_image_editor' ) );
+
+ $file = wp_crop_image( DIR_TESTDATA . '/images/canola.jpg',
+ 0, 0, 100, 100, 100, 100 );
+ $this->assertInstanceOf( 'WP_Error', $file );
+
+ remove_filter( 'wp_image_editors', array( $this, 'mock_image_editor' ) );
+ WP_Image_Editor_Mock::$save_return = array();
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>