Changeset 30152

Timestamp:

11/01/2014 05:17:17 AM (12 years ago)

Author:

jeremyfelt

Message:

Split tests for is_main_site()

Break multiple assertions from one method into multiple methods with one assertion each.

See #30080

File:

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

trunk/tests/phpunit/tests/multisite/site.php

@@ -874 +874 @@
         }
 
+        /**
+         * Test with default parameter of site_id as null.
+         */
         function test_is_main_site() {
                 $this->assertTrue( is_main_site() );
+        }
+
+        /**
+         * Test with a site id of get_current_blog_id(), which should be the same as the
+         * default parameter tested above.
+         */
+        function test_current_blog_id_is_main_site() {
                 $this->assertTrue( is_main_site( get_current_blog_id() ) );
-
-                $user_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
-                $blog_id = $this->factory->blog->create( array( 'user_id' => $user_id ) );
-
-                switch_to_blog( $blog_id  );
+        }
+
+        /**
+         * Test with a site ID other than the main site to ensure a false response.
+         */
+        function test_is_main_site_is_false_with_other_blog_id() {
+                $blog_id = $this->factory->blog->create();
+
                 $this->assertFalse( is_main_site( $blog_id ) );
-                $this->assertFalse( is_main_site( get_current_blog_id() ) );
+        }
+
+        /**
+         * Test with no passed ID after switching to another site ID.
+         */
+        function test_is_main_site_is_false_after_switch_to_blog() {
+                $blog_id = $this->factory->blog->create();
+                switch_to_blog( $blog_id );
+
                 $this->assertFalse( is_main_site() );