sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tests: Merge the two different wp_normalize_path() tests.

Browse Source 
See #35996, [36881].


git-svn-id: https://develop.svn.wordpress.org/trunk@36882 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Dion Hulse 2016-03-08 07:06:12 +00:00
parent 8d9b0a9d22
commit adcb0b5a4a
2 changed files with 23 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/phpunit/tests/file.php
View File

@ -175,26 +175,4 @@ class Tests_File extends WP_UnitTestCase {
);
}
/**
* @dataProvider data_wp_normalize_path
*/
function test_wp_normalize_path( $path, $expected ) {
$this->assertEquals( $expected, wp_normalize_path( $path ) );
}
function data_wp_normalize_path() {
return array(
// Windows paths
array( 'C:\\www\\path\\', 'C:/www/path/' ),
array( 'C:\\www\\\\path\\', 'C:/www/path/' ),
array( 'c:/www/path', 'C:/www/path' ),
array( 'c:\\www\\path\\', 'C:/www/path/' ), // uppercase drive letter
array( '\\\\Domain\\DFSRoots\\share\\path\\', '//Domain/DFSRoots/share/path/' ),
array( '\\\\Server\\share\\path', '//Server/share/path' ),
// Linux paths
array( '/www/path/', '/www/path/' ),
array( '/www/path/////', '/www/path/' ),
array( '/www/path', '/www/path' ),
);
}
}

41
tests/phpunit/tests/functions.php
View File

@ -124,26 +124,31 @@ class Tests_Functions extends WP_UnitTestCase {
/**
* @ticket 33265
* @ticket 35996
* @group dd32
*
* @dataProvider data_wp_normalize_path
*/
function test_wp_normalize_path() {
$paths = array(
'/WINDOWS' => '/WINDOWS',
'C:/' => 'C:/',
'C:/WINDOWS' => 'C:/WINDOWS',
'C:/WINDOWS/system32' => 'C:/WINDOWS/system32',
'\\WINDOWS' => '/WINDOWS',
'C:\\' => 'C:/',
'C:\\WINDOWS' => 'C:/WINDOWS',
'C:\\\\WINDOWS' => 'C:/WINDOWS',
'C:\\WINDOWS\\system32' => 'C:/WINDOWS/system32',
'\\\\sambashare\\foo' => '/sambashare/foo',
'c:/windows' => 'C:/windows',
'c:\\windows' => 'C:/windows',
);
function test_wp_normalize_path( $path, $expected ) {
$this->assertEquals( $expected, wp_normalize_path( $path ) );
}
function data_wp_normalize_path() {
return array(
// Windows paths
array( 'C:\\www\\path\\', 'C:/www/path/' ),
array( 'C:\\www\\\\path\\', 'C:/www/path/' ),
array( 'c:/www/path', 'C:/www/path' ),
array( 'c:\\www\\path\\', 'C:/www/path/' ), // uppercase drive letter
array( 'c:\\\\www\\path\\', 'C:/www/path/' ),
array( '\\\\Domain\\DFSRoots\\share\\path\\', '//Domain/DFSRoots/share/path/' ),
array( '\\\\Server\\share\\path', '//Server/share/path' ),
array( '\\\\Server\\share', '//Server/share' ),
foreach ($paths as $original => $expected) {
$this->assertEquals( $expected, wp_normalize_path( $original ) );
}
// Linux paths
array( '/www/path/', '/www/path/' ),
array( '/www/path/////', '/www/path/' ),
array( '/www/path', '/www/path' ),
);
}
function test_wp_unique_filename() {