<!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>[829] trunk/wp-testcase/test_includes_post.php: Fix failure in WPTestAttachments and some other clean up.</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/829">829</a></dd>
<dt>Author</dt> <dd>duck_</dd>
<dt>Date</dt> <dd>2012-07-01 08:53:47 +0000 (Sun, 01 Jul 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix failure in WPTestAttachments and some other clean up. See <a href="http://unit-tests.trac.wordpress.org/ticket/89">#89</a>.
The default sizes for 'medium' are no longer 0, see [WP7149]. The thumbnail only
test must set medium_size_(w|h) to 0 itself. 'Default restoration' code removed
from tearDown() in favour of transactions and some other minor clean up.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwptestcasetest_includes_postphp">trunk/wp-testcase/test_includes_post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwptestcasetest_includes_postphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-testcase/test_includes_post.php (828 => 829)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-testcase/test_includes_post.php 2012-06-30 22:55:46 UTC (rev 828)
+++ trunk/wp-testcase/test_includes_post.php 2012-07-01 08:53:47 UTC (rev 829)
</span><span class="lines">@@ -469,25 +469,20 @@
</span><span class="cx"> class WPTestAttachments extends WP_UnitTestCase {
</span><span class="cx">
</span><span class="cx"> function tearDown() {
</span><del>- parent::tearDown();
- // restore system defaults
- update_option('medium_size_w', '');
- update_option('medium_size_h', '');
- update_option('thumbnail_size_w', 150);
- update_option('thumbnail_size_h', 150);
-
</del><span class="cx"> // Remove all uploads.
</span><span class="cx"> $uploads = wp_upload_dir();
</span><span class="cx"> foreach ( scandir( $uploads['basedir'] ) as $file )
</span><span class="cx"> _rmdir( $uploads['basedir'] . '/' . $file );
</span><ins>+
+ parent::tearDown();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function _make_attachment($upload, $parent_post_id=-1) {
</span><span class="cx">
</span><span class="cx"> $type = '';
</span><del>- if ( !empty($upload['type']) )
</del><ins>+ if ( !empty($upload['type']) ) {
</ins><span class="cx"> $type = $upload['type'];
</span><del>- else {
</del><ins>+ } else {
</ins><span class="cx"> $mime = wp_check_filetype( $upload['file'] );
</span><span class="cx"> if ($mime)
</span><span class="cx"> $type = $mime['type'];
</span><span class="lines">@@ -548,9 +543,10 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function test_insert_image_default_thumb() {
</del><ins>+ function test_insert_image_thumb_only() {
+ update_option( 'medium_size_w', 0 );
+ update_option( 'medium_size_h', 0 );
</ins><span class="cx">
</span><del>- // this image is smaller than the thumbnail size so it won't have one
</del><span class="cx"> $filename = ( DIR_TESTDATA.'/images/a2-small.jpg' );
</span><span class="cx"> $contents = file_get_contents($filename);
</span><span class="cx">
</span><span class="lines">@@ -591,11 +587,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_insert_image_medium() {
</span><ins>+ update_option('medium_size_w', 400);
+ update_option('medium_size_h', 0);
</ins><span class="cx">
</span><del>- update_option('medium_size_w', '400');
- update_option('medium_size_h', '');
-
- // this image is smaller than the thumbnail size so it won't have one
</del><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><span class="lines">@@ -636,11 +630,9 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> function test_insert_image_delete() {
</span><ins>+ update_option('medium_size_w', 400);
+ update_option('medium_size_h', 0);
</ins><span class="cx">
</span><del>- update_option('medium_size_w', '400');
- update_option('medium_size_h', '');
-
- // this image is smaller than the thumbnail size so it won't have one
</del><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></span></pre>
</div>
</div>
</body>
</html>