<!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][1238] trunk/tests/functions.php: better test for wp_unique_filename() fixes #23699</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://core.trac.wordpress.org/changeset/1238/tests">1238</a></dd>
<dt>Author</dt> <dd>joehoyle</dd>
<dt>Date</dt> <dd>2013-03-06 17:41:20 +0000 (Wed, 06 Mar 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>better test for wp_unique_filename() fixes <a href="http://core.trac.wordpress.org/ticket/23699">#23699</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsfunctionsphp">trunk/tests/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/functions.php (1237 => 1238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/functions.php 2013-03-05 18:24:08 UTC (rev 1237)
+++ trunk/tests/functions.php 2013-03-06 17:41:20 UTC (rev 1238)
</span><span class="lines">@@ -98,118 +98,37 @@
</span><span class="cx"> $this->assertFalse( path_is_absolute($path), "path_is_absolute('$path') should return false" );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> function test_wp_unique_filename() {
</span><del>- /* this test requires:
- - that you have dir + file 'data/images/test-image.png',
- - and that this dir is writeable
- - there is an image 'test-image.png' that will be used to test unique filenames
-
- NB: there is a hardcoded dependency that the testing file is '.png'; however,
- this limitation is arbitary, so change it if you like.
- */
</del><ins>+
</ins><span class="cx"> $testdir = DIR_TESTDATA . '/images/';
</span><del>- $testimg = 'test-image.png';
- $this->assertTrue( file_exists($testdir) );
- $this->assertTrue( is_writable($testdir) );
- $this->assertTrue( file_exists($testdir . $testimg) );
</del><ins>+
+ // sanity check
+ $this->assertEquals( 'abcdefg.png', wp_unique_filename( $testdir, 'abcdefg.png' ), 'Sanitiy check failed' );
</ins><span class="cx">
</span><del>- $cases = array(
- // null case
- 'null' . $testimg,
</del><ins>+ // check number is appended for file already exists
+ $this->assertFileExists( $testdir . 'test-image.png', 'Test image does not exist' );
+ $this->assertEquals( 'test-image1.png', wp_unique_filename( $testdir, 'test-image.png' ), 'Number not appended correctly' );
+ $this->assertFileNotExists( $testdir . 'test-image1.png' );
</ins><span class="cx">
</span><del>- // edge cases: '.png', 'abc.', 'abc', 'abc0', 'abc1', 'abc0.png', 'abc1.png' (num @ end)
- '.png',
- 'abc',
- 'abc.',
- 'abc0',
- 'abc1',
- 'abc0.png',
- 'abc1.png',
</del><ins>+ // check special chars
+ $this->assertEquals( 'testtést-imagé.png', wp_unique_filename( $testdir, 'testtést-imagé.png' ), 'Filename with special chars failed' );
+
+ // check special chars with potential conflicting name
+ $this->assertEquals( 'tést-imagé.png', wp_unique_filename( $testdir, 'tést-imagé.png' ), 'Filename with special chars failed' );
+
+ // check with single quotes in name (somehow)
+ $this->assertEquals( "abcdefgh.png", wp_unique_filename( $testdir, "abcdefg'h.png" ), 'File with quote failed' );
</ins><span class="cx">
</span><del>- // replacing # with _
- str_replace('-', '#', $testimg), // test#image.png
- str_replace('-', '##', $testimg), // test##image.png
- str_replace(array('-', 'e'), '#', $testimg), // t#st#imag#.png
- str_replace(array('-', 'e'), '##', $testimg), // t##st##imag##.png
</del><ins>+ // check with single quotes in name (somehow)
+ $this->assertEquals( "abcdefgh.png", wp_unique_filename( $testdir, 'abcdefg"h.png' ), 'File with quote failed' );
</ins><span class="cx">
</span><del>- // replacing \ or ' with nothing
- str_replace('-', '\\', $testimg), // test\image.png
- str_replace('-', '\\\\', $testimg), // test\\image.png
- str_replace(array('-', 'e'), '\\', $testimg), // t\st\imag\.png
- str_replace(array('-', 'e'), '\\\\', $testimg), // t\\st\\imag\\.png
- str_replace('-', "'", $testimg), // test'image.png
- str_replace('-', "'", $testimg), // test''image.png
- str_replace(array('-', 'e'), "'", $testimg), // t'st'imag'.png
- str_replace(array('-', 'e'), "''", $testimg), // t''st''imag''.png
- str_replace('-', "\'", $testimg), // test\'image.png
- str_replace('-', "\'\'", $testimg), // test\'\'image.png
- str_replace(array('-', 'e'), "\'", $testimg), // t\'st\'imag\'.png
- str_replace(array('-', 'e'), "\'\'", $testimg), // t\'\'st\'\'imag\'\'.png
-
- 'test' . str_replace('e', 'é', $testimg), // testtést-imagé.png
-
- '12%af34567890~!@#$..%^&*()|_+qwerty fgh`jkl zx<>?:"{}[]="\'/?.png', // kitchen sink
- $testdir.'test-image-with-path.png',
- );
-
- // what we expect the replacements will do
- $expected = array(
- 'null' . $testimg,
-
- 'png',
- 'abc',
- 'abc',
- 'abc0',
- 'abc1',
- 'abc0.png',
- 'abc1.png',
-
- 'testimage.png',
- 'testimage.png',
- 'tstimag.png',
- 'tstimag.png',
-
- 'testimage.png',
- 'testimage.png',
- 'tstimag.png',
- 'tstimag.png',
- 'testimage.png',
- 'testimage.png',
- 'tstimag.png',
- 'tstimag.png',
- 'testimage.png',
- 'testimage.png',
- 'tstimag.png',
- 'tstimag.png',
-
- 'testtést-imagé.png',
-
- '12%af34567890@..%^_+qwerty-fghjkl-zx.png',
- str_replace( array( '\\', '/', ':' ), '', $testdir ).'test-image-with-path.png',
- );
-
- foreach ($cases as $key => $case) {
- // make sure expected file doesn't exist already
- // happens when tests fail and the unlinking doesn't happen
- if( $expected[$key] !== $testimg && file_exists($testdir . $expected[$key]) )
- unlink($testdir . $expected[$key]);
-
- // -- TEST 1: the replacement is as expected
- $this->assertEquals( $expected[$key], wp_unique_filename($testdir, $case, NULL), $case );
- // -- end TEST 1
-
- // -- TEST 2: the renaming will produce a unique name
- // create the expected file
- copy($testdir . $testimg, $testdir . $expected[$key]);
- // test that wp_unique_filename actually returns a unique filename
- $this->assertFileNotExists( $testdir . wp_unique_filename($testdir, $case, NULL) );
- // -- end TEST 2
-
- // cleanup
- if( $expected[$key] !== $testimg && file_exists($testdir . $expected[$key]) )
- unlink($testdir . $expected[$key]);
- }
</del><ins>+ // test crazy name (useful for regression tests)
+ $this->assertEquals( '12%af34567890@..%^_+qwerty-fghjkl-zx.png', wp_unique_filename( $testdir, '12%af34567890#~!@#$..%^&*()|_+qwerty fgh`jkl zx<>?:"{}[]="\'/?.png' ), 'Failed crazy file name' );
+
+ // test slashes in names
+ $this->assertEquals( 'abcdefg.png', wp_unique_filename( $testdir, 'abcde\fg.png' ), 'Slash not removed' );
+ $this->assertEquals( 'abcdefg.png', wp_unique_filename( $testdir, 'abcde\\fg.png' ), 'Double slashed not removed' );
+ $this->assertEquals( 'abcdefg.png', wp_unique_filename( $testdir, 'abcde\\\fg.png' ), 'Tripple slashed not removed' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>