Changeset 40543 for trunk/tests/phpunit/tests/user/query.php

Timestamp:

04/23/2017 09:57:31 PM (9 years ago)

Author:

johnbillion

Message:

Build/Test Tools: Introduce skipWithoutMultisite() and skipWithMultisite() methods into the test suite.

This brings much needed uniformity to test skipping when a test requires Multisite or when a test should be excluded from running when Multisite is enabled.

Used in conjunction with the @group ms-required and @group ms-excluded notation, this removes a significant number of skipped tests from the default test suite run.

Fixes #40531

File:

• trunk/tests/phpunit/tests/user/query.php (modified) (10 diffs)

trunk/tests/phpunit/tests/user/query.php

@@ -556 +556 @@
      */
     public function test_roles_and_caps_should_be_populated_for_explicit_value_of_blog_id_on_nonms() {
-        if ( is_multisite() ) {
-            $this->markTestSkipped( __METHOD__ . ' is a non-multisite-only test.' );
-        }
+        $this->skipWithMultisite();
 
         $query = new WP_User_Query( array(
@@ -577 +575 @@
      */
     public function test_roles_and_caps_should_be_populated_for_explicit_value_of_current_blog_id_on_ms() {
-        if ( ! is_multisite() ) {
-            $this->markTestSkipped( __METHOD__ . ' is a multisite-only test.' );
-        }
+        $this->skipWithoutMultisite();
 
         $query = new WP_User_Query( array(
@@ -598 +594 @@
      */
     public function test_roles_and_caps_should_be_populated_for_explicit_value_of_different_blog_id_on_ms_when_fields_all_with_meta() {
-        if ( ! is_multisite() ) {
-            $this->markTestSkipped( __METHOD__ . ' is a multisite-only test.' );
-        }
+        $this->skipWithoutMultisite();
 
         $b = self::factory()->blog->create();
@@ -625 +619 @@
      */
     public function test_roles_and_caps_should_be_populated_for_explicit_value_of_different_blog_id_on_ms_when_fields_all() {
-        if ( ! is_multisite() ) {
-            $this->markTestSkipped( __METHOD__ . ' is a multisite-only test.' );
-        }
+        $this->skipWithoutMultisite();
 
         $b = self::factory()->blog->create();
@@ -651 +643 @@
      */
     public function test_who_authors() {
-        if ( ! is_multisite() ) {
-            $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
-        }
+        $this->skipWithoutMultisite();
 
         $b = self::factory()->blog->create();
@@ -678 +668 @@
      */
     public function test_who_authors_should_work_alongside_meta_query() {
-        if ( ! is_multisite() ) {
-            $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
-        }
+        $this->skipWithoutMultisite();
 
         $b = self::factory()->blog->create();
@@ -714 +702 @@
      */
     public function test_who_authors_should_work_alongside_meta_params() {
-        if ( ! is_multisite() ) {
-            $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
-        }
+        $this->skipWithoutMultisite();
 
         $b = self::factory()->blog->create();
@@ -808 +794 @@
      */
     public function test_has_published_posts_should_respect_blog_id() {
-        if ( ! is_multisite() ) {
-            $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
-        }
+        $this->skipWithoutMultisite();
 
         $blogs = self::factory()->blog->create_many( 2 );
@@ -1376 +1360 @@
      */
     public function test_blog_id_should_restrict_by_blog_without_requiring_a_named_role() {
-        if ( ! is_multisite() ) {
-            $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
-        }
+        $this->skipWithoutMultisite();
 
         $sites = self::factory()->blog->create_many( 2 );
@@ -1399 +1381 @@
      */
     public function test_calling_prepare_query_a_second_time_should_not_add_another_cap_query_on_multisite() {
-        if ( ! is_multisite() ) {
-            $this->markTestSkipped( __METHOD__ . ' requires Multisite.' );
-        }
+        $this->skipWithoutMultisite();
 
         $site_id = get_current_blog_id();