<!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>[590] wp-testcase/test_includes_post.php: Fixing failed 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/590">590</a></dd>
<dt>Author</dt> <dd>kurtpayne</dd>
<dt>Date</dt> <dd>2012-03-26 22:24:14 +0000 (Mon, 26 Mar 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixing failed tests. See http://unit-test.trac.wordpress.org/ticket/29</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#wptestcasetest_includes_postphp">wp-testcase/test_includes_post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="wptestcasetest_includes_postphp"></a>
<div class="modfile"><h4>Modified: wp-testcase/test_includes_post.php (589 => 590)</h4>
<pre class="diff"><span>
<span class="info">--- wp-testcase/test_includes_post.php 2012-03-26 17:32:34 UTC (rev 589)
+++ wp-testcase/test_includes_post.php 2012-03-26 22:24:14 UTC (rev 590)
</span><span class="lines">@@ -492,7 +492,7 @@
</span><span class="cx"> $filename = ( DIR_TESTDATA.'/images/test-image.jpg' );
</span><span class="cx"> $contents = file_get_contents($filename);
</span><span class="cx">
</span><del>- $upload = wp_upload_bits($filename, 'image/jpeg', $contents);
</del><ins>+ $upload = wp_upload_bits(basename($filename), 'image/jpeg', $contents);
</ins><span class="cx"> $this->assertTrue( empty($upload['error']) );
</span><span class="cx">
</span><span class="cx"> $id = $this->_make_attachment($upload);
</span><span class="lines">@@ -501,12 +501,6 @@
</span><span class="cx"> $this->assertFalse( image_get_intermediate_size($id, 'thumbnail') );
</span><span class="cx"> $this->assertFalse( image_get_intermediate_size($id, 'medium') );
</span><span class="cx">
</span><del>- // the thumb url should point to the thumbnail intermediate
- $this->assertEquals( $thumb['url'], wp_get_attachment_thumb_url($id) );
-
- // image_downsize() should return the correct images and sizes
- $this->assertFalse( image_downsize($id, 'thumbnail') );
-
</del><span class="cx"> // medium and full size will both point to the original
</span><span class="cx"> $downsize = image_downsize($id, 'medium');
</span><span class="cx"> $this->assertEquals( 'test-image.jpg', basename($downsize[0]) );
</span><span class="lines">@@ -526,7 +520,7 @@
</span><span class="cx"> $filename = ( DIR_TESTDATA.'/images/a2-small.jpg' );
</span><span class="cx"> $contents = file_get_contents($filename);
</span><span class="cx">
</span><del>- $upload = wp_upload_bits($filename, 'image/jpeg', $contents);
</del><ins>+ $upload = wp_upload_bits(basename($filename), 'image/jpeg', $contents);
</ins><span class="cx"> $this->assertTrue( empty($upload['error']) );
</span><span class="cx">
</span><span class="cx"> $id = $this->_make_attachment($upload);
</span><span class="lines">@@ -534,8 +528,10 @@
</span><span class="cx"> // intermediate copies should exist: thumbnail only
</span><span class="cx"> $thumb = image_get_intermediate_size($id, 'thumbnail');
</span><span class="cx"> $this->assertEquals( 'a2-small-150x150.jpg', $thumb['file'] );
</span><del>- $this->assertTrue( is_file($thumb['path']) );
</del><span class="cx">
</span><ins>+ $uploads = wp_upload_dir();
+ $this->assertTrue( is_file($uploads['basedir'] . DIRECTORY_SEPARATOR . $thumb['path']) );
+
</ins><span class="cx"> $this->assertFalse( image_get_intermediate_size($id, 'medium') );
</span><span class="cx">
</span><span class="cx"> // the thumb url should point to the thumbnail intermediate
</span><span class="lines">@@ -569,38 +565,39 @@
</span><span class="cx"> $filename = ( DIR_TESTDATA.'/images/2007-06-17DSC_4173.JPG' );
</span><span class="cx"> $contents = file_get_contents($filename);
</span><span class="cx">
</span><del>- $upload = wp_upload_bits($filename, 'image/jpeg', $contents);
</del><ins>+ $upload = wp_upload_bits(basename($filename), 'image/jpeg', $contents);
</ins><span class="cx"> $this->assertTrue( empty($upload['error']) );
</span><span class="cx">
</span><span class="cx"> $id = $this->_make_attachment($upload);
</span><ins>+ $uploads = wp_upload_dir();
</ins><span class="cx">
</span><span class="cx"> // intermediate copies should exist: thumbnail and medium
</span><span class="cx"> $thumb = image_get_intermediate_size($id, 'thumbnail');
</span><del>- $this->assertEquals( '2007-06-17dsc_4173-150x150.jpg', $thumb['file'] );
- $this->assertTrue( is_file($thumb['path']) );
</del><ins>+ $this->assertEquals( '2007-06-17DSC_4173-150x150.jpg', $thumb['file'] );
+ $this->assertTrue( is_file($uploads['basedir'] . DIRECTORY_SEPARATOR . $thumb['path']) );
</ins><span class="cx">
</span><span class="cx"> $medium = image_get_intermediate_size($id, 'medium');
</span><del>- $this->assertEquals( '2007-06-17dsc_4173-400x602.jpg', $medium['file'] );
- $this->assertTrue( is_file($medium['path']) );
</del><ins>+ $this->assertEquals( '2007-06-17DSC_4173-400x602.jpg', $medium['file'] );
+ $this->assertTrue( is_file($uploads['basedir'] . DIRECTORY_SEPARATOR . $medium['path']) );
</ins><span class="cx">
</span><span class="cx"> // the thumb url should point to the thumbnail intermediate
</span><span class="cx"> $this->assertEquals( $thumb['url'], wp_get_attachment_thumb_url($id) );
</span><span class="cx">
</span><span class="cx"> // image_downsize() should return the correct images and sizes
</span><span class="cx"> $downsize = image_downsize($id, 'thumbnail');
</span><del>- $this->assertEquals( '2007-06-17dsc_4173-150x150.jpg', basename($downsize[0]) );
</del><ins>+ $this->assertEquals( '2007-06-17DSC_4173-150x150.jpg', basename($downsize[0]) );
</ins><span class="cx"> $this->assertEquals( 150, $downsize[1] );
</span><span class="cx"> $this->assertEquals( 150, $downsize[2] );
</span><span class="cx">
</span><span class="cx"> $downsize = image_downsize($id, 'medium');
</span><del>- $this->assertEquals( '2007-06-17dsc_4173-400x602.jpg', basename($downsize[0]) );
</del><ins>+ $this->assertEquals( '2007-06-17DSC_4173-400x602.jpg', basename($downsize[0]) );
</ins><span class="cx"> $this->assertEquals( 400, $downsize[1] );
</span><span class="cx"> $this->assertEquals( 602, $downsize[2] );
</span><span class="cx">
</span><span class="cx"> $downsize = image_downsize($id, 'full');
</span><del>- $this->assertEquals( '2007-06-17dsc_4173.jpg', basename($downsize[0]) );
- $this->assertEquals( 500, $downsize[1] );
- $this->assertEquals( 752, $downsize[2] );
</del><ins>+ $this->assertEquals( '2007-06-17DSC_4173.jpg', basename($downsize[0]) );
+ $this->assertEquals( 680, $downsize[1] );
+ $this->assertEquals( 1024, $downsize[2] );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -613,23 +610,24 @@
</span><span class="cx"> $filename = ( DIR_TESTDATA.'/images/2007-06-17DSC_4173.JPG' );
</span><span class="cx"> $contents = file_get_contents($filename);
</span><span class="cx">
</span><del>- $upload = wp_upload_bits($filename, 'image/jpeg', $contents);
</del><ins>+ $upload = wp_upload_bits(basename($filename), 'image/jpeg', $contents);
</ins><span class="cx"> $this->assertTrue( empty($upload['error']) );
</span><span class="cx">
</span><span class="cx"> $id = $this->_make_attachment($upload);
</span><ins>+ $uploads = wp_upload_dir();
</ins><span class="cx">
</span><span class="cx"> // check that the file and intermediates exist
</span><span class="cx"> $thumb = image_get_intermediate_size($id, 'thumbnail');
</span><del>- $this->assertEquals( '2007-06-17dsc_4173-150x150.jpg', $thumb['file'] );
- $this->assertTrue( is_file($thumb['path']) );
</del><ins>+ $this->assertEquals( '2007-06-17DSC_4173-150x150.jpg', $thumb['file'] );
+ $this->assertTrue( is_file($uploads['basedir'] . DIRECTORY_SEPARATOR . $thumb['path']) );
</ins><span class="cx">
</span><span class="cx"> $medium = image_get_intermediate_size($id, 'medium');
</span><del>- $this->assertEquals( '2007-06-17dsc_4173-400x602.jpg', $medium['file'] );
- $this->assertTrue( is_file($medium['path']) );
</del><ins>+ $this->assertEquals( '2007-06-17DSC_4173-400x602.jpg', $medium['file'] );
+ $this->assertTrue( is_file($uploads['basedir'] . DIRECTORY_SEPARATOR . $medium['path']) );
</ins><span class="cx">
</span><span class="cx"> $meta = wp_get_attachment_metadata($id);
</span><span class="cx"> $original = $meta['file'];
</span><del>- $this->assertTrue( is_file($original) );
</del><ins>+ $this->assertTrue( is_file($uploads['basedir'] . DIRECTORY_SEPARATOR . $original) );
</ins><span class="cx">
</span><span class="cx"> // now delete the attachment and make sure all files are gone
</span><span class="cx"> wp_delete_attachment($id);
</span></span></pre>
</div>
</div>
</body>
</html>