Changeset 33254

Timestamp:

07/14/2015 05:51:05 AM (10 years ago)

Author:

jeremyfelt

Message:

Tests: Use a data provider when testing path slashing in update_blog_details().

Trims down 11 tests to 1 clean area of testing and makes for a much saner read.

See #32988.

File:

• trunk/tests/phpunit/tests/multisite/updateBlogDetails.php (modified) (1 diff)

trunk/tests/phpunit/tests/multisite/updateBlogDetails.php

@@ -235 +235 @@
 
     /**
-     * When the path for a site is updated with update_blog_details(), the final
-     * path should have a leading and trailing slash. When multiple directories
-     * are part of the path, only one slash should separate each directory.
+     * When the path for a site is updated with update_blog_details(), the final path
+     * should have a leading and trailing slash.
      *
-     * @ticket 18117
-     */
-    function test_update_blog_details_single_path_no_slashes() {
-        update_blog_details( 1, array( 'path' => 'my_path' ) );
-        $blog = get_blog_details( 1 );
-        $this->assertEquals( '/my_path/', $blog->path );
-    }
-
-    function test_update_blog_details_single_path_double_trailing_slashes() {
-        update_blog_details( 1, array( 'path' => 'my_path//' ) );
-        $blog = get_blog_details( 1 );
-        $this->assertEquals( '/my_path/', $blog->path );
-    }
-
-    function test_update_blog_details_single_path_double_leading_slashes() {
-        update_blog_details( 1, array( 'path' => '//my_path' ) );
-        $blog = get_blog_details( 1 );
-        $this->assertEquals( '/my_path/', $blog->path );
-    }
-
-    function test_update_blog_details_single_path_single_trailing_slash() {
-        update_blog_details( 1, array( 'path' => 'my_path/' ) );
-        $blog = get_blog_details( 1 );
-        $this->assertEquals( '/my_path/', $blog->path );
-    }
-
-    function test_update_blog_details_single_path_single_leading_slashes() {
-        update_blog_details( 1, array( 'path' => '/my_path' ) );
-        $blog = get_blog_details( 1 );
-        $this->assertEquals( '/my_path/', $blog->path );
-    }
-
-    function test_update_blog_details_single_path_both_slashes() {
-        update_blog_details( 1, array( 'path' => '/my_path/' ) );
-        $blog = get_blog_details( 1 );
-        $this->assertEquals( '/my_path/', $blog->path );
-    }
-
-    function test_update_blog_details_multiple_paths_no_slashes() {
-        update_blog_details( 1, array( 'path' => 'multiple/dirs' ) );
-        $blog = get_blog_details( 1 );
-        $this->assertEquals( '/multiple/dirs/', $blog->path );
-    }
-
-    /**
-     * `update_blog_details()` does not resolve multiple slashes in the
-     * middle of a path string.
-     */
-    function test_update_blog_details_multiple_paths_middle_slashes() {
-        update_blog_details( 1, array( 'path' => 'multiple///dirs' ) );
-        $blog = get_blog_details( 1 );
-        $this->assertEquals( '/multiple///dirs/', $blog->path );
-    }
-
-    function test_update_blog_details_multiple_paths_leading_slash() {
-        update_blog_details( 1, array( 'path' => '/multiple/dirs' ) );
-        $blog = get_blog_details( 1 );
-        $this->assertEquals( '/multiple/dirs/', $blog->path );
-    }
-
-    function test_update_blog_details_multiple_paths_trailing_slash() {
-        update_blog_details( 1, array( 'path' => 'multiple/dirs/' ) );
-        $blog = get_blog_details( 1 );
-        $this->assertEquals( '/multiple/dirs/', $blog->path );
-    }
-
-    function test_update_blog_details_multiple_paths_both_slashes() {
-        update_blog_details( 1, array( 'path' => '/multiple/dirs/' ) );
-        $blog = get_blog_details( 1 );
-        $this->assertEquals( '/multiple/dirs/', $blog->path );
+     * @dataProvider data_single_directory_path
+     */
+    public function test_update_blog_details_single_directory_path( $path, $expected ) {
+        update_blog_details( 1, array( 'path' => $path ) );
+        $site = get_blog_details( 1 );
+
+        $this->assertEquals( $expected, $site->path );
+    }
+
+    public function data_single_directory_path() {
+        return array(
+            array( 'my_path',   '/my_path/' ),
+            array( 'my_path//', '/my_path/' ),
+            array( '//my_path', '/my_path/' ),
+            array( 'my_path/',  '/my_path/' ),
+            array( '/my_path',  '/my_path/' ),
+            array( '/my_path/', '/my_path/' ),
+
+            array( 'multiple/dirs',   '/multiple/dirs/' ),
+            array( '/multiple/dirs',  '/multiple/dirs/' ),
+            array( 'multiple/dirs/',  '/multiple/dirs/' ),
+            array( '/multiple/dirs/', '/multiple/dirs/' ),
+
+            // update_blog_details() does not resolve multiple slashes in the middle of a path string.
+            array( 'multiple///dirs', '/multiple///dirs/' ),
+        );
     }