<!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][1099] trunk/tests/image/editor.php: Remove trailing whitespace</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/1099">1099</a></dd>
<dt>Author</dt> <dd>nbachiyski</dd>
<dt>Date</dt> <dd>2012-10-31 16:51:08 +0000 (Wed, 31 Oct 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove trailing whitespace</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsimageeditorphp">trunk/tests/image/editor.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsimageeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/image/editor.php (1098 => 1099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/image/editor.php 2012-10-30 20:57:32 UTC (rev 1098)
+++ trunk/tests/image/editor.php 2012-10-31 16:51:08 UTC (rev 1099)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> * @var WP_Image_Editor
</span><span class="cx"> */
</span><span class="cx"> protected $editor = null;
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Setup test fixture
</span><span class="cx"> */
</span><span class="lines">@@ -30,11 +30,11 @@
</span><span class="cx"> 'get_size',
</span><span class="cx"> 'get_suffix'
</span><span class="cx"> ), $className, false );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Override the filters to set our own image editor
</span><del>- add_filter( 'image_editor_class', array( $this, 'image_editor_class' ) );
</del><ins>+ add_filter( 'image_editor_class', array( $this, 'image_editor_class' ) );
</ins><span class="cx"> add_filter( 'wp_editors', array( $this, 'wp_editors' ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Un-cache the chosen image implementation
</span><span class="cx"> $this->_uncache_implementation();
</span><span class="cx"> }
</span><span class="lines">@@ -56,12 +56,12 @@
</span><span class="cx"> $var->setAccessible( true );
</span><span class="cx"> $var->setValue( $class, null );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Override the wp_editors filter
</span><span class="cx"> * @return array
</span><span class="cx"> */
</span><del>- public function wp_editors() {
</del><ins>+ public function wp_editors() {
</ins><span class="cx"> return array( preg_replace('/^WP_Image_Editor_/', '', get_class( $this->editor ) ) );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> public function image_editor_class() {
</span><span class="cx"> return get_class( $this->editor );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Test get_instance where load returns true
</span><span class="cx"> * @ticket 6821
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> // Remove our custom Mock
</span><span class="cx"> remove_filter( 'image_editor_class', $func );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Test the "test" method
</span><span class="cx"> * @ticket 6821
</span><span class="lines">@@ -136,9 +136,9 @@
</span><span class="cx"> $editor = WP_Image_Editor::get_instance( DIR_TESTDATA . '/images/canola.jpg' );
</span><span class="cx">
</span><span class="cx"> // Everything should work
</span><del>- $this->assertInstanceOf( get_class( $this->editor ), $editor );
</del><ins>+ $this->assertInstanceOf( get_class( $this->editor ), $editor );
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Test the "test" method returns false and the fallback editor is chosen
</span><span class="cx"> * @ticket 6821
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx"> $editor = WP_Image_Editor::get_instance( DIR_TESTDATA . '/images/canola.jpg' );
</span><span class="cx">
</span><span class="cx"> // Everything should work
</span><del>- $this->assertInstanceOf( 'WP_Image_Editor_Mock', $editor );
</del><ins>+ $this->assertInstanceOf( 'WP_Image_Editor_Mock', $editor );
</ins><span class="cx">
</span><span class="cx"> // Unhook
</span><span class="cx"> remove_filter( 'image_editor_class', '__return_null' );
</span><span class="lines">@@ -181,12 +181,12 @@
</span><span class="cx"> // Make quality readable
</span><span class="cx"> $property = new ReflectionProperty( $editor, 'quality' );
</span><span class="cx"> $property->setAccessible( true );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Ensure set_quality works
</span><span class="cx"> $this->assertTrue( $editor->set_quality( 75 ) );
</span><span class="cx"> $this->assertEquals( 75, $property->getValue( $editor ) );
</span><span class="cx">
</span><del>- // Ensure the quality filter works
</del><ins>+ // Ensure the quality filter works
</ins><span class="cx"> $func = create_function( '', "return 100;");
</span><span class="cx"> add_filter( 'wp_editor_set_quality', $func );
</span><span class="cx"> $this->assertTrue( $editor->set_quality( 75 ) );
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx"> * @ticket 6821
</span><span class="cx"> */
</span><span class="cx"> public function test_generate_filename() {
</span><del>-
</del><ins>+
</ins><span class="cx"> // Get an editor
</span><span class="cx"> $editor = WP_Image_Editor::get_instance( DIR_TESTDATA . '/images/canola.jpg' );
</span><span class="cx"> $property = new ReflectionProperty( $editor, 'size' );
</span><span class="lines">@@ -222,7 +222,7 @@
</span><span class="cx">
</span><span class="cx"> // Test with a suffix only
</span><span class="cx"> $this->assertEquals( 'canola-100x50.png', basename( $editor->generate_filename( null, null, 'png' ) ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Combo!
</span><span class="cx"> $this->assertEquals( trailingslashit( realpath( get_temp_dir() ) ) . 'canola-new.png', $editor->generate_filename( 'new', realpath( get_temp_dir() ), 'png' ) );
</span><span class="cx"> }
</span><span class="lines">@@ -234,10 +234,10 @@
</span><span class="cx"> public function test_get_size() {
</span><span class="cx">
</span><span class="cx"> $editor = WP_Image_Editor::get_instance( DIR_TESTDATA . '/images/canola.jpg' );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Size should be false by default
</span><span class="cx"> $this->assertNull( $editor->get_size() );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Set a size
</span><span class="cx"> $size = array(
</span><span class="cx"> 'height' => 50,
</span><span class="lines">@@ -249,7 +249,7 @@
</span><span class="cx">
</span><span class="cx"> $this->assertEquals( $size, $editor->get_size() );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Test get_suffix
</span><span class="cx"> * @ticket 6821
</span><span class="lines">@@ -257,7 +257,7 @@
</span><span class="cx"> public function test_get_suffix() {
</span><span class="cx">
</span><span class="cx"> $editor = WP_Image_Editor::get_instance( DIR_TESTDATA . '/images/canola.jpg' );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Size should be false by default
</span><span class="cx"> $this->assertFalse( $editor->get_suffix() );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>