Ticket #23699: test-functions.diff

tests/functions.php

@@ -98 +98 @@
                         $this->assertFalse( path_is_absolute($path), "path_is_absolute('$path') should return false" );
         }
 
-
         function test_wp_unique_filename() {
-                /* 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.
-                */
+                
                 $testdir = DIR_TESTDATA . '/images/';
-                $testimg = 'test-image.png';
-                $this->assertTrue( file_exists($testdir) );
-                $this->assertTrue( is_writable($testdir) );
-                $this->assertTrue( file_exists($testdir . $testimg) );
+                
+                // sanity check
+                $this->assertEquals( 'abcdefg.png', wp_unique_filename( $testdir, 'abcdefg.png' ), 'Sanitiy check failed' );
 
-                $cases = array(
-                        // null case
-                        'null' . $testimg,
+                // check number is appended for file already exists
+                $this->assertFileExists( $testdir . 'test-image.png', 'Test image does not exist' );
+                $this->assertEquals( 'test-image2.png', wp_unique_filename( $testdir, 'test-image2.png' ), 'Number not appended correctly' );
+                $this->assertFileNotExists( $testdir . 'test-image2.png' );
 
-                        // edge cases: '.png', 'abc.', 'abc', 'abc0', 'abc1', 'abc0.png', 'abc1.png' (num @ end)
-                        '.png',
-                        'abc',
-                        'abc.',
-                        'abc0',
-                        'abc1',
-                        'abc0.png',
-                        'abc1.png',
+                // 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' );
 
-                        // 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
+                // check with single quotes in name (somehow)
+                $this->assertEquals( "abcdefgh.png", wp_unique_filename( $testdir, 'abcdefg"h.png' ), 'File with quote failed' );
 
-                        // 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]);
-                }
+                // 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' );
+                
         }
 
         /**