<!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>[800] trunk/wp-testcase/test_uploads.php: Port test_uploads.php.</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/800">800</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-06-30 20:21:35 +0000 (Sat, 30 Jun 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Port test_uploads.php. fixes <a href="http://unit-tests.trac.wordpress.org/ticket/70">#70</a>. fixes <a href="http://unit-tests.trac.wordpress.org/ticket/27">#27</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwptestcasetest_uploadsphp">trunk/wp-testcase/test_uploads.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwptestcasetest_uploadsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-testcase/test_uploads.php (799 => 800)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-testcase/test_uploads.php 2012-06-30 20:06:15 UTC (rev 799)
+++ trunk/wp-testcase/test_uploads.php 2012-06-30 20:21:35 UTC (rev 800)
</span><span class="lines">@@ -1,17 +1,20 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><del>-// test various functions used by the uploader
</del><span class="cx">
</span><del>-class TestUploadFunctions extends WPTestCase {
</del><ins>+/**
+ * @group upload
+ * @group media
+ */
+class TestUploadFunctions extends WP_UnitTestCase {
</ins><span class="cx">
</span><del>- var $siteurl = 'http://example.com/foo';
</del><ins>+ var $siteurl;
</ins><span class="cx">
</span><span class="cx"> function setUp() {
</span><span class="cx"> if ( is_multisite() )
</span><span class="cx"> $this->knownUTBug(35);
</span><span class="cx">
</span><span class="cx"> parent::setUp();
</span><del>- update_option( 'siteurl', $this->siteurl );
</del><ins>+ return;
</ins><span class="cx"> // system defaults
</span><span class="cx"> update_option( 'upload_path', 'wp-content/uploads' );
</span><span class="cx"> update_option( 'upload_url_path', '' );
</span><span class="lines">@@ -22,22 +25,16 @@
</span><span class="cx"> parent::tearDown();
</span><span class="cx">
</span><span class="cx"> // Remove year/month folders created by wp_upload_dir().
</span><del>- $this->_destroy_uploads();
</del><ins>+ $uploads = wp_upload_dir();
+ foreach ( scandir( $uploads['basedir'] ) as $file )
+ _rmdir( $uploads['basedir'] . '/' . $file );
</ins><span class="cx"> _rmdir( ABSPATH . 'foo/' );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // See #UT27
- function _maybe_absolute_uploads_url( $url ) {
- if ( '/wp-content' == WP_CONTENT_URL )
- return $url;
-
- return $this->siteurl . $url;
- }
-
</del><span class="cx"> function test_upload_dir_default() {
</span><span class="cx"> // wp_upload_dir() with default parameters
</span><span class="cx"> $info = wp_upload_dir();
</span><del>- $this->assertEquals( $this->_maybe_absolute_uploads_url( '/wp-content/uploads/' ) . gmstrftime('%Y/%m'), $info['url'] );
</del><ins>+ $this->assertEquals( get_option( 'siteurl' ) . '/wp-content/uploads/' . gmstrftime('%Y/%m'), $info['url'] );
</ins><span class="cx"> $this->assertEquals( ABSPATH . 'wp-content/uploads/' . gmstrftime('%Y/%m'), $info['path'] );
</span><span class="cx"> $this->assertEquals( gmstrftime('/%Y/%m'), $info['subdir'] );
</span><span class="cx"> $this->assertEquals( '', $info['error'] );
</span><span class="lines">@@ -47,7 +44,7 @@
</span><span class="cx"> // wp_upload_dir() with a relative upload path that is not 'wp-content/uploads'
</span><span class="cx"> update_option( 'upload_path', 'foo/bar' );
</span><span class="cx"> $info = wp_upload_dir();
</span><del>- $this->assertEquals( $this->siteurl . '/foo/bar/' . gmstrftime('%Y/%m'), $info['url'] );
</del><ins>+ $this->assertEquals( get_option( 'siteurl' ) . '/foo/bar/' . gmstrftime('%Y/%m'), $info['url'] );
</ins><span class="cx"> $this->assertEquals( ABSPATH . 'foo/bar/' . gmstrftime('%Y/%m'), $info['path'] );
</span><span class="cx"> $this->assertEquals( gmstrftime('/%Y/%m'), $info['subdir'] );
</span><span class="cx"> $this->assertEquals( '', $info['error'] );
</span><span class="lines">@@ -69,7 +66,7 @@
</span><span class="cx"> function test_upload_dir_no_yearnum() {
</span><span class="cx"> update_option( 'uploads_use_yearmonth_folders', 0 );
</span><span class="cx"> $info = wp_upload_dir();
</span><del>- $this->assertEquals( $this->_maybe_absolute_uploads_url( '/wp-content/uploads' ), $info['url'] );
</del><ins>+ $this->assertEquals( get_option( 'siteurl' ) . '/wp-content/uploads', $info['url'] );
</ins><span class="cx"> $this->assertEquals( ABSPATH . 'wp-content/uploads', $info['path'] );
</span><span class="cx"> $this->assertEquals( '', $info['subdir'] );
</span><span class="cx"> $this->assertEquals( '', $info['error'] );
</span><span class="lines">@@ -88,7 +85,7 @@
</span><span class="cx"> // upload path setting is empty - it should default to 'wp-content/uploads'
</span><span class="cx"> update_option('upload_path', '');
</span><span class="cx"> $info = wp_upload_dir();
</span><del>- $this->assertEquals( $this->_maybe_absolute_uploads_url( '/wp-content/uploads/' ) . gmstrftime('%Y/%m'), $info['url'] );
</del><ins>+ $this->assertEquals( get_option( 'siteurl' ) . '/wp-content/uploads/' . gmstrftime('%Y/%m'), $info['url'] );
</ins><span class="cx"> $this->assertEquals( ABSPATH . 'wp-content/uploads/' . gmstrftime('%Y/%m'), $info['path'] );
</span><span class="cx"> $this->assertEquals( gmstrftime('/%Y/%m'), $info['subdir'] );
</span><span class="cx"> $this->assertEquals( '', $info['error'] );
</span></span></pre>
</div>
</div>
</body>
</html>