<!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][1151] trunk: Tests for [WP22817], see #WP22356.</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/1151">1151</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-11-22 10:19:38 +0000 (Thu, 22 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Tests for [WP22817], see #WP22356. props DH-Shredder.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkincludesmockimageeditorphp">trunk/includes/mock-image-editor.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="trunkincludesmockimageeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/includes/mock-image-editor.php (1150 => 1151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/includes/mock-image-editor.php 2012-11-21 16:06:17 UTC (rev 1150)
+++ trunk/includes/mock-image-editor.php 2012-11-22 10:19:38 UTC (rev 1151)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> public static $load_return = true;
</span><span class="cx"> public static $test_return = true;
</span><span class="cx">
</span><del>- protected function load() {
</del><ins>+ public function load() {
</ins><span class="cx"> return self::$load_return;
</span><span class="cx"> }
</span><span class="cx"> public static function test() {
</span><span class="lines">@@ -39,4 +39,4 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-endif;
</del><span class="cx">\ No newline at end of file
</span><ins>+endif;
</ins></span></pre></div>
<a id="trunktestsimageeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/image/editor.php (1150 => 1151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/image/editor.php 2012-11-21 16:06:17 UTC (rev 1150)
+++ trunk/tests/image/editor.php 2012-11-22 10:19:38 UTC (rev 1151)
</span><span class="lines">@@ -17,10 +17,8 @@
</span><span class="cx"> * Setup test fixture
</span><span class="cx"> */
</span><span class="cx"> public function setup() {
</span><del>- if ( !class_exists( 'WP_Image_Editor' ) )
- $this->markTestSkipped();
</del><ins>+ require_once( ABSPATH . WPINC . '/class-wp-image-editor.php' );
</ins><span class="cx">
</span><del>- // Include our custom mock
</del><span class="cx"> include_once( DIR_TESTDATA . '/../includes/mock-image-editor.php' );
</span><span class="cx">
</span><span class="cx"> // Mock up an abstract image editor based on WP_Image_Editor
</span><span class="lines">@@ -61,10 +59,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Test get_instance where load returns true
</del><ins>+ * Test wp_get_image_editor() where load returns true
</ins><span class="cx"> * @ticket 6821
</span><span class="cx"> */
</span><del>- public function test_get_instance_load_returns_true() {
</del><ins>+ public function test_get_editor_load_returns_true() {
</ins><span class="cx">
</span><span class="cx"> // Swap out the PHPUnit mock with our custom mock
</span><span class="cx"> $func = create_function( '', 'return "WP_Image_Editor_Mock";');
</span><span class="lines">@@ -75,7 +73,7 @@
</span><span class="cx"> WP_Image_Editor_Mock::$load_return = true;
</span><span class="cx">
</span><span class="cx"> // Load an image
</span><del>- $editor = WP_Image_Editor::get_instance( DIR_TESTDATA . '/images/canola.jpg' );
</del><ins>+ $editor = wp_get_image_editor( DIR_TESTDATA . '/images/canola.jpg' );
</ins><span class="cx">
</span><span class="cx"> // Everything should work
</span><span class="cx"> $this->assertInstanceOf( 'WP_Image_Editor_Mock', $editor );
</span><span class="lines">@@ -85,10 +83,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Test get_instance where load returns false
</del><ins>+ * Test wp_get_image_editor() where load returns false
</ins><span class="cx"> * @ticket 6821
</span><span class="cx"> */
</span><del>- public function test_get_instance_load_returns_false() {
</del><ins>+ public function test_get_editor_load_returns_false() {
</ins><span class="cx">
</span><span class="cx"> // Swap out the PHPUnit mock with our custom mock
</span><span class="cx"> $func = create_function( '', 'return "WP_Image_Editor_Mock";');
</span><span class="lines">@@ -99,7 +97,7 @@
</span><span class="cx"> WP_Image_Editor_Mock::$load_return = new WP_Error();
</span><span class="cx">
</span><span class="cx"> // Load an image
</span><del>- $editor = WP_Image_Editor::get_instance( DIR_TESTDATA . '/images/canola.jpg' );
</del><ins>+ $editor = wp_get_image_editor( DIR_TESTDATA . '/images/canola.jpg' );
</ins><span class="cx">
</span><span class="cx"> // Everything should work
</span><span class="cx"> $this->assertInstanceOf( 'WP_Error', $editor );
</span><span class="lines">@@ -115,7 +113,7 @@
</span><span class="cx"> public function test_set_quality() {
</span><span class="cx">
</span><span class="cx"> // Get an editor
</span><del>- $editor = WP_Image_Editor::get_instance( DIR_TESTDATA . '/images/canola.jpg' );
</del><ins>+ $editor = wp_get_image_editor( DIR_TESTDATA . '/images/canola.jpg' );
</ins><span class="cx">
</span><span class="cx"> // Make quality readable
</span><span class="cx"> $property = new ReflectionProperty( $editor, 'quality' );
</span><span class="lines">@@ -142,7 +140,8 @@
</span><span class="cx"> public function test_generate_filename() {
</span><span class="cx">
</span><span class="cx"> // Get an editor
</span><del>- $editor = WP_Image_Editor::get_instance( DIR_TESTDATA . '/images/canola.jpg' );
</del><ins>+ $editor = wp_get_image_editor( DIR_TESTDATA . '/images/canola.jpg' );
+
</ins><span class="cx"> $property = new ReflectionProperty( $editor, 'size' );
</span><span class="cx"> $property->setAccessible( true );
</span><span class="cx"> $property->setValue( $editor, array(
</span><span class="lines">@@ -172,7 +171,7 @@
</span><span class="cx"> */
</span><span class="cx"> public function test_get_size() {
</span><span class="cx">
</span><del>- $editor = WP_Image_Editor::get_instance( DIR_TESTDATA . '/images/canola.jpg' );
</del><ins>+ $editor = wp_get_image_editor( DIR_TESTDATA . '/images/canola.jpg' );
</ins><span class="cx">
</span><span class="cx"> // Size should be false by default
</span><span class="cx"> $this->assertNull( $editor->get_size() );
</span><span class="lines">@@ -194,7 +193,7 @@
</span><span class="cx"> * @ticket 6821
</span><span class="cx"> */
</span><span class="cx"> public function test_get_suffix() {
</span><del>- $editor = WP_Image_Editor::get_instance( DIR_TESTDATA . '/images/canola.jpg' );
</del><ins>+ $editor = wp_get_image_editor( DIR_TESTDATA . '/images/canola.jpg' );
</ins><span class="cx">
</span><span class="cx"> // Size should be false by default
</span><span class="cx"> $this->assertFalse( $editor->get_suffix() );
</span></span></pre></div>
<a id="trunktestsimagefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/image/functions.php (1150 => 1151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/image/functions.php 2012-11-21 16:06:17 UTC (rev 1150)
+++ trunk/tests/image/functions.php 2012-11-22 10:19:38 UTC (rev 1151)
</span><span class="lines">@@ -8,6 +8,15 @@
</span><span class="cx"> class Tests_Image_Functions extends WP_UnitTestCase {
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Setup test fixture
+ */
+ public function setup() {
+ 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';
+ }
+
+ /**
</ins><span class="cx"> * Get the MIME type of a file
</span><span class="cx"> * @param string $filename
</span><span class="cx"> * @return string
</span><span class="lines">@@ -120,7 +129,7 @@
</span><span class="cx"> add_filter( 'image_editor_class', $filter );
</span><span class="cx">
</span><span class="cx"> // Call wp_save_image_file
</span><del>- $img = WP_Image_Editor::get_instance( DIR_TESTDATA . '/images/canola.jpg' );
</del><ins>+ $img = wp_get_image_editor( DIR_TESTDATA . '/images/canola.jpg' );
</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">@@ -158,7 +167,7 @@
</span><span class="cx"> add_filter( 'image_editor_class', $filter );
</span><span class="cx">
</span><span class="cx"> // Save the file
</span><del>- $img = WP_Image_Editor::get_instance( DIR_TESTDATA . '/images/canola.jpg' );
</del><ins>+ $img = wp_get_image_editor( DIR_TESTDATA . '/images/canola.jpg' );
</ins><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">@@ -203,7 +212,7 @@
</span><span class="cx"> add_filter( 'image_editor_class', $filter );
</span><span class="cx">
</span><span class="cx"> // Save the image as each file extension, check the mime type
</span><del>- $img = WP_Image_Editor::get_instance( DIR_TESTDATA . '/images/canola.jpg' );
</del><ins>+ $img = wp_get_image_editor( DIR_TESTDATA . '/images/canola.jpg' );
</ins><span class="cx"> $temp = get_temp_dir();
</span><span class="cx"> foreach ( $mime_types as $ext => $mime_type ) {
</span><span class="cx"> $file = wp_unique_filename( $temp, uniqid() . ".$ext" );
</span><span class="lines">@@ -225,6 +234,7 @@
</span><span class="cx"> * @ticket 17814
</span><span class="cx"> */
</span><span class="cx"> public function test_load_directory() {
</span><ins>+
</ins><span class="cx"> // First, test with deprecated wp_load_image function
</span><span class="cx"> $editor = wp_load_image( DIR_TESTDATA );
</span><span class="cx"> $this->assertNotInternalType( 'resource', $editor );
</span><span class="lines">@@ -237,7 +247,7 @@
</span><span class="cx"> }
</span><span class="cx"> $filter = create_function( '', "return '$class';" );
</span><span class="cx"> add_filter( 'image_editor_class', $filter );
</span><del>- $editor = WP_Image_Editor::get_instance( DIR_TESTDATA );
</del><ins>+ $editor = wp_get_image_editor( DIR_TESTDATA );
</ins><span class="cx"> $this->assertInstanceOf( 'WP_Error', $editor );
</span><span class="cx"> $this->assertEquals( 'error_loading_image', $editor->get_error_code() );
</span><span class="cx"> }
</span><span class="lines">@@ -248,7 +258,7 @@
</span><span class="cx"> 0, 0, 100, 100, 100, 100 );
</span><span class="cx"> $this->assertNotInstanceOf( 'WP_Error', $file );
</span><span class="cx"> $this->assertFileExists( $file );
</span><del>- $image = WP_Image_Editor::get_instance( $file );
</del><ins>+ $image = wp_get_image_editor( $file );
</ins><span class="cx"> $size = $image->get_size();
</span><span class="cx"> $this->assertEquals( 100, $size['height'] );
</span><span class="cx"> $this->assertEquals( 100, $size['width'] );
</span><span class="lines">@@ -260,7 +270,7 @@
</span><span class="cx"> DIR_TESTDATA . '/images/' . rand_str() . '.jpg' );
</span><span class="cx"> $this->assertNotInstanceOf( 'WP_Error', $file );
</span><span class="cx"> $this->assertFileExists( $file );
</span><del>- $image = WP_Image_Editor::get_instance( $file );
</del><ins>+ $image = wp_get_image_editor( $file );
</ins><span class="cx"> $size = $image->get_size();
</span><span class="cx"> $this->assertEquals( 100, $size['height'] );
</span><span class="cx"> $this->assertEquals( 100, $size['width'] );
</span></span></pre>
</div>
</div>
</body>
</html>