Changeset 36882

Timestamp:

03/08/2016 07:06:12 AM (9 years ago)

Author:

dd32

Message:

Tests: Merge the two different wp_normalize_path() tests.

See #35996, [36881].

Location:

trunk/tests/phpunit/tests

Files:

• file.php (modified) (1 diff)
• functions.php (modified) (1 diff)

trunk/tests/phpunit/tests/file.php

@@ -176 +176 @@
     }
 
-    /**
-     * @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' ),
-        );
-    }
 }

trunk/tests/phpunit/tests/functions.php

@@ -125 +125 @@
     /**
      * @ticket 33265
-     */
-    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',
-        );
-
-        foreach ($paths as $original => $expected) {
-            $this->assertEquals( $expected, wp_normalize_path( $original ) );
-        }
+     * @ticket 35996
+     * @group dd32
+     *
+     * @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( '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' ),
+
+            // Linux paths
+            array( '/www/path/', '/www/path/' ),
+            array( '/www/path/////', '/www/path/' ),
+            array( '/www/path', '/www/path' ),
+        );
     }