<!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][1157] trunk/tests/image: Simplify image editor 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 { 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://unit-tests.trac.wordpress.org/changeset/1157">1157</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2012-11-26 23:55:36 +0000 (Mon, 26 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simplify image editor tests.
* use WP_Image_Editor_Mock everywhere, instead of getMockForAbstractClass()
* instantiate editors directly, where possible
* only use 'wp_image_editors' hook</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsimagebasephp">trunk/tests/image/base.php</a></li>
<li><a href="#trunktestsimageeditorphp">trunk/tests/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="trunktestsimagebasephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/image/base.php (1156 => 1157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/image/base.php 2012-11-23 16:32:35 UTC (rev 1156)
+++ trunk/tests/image/base.php 2012-11-26 23:55:36 UTC (rev 1157)
</span><span class="lines">@@ -9,25 +9,25 @@
</span><span class="cx"> * Set the image editor engine according to the unit test's specification
</span><span class="cx"> */
</span><span class="cx"> public function setUp() {
</span><del>- $class = $this->editor_engine;
- if ( ! call_user_func( array( $class, 'test' ) ) ) {
</del><ins>+ if ( ! call_user_func( array( $this->editor_engine, 'test' ) ) ) {
</ins><span class="cx"> $this->markTestSkipped( sprintf('The image editor engine %s is not supported on this system', $this->editor_engine) );
</span><span class="cx"> }
</span><del>- add_filter( 'wp_image_editor_class', array( $this, 'setEngine') );
</del><ins>+
+ add_filter( 'wp_image_editors', array( $this, 'setEngine' ), 10, 2 );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Undo the image editor override
</span><span class="cx"> */
</span><span class="cx"> public function tearDown() {
</span><del>- remove_filter( 'wp_image_editor_class', array( $this, 'setEngine' ) );
</del><ins>+ remove_filter( 'wp_image_editors', array( $this, 'setEngine' ), 10, 2 );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Override the image editor engine
</span><span class="cx"> * @return string
</span><span class="cx"> */
</span><del>- public function setEngine() {
- return $this->editor_engine;
</del><ins>+ public function setEngine( $editors ) {
+ return array( $this->editor_engine );
</ins><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunktestsimageeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/image/editor.php (1156 => 1157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/image/editor.php 2012-11-23 16:32:35 UTC (rev 1156)
+++ trunk/tests/image/editor.php 2012-11-26 23:55:36 UTC (rev 1157)
</span><span class="lines">@@ -5,15 +5,10 @@
</span><span class="cx"> * @group image
</span><span class="cx"> * @group media
</span><span class="cx"> */
</span><del>-class Tests_Image_Editor extends WP_UnitTestCase {
</del><ins>+class Tests_Image_Editor extends WP_Image_UnitTestCase {
+ public $editor_engine = 'WP_Image_Editor_Mock';
</ins><span class="cx">
</span><span class="cx"> /**
</span><del>- * Image editor
- * @var WP_Image_Editor
- */
- protected $editor = null;
-
- /**
</del><span class="cx"> * Setup test fixture
</span><span class="cx"> */
</span><span class="cx"> public function setup() {
</span><span class="lines">@@ -21,55 +16,17 @@
</span><span class="cx">
</span><span class="cx"> include_once( DIR_TESTDATA . '/../includes/mock-image-editor.php' );
</span><span class="cx">
</span><del>- // Mock up an abstract image editor based on WP_Image_Editor
- // note: this *HAS* to start with 'WP_Image_Editor_'
- $className = 'WP_Image_Editor_' . substr( md5( uniqid() ), -12 );
- $this->editor = $this->getMockForAbstractClass( 'WP_Image_Editor', array(
- 'get_size',
- 'get_suffix'
- ), $className, false );
-
- // Override the filters to set our own image editor
- add_filter( 'wp_image_editor_class', array( $this, 'image_editor_class' ) );
</del><ins>+ parent::setUp();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Tear down test fixture
- */
- public function tearDown() {
- remove_filter( 'wp_image_editor_class', array( $this, 'image_editor_class' ) );
- }
-
- /**
- * Override the image_editor_class filter
- * @return mixed
- */
- public function image_editor_class() {
- return get_class( $this->editor );
- }
-
- /**
</del><span class="cx"> * Test wp_get_image_editor() where load returns true
</span><span class="cx"> * @ticket 6821
</span><span class="cx"> */
</span><span class="cx"> public function test_get_editor_load_returns_true() {
</span><del>-
- // Swap out the PHPUnit mock with our custom mock
- $func = create_function( '', 'return "WP_Image_Editor_Mock";');
- remove_filter( 'wp_image_editor_class', array( $this, 'image_editor_class' ) );
- add_filter( 'wp_image_editor_class', $func );
-
- // Set load() to return true
- WP_Image_Editor_Mock::$load_return = true;
-
- // Load an image
</del><span class="cx"> $editor = wp_get_image_editor( DIR_TESTDATA . '/images/canola.jpg' );
</span><span class="cx">
</span><del>- // Everything should work
</del><span class="cx"> $this->assertInstanceOf( 'WP_Image_Editor_Mock', $editor );
</span><del>-
- // Remove our custom Mock
- remove_filter( 'wp_image_editor_class', $func );
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -77,23 +34,13 @@
</span><span class="cx"> * @ticket 6821
</span><span class="cx"> */
</span><span class="cx"> public function test_get_editor_load_returns_false() {
</span><del>-
- // Swap out the PHPUnit mock with our custom mock
- $func = create_function( '', 'return "WP_Image_Editor_Mock";');
- remove_filter( 'wp_image_editor_class', array( $this, 'image_editor_class' ) );
- add_filter( 'wp_image_editor_class', $func );
-
- // Set load() to return true
</del><span class="cx"> WP_Image_Editor_Mock::$load_return = new WP_Error();
</span><span class="cx">
</span><del>- // Load an image
</del><span class="cx"> $editor = wp_get_image_editor( DIR_TESTDATA . '/images/canola.jpg' );
</span><span class="cx">
</span><del>- // Everything should work
</del><span class="cx"> $this->assertInstanceOf( 'WP_Error', $editor );
</span><span class="cx">
</span><del>- // Remove our custom Mock
- remove_filter( 'wp_image_editor_class', $func );
</del><ins>+ WP_Image_Editor_Mock::$load_return = true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunktestsimagefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/image/functions.php (1156 => 1157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/image/functions.php 2012-11-23 16:32:35 UTC (rev 1156)
+++ trunk/tests/image/functions.php 2012-11-26 23:55:36 UTC (rev 1157)
</span><span class="lines">@@ -125,11 +125,9 @@
</span><span class="cx"> if ( ! call_user_func( array( $class, 'test' ) ) ) {
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><del>- $filter = create_function( '', "return '$class';" );
- add_filter( 'wp_image_editor_class', $filter );
</del><span class="cx">
</span><del>- // Call wp_save_image_file
- $img = wp_get_image_editor( DIR_TESTDATA . '/images/canola.jpg' );
</del><ins>+ $img = new $class( DIR_TESTDATA . '/images/canola.jpg' );
+ $loaded = $img->load();
</ins><span class="cx">
</span><span class="cx"> // Save a file as each mime type, assert it works
</span><span class="cx"> foreach ( $mime_types as $mime_type ) {
</span><span class="lines">@@ -163,11 +161,11 @@
</span><span class="cx"> if ( ! call_user_func( array( $class, 'test' ) ) ) {
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><del>- $filter = create_function( '', "return '$class';" );
- add_filter( 'wp_image_editor_class', $filter );
</del><span class="cx">
</span><ins>+ $img = new $class( DIR_TESTDATA . '/images/canola.jpg' );
+ $loaded = $img->load();
+
</ins><span class="cx"> // Save the file
</span><del>- $img = wp_get_image_editor( DIR_TESTDATA . '/images/canola.jpg' );
</del><span class="cx"> $mime_type = 'image/gif';
</span><span class="cx"> $file = wp_tempnam( 'tmp.jpg' );
</span><span class="cx"> $ret = $img->save( $file, $mime_type );
</span><span class="lines">@@ -208,9 +206,10 @@
</span><span class="cx"> if ( ! call_user_func( array( $class, 'test' ) ) ) {
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><del>- $filter = create_function( '', "return '$class';" );
- add_filter( 'wp_image_editor_class', $filter );
</del><span class="cx">
</span><ins>+ $img = new $class( DIR_TESTDATA . '/images/canola.jpg' );
+ $loaded = $img->load();
+
</ins><span class="cx"> // Save the image as each file extension, check the mime type
</span><span class="cx"> $img = wp_get_image_editor( DIR_TESTDATA . '/images/canola.jpg' );
</span><span class="cx"> $temp = get_temp_dir();
</span><span class="lines">@@ -242,14 +241,16 @@
</span><span class="cx"> // Then, test with editors.
</span><span class="cx"> $classes = array('WP_Image_Editor_GD', 'WP_Image_Editor_Imagick');
</span><span class="cx"> foreach ( $classes as $class ) {
</span><ins>+ // If the image editor isn't available, skip it
</ins><span class="cx"> if ( ! call_user_func( array( $class, 'test' ) ) ) {
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><del>- $filter = create_function( '', "return '$class';" );
- add_filter( 'wp_image_editor_class', $filter );
- $editor = wp_get_image_editor( DIR_TESTDATA );
- $this->assertInstanceOf( 'WP_Error', $editor );
- $this->assertEquals( 'error_loading_image', $editor->get_error_code() );
</del><ins>+
+ $editor = new $class( DIR_TESTDATA );
+ $loaded = $editor->load();
+
+ $this->assertInstanceOf( 'WP_Error', $loaded );
+ $this->assertEquals( 'error_loading_image', $loaded->get_error_code() );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>