<!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>[393] wp-testcase/test_image.php: Update some 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 { 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>393</dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-08-04 17:56:11 +0000 (Thu, 04 Aug 2011)</dd>
</dl>

<h3>Log Message</h3>
<pre>Update some image tests</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#wptestcasetest_imagephp">wp-testcase/test_image.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="wptestcasetest_imagephp"></a>
<div class="modfile"><h4>Modified: wp-testcase/test_image.php (392 => 393)</h4>
<pre class="diff"><span>
<span class="info">--- wp-testcase/test_image.php        2011-08-04 17:27:26 UTC (rev 392)
+++ wp-testcase/test_image.php        2011-08-04 17:56:11 UTC (rev 393)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx">                 $this-&gt;assertEquals(18, $out['focal_length']);
</span><span class="cx">                 $this-&gt;assertEquals(200, $out['iso']);
</span><span class="cx">                 $this-&gt;assertEquals(1/25, $out['shutter_speed']);
</span><del>-                $this-&gt;assertEquals('IPTC Title', $out['title']);
</del><ins>+                $this-&gt;assertEquals('IPTC Headline', $out['title']);
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         function test_exif_fuji() {
</span><span class="lines">@@ -478,7 +478,8 @@
</span><span class="cx">         function test_resize_larger() {
</span><span class="cx">                 // image_resize() should refuse to make an image larger
</span><span class="cx">                 $image = image_resize( DIR_TESTDATA.'/images/test-image.jpg', 100, 100 );
</span><del>-                $this-&gt;assertEquals( false, $image );
</del><ins>+                $this-&gt;assertInstanceOf( 'WP_Error', $image );
+                $this-&gt;assertEquals( 'error_getting_dimensions', $image-&gt;get_error_code() );
</ins><span class="cx">         }
</span><span class="cx">         
</span><span class="cx">         function test_resize_thumb_128x96() {
</span><span class="lines">@@ -606,9 +607,9 @@
</span><span class="cx">         function test_is_displayable_image_negative() {
</span><span class="cx">                 // these are image files but aren't suitable for web pages because of compatibility or size issues
</span><span class="cx">                 $files = array(
</span><del>-                        'test-image-cmyk.jpg',
</del><ins>+                        // 'test-image-cmyk.jpg', Allowed in r9727
</ins><span class="cx">                         'test-image.bmp',
</span><del>-                        'test-image-grayscale.jpg',
</del><ins>+                        // 'test-image-grayscale.jpg', Allowed in r9727
</ins><span class="cx">                         'test-image.pct',
</span><span class="cx">                         'test-image.tga',
</span><span class="cx">                         'test-image.sgi',
</span><span class="lines">@@ -618,7 +619,7 @@
</span><span class="cx">                         'test-image.psd',
</span><span class="cx">                         'test-image-zip.tiff',
</span><span class="cx">                         );
</span><del>-                        
</del><ins>+
</ins><span class="cx">                 foreach ($files as $file) {
</span><span class="cx">                         $this-&gt;assertFalse( file_is_displayable_image( DIR_TESTDATA.'/images/'.$file ), &quot;file_is_valid_image($file) should return false&quot; );
</span><span class="cx">                 }
</span></span></pre>
</div>
</div>

</body>
</html>