Tests: Use the ms-required group where appropriate.

This replaces the `if ( is_multisite() )` conditional wrapping entire test classes with the `ms-required` group for more consistency across the test suite.

Follow-up to [40520].

See #63167.

git-svn-id: https://develop.svn.wordpress.org/trunk@60148 602fd350-edb4-49c9-b593-d223f7449a82

Author: SergeyBiryukov

tests/phpunit/tests/multisite/avoidBlogPagePermalinkCollision.php

@@ -1,69 +1,67 @@
 <?php
 
-if ( is_multisite() ) :
+/**
+ * Tests specific to `avoid_blog_page_permalink_collision()` in multisite.
+ *
+ * @group ms-required
+ * @group multisite
+ * @group post
+ */
+class Tests_Multisite_AvoidBlogPagePermalinkCollision extends WP_UnitTestCase {
+
+	protected static $site_id;
+	protected static $root_page;
+	protected static $child_page;
+	protected static $post_and_blog_path = 'permalink-collision';
 
 	/**
-	 * Tests specific to `avoid_blog_page_permalink_collision()` in multisite.
-	 *
-	 * @group multisite
-	 * @group post
+	 * Create a blog and the pages we need to test the collision.
 	 */
-	class Tests_Multisite_AvoidBlogPagePermalinkCollision extends WP_UnitTestCase {
-		protected static $site_id;
-		protected static $root_page;
-		protected static $child_page;
-		protected static $post_and_blog_path = 'permalink-collision';
-
-		/**
-		 * Create a blog and the pages we need to test the collision.
-		 */
-		public static function wpSetUpBeforeClass( $factory ) {
-			self::$site_id = self::factory()->blog->create(
-				array(
-					'path' => '/' . self::$post_and_blog_path,
-				)
-			);
+	public static function wpSetUpBeforeClass( $factory ) {
+		self::$site_id = self::factory()->blog->create(
+			array(
+				'path' => '/' . self::$post_and_blog_path,
+			)
+		);
 
-			self::$root_page = self::factory()->post->create_and_get(
-				array(
-					'post_type'  => 'page',
-					'post_title' => 'Bar',
-					'post_name'  => self::$post_and_blog_path,
-				)
-			);
+		self::$root_page = self::factory()->post->create_and_get(
+			array(
+				'post_type'  => 'page',
+				'post_title' => 'Bar',
+				'post_name'  => self::$post_and_blog_path,
+			)
+		);
 
-			self::$child_page = self::factory()->post->create_and_get(
-				array(
-					'post_parent' => self::$root_page->ID,
-					'post_type'   => 'page',
-					'post_title'  => 'Bar',
-					'post_name'   => self::$post_and_blog_path,
-				)
-			);
-		}
-
-		/**
-		 * Delete blog and pages we created.
-		 */
-		public static function wpTearDownAfterClass() {
-			wp_delete_site( self::$site_id );
+		self::$child_page = self::factory()->post->create_and_get(
+			array(
+				'post_parent' => self::$root_page->ID,
+				'post_type'   => 'page',
+				'post_title'  => 'Bar',
+				'post_name'   => self::$post_and_blog_path,
+			)
+		);
+	}
 
-			wp_delete_post( self::$root_page->ID );
-			wp_delete_post( self::$child_page->ID );
-		}
+	/**
+	 * Delete blog and pages we created.
+	 */
+	public static function wpTearDownAfterClass() {
+		wp_delete_site( self::$site_id );
 
-		public function test_avoid_blog_page_permalink_collision_renames_post_name() {
-			$this->assertNotSame( self::$post_and_blog_path, self::$root_page->post_name );
-		}
+		wp_delete_post( self::$root_page->ID );
+		wp_delete_post( self::$child_page->ID );
+	}
 
-		/**
-		 * Ensure `avoid_blog_page_permalink_collision()` doesn't rename child pages' post_name.
-		 *
-		 * @ticket 51147
-		 */
-		public function test_avoid_blog_page_permalink_collision_doesnt_rename_child_pages() {
-			$this->assertSame( self::$post_and_blog_path, self::$child_page->post_name );
-		}
+	public function test_avoid_blog_page_permalink_collision_renames_post_name() {
+		$this->assertNotSame( self::$post_and_blog_path, self::$root_page->post_name );
 	}
 
-endif;
+	/**
+	 * Ensure `avoid_blog_page_permalink_collision()` doesn't rename child pages' post_name.
+	 *
+	 * @ticket 51147
+	 */
+	public function test_avoid_blog_page_permalink_collision_doesnt_rename_child_pages() {
+		$this->assertSame( self::$post_and_blog_path, self::$child_page->post_name );
+	}
+}