Changeset 12246 for trunk/tests/phpunit/testcases/blogs/functions.php

Timestamp:

10/05/2018 05:24:17 PM (8 years ago)

Author:

boonebgorges

Message:

Tests: Move wpmu_new_blog and delete_blog expectedDeprecated calls into test logic.

Use of the @expectedDeprecated annotation means that the deprecation notice is
expected across all versions of WordPress, while we in fact need to suppress the
notices only on WP 5.0+.

See #7984.

File:

• trunk/tests/phpunit/testcases/blogs/functions.php (modified) (6 diffs)

trunk/tests/phpunit/testcases/blogs/functions.php

@@ -282 +282 @@
         /**
          * @group bp_blogs_restore_data
-         * @expectedDeprecated wpmu_new_blog
          */
         public function test_bp_blogs_restore_data() {
                 if ( ! is_multisite() ) {
                         $this->markTestSkipped();
+                }
+
+                if ( function_exists( 'wp_initialize_site' ) ) {
+                        $this->setExpectedDeprecated( 'wpmu_new_blog' );
                 }
 
@@ -888 +891 @@
         public function test_bp_blogs_comment_sync_activity_comment_for_custom_post_type() {
                 if ( is_multisite() ) {
-                        $this->setExpectedDeprecated( 'wpmu_new_blog' );
+                        if ( function_exists( 'wp_initialize_site' ) ) {
+                                $this->setExpectedDeprecated( 'wpmu_new_blog' );
+                        }
+
                         $b = self::factory()->blog->create();
                         switch_to_blog( $b );
@@ -989 +995 @@
         /**
          * @group bp_blogs_record_existing_blogs
-         * @expectedDeprecated wpmu_new_blog
          */
         public function test_bp_blogs_record_existing_blogs_limit() {
@@ -996 +1001 @@
                 }
 
+                if ( function_exists( 'wp_initialize_site' ) ) {
+                        $this->setExpectedDeprecated( 'wpmu_new_blog' );
+                }
+
                 $old_user = get_current_user_id();
 
@@ -1022 +1031 @@
         /**
          * @group bp_blogs_remove_blog
-         * @expectedDeprecated wpmu_new_blog
-         * @expectedDeprecated delete_blog
          */
         public function test_bp_blogs_remove_blog() {
                 if ( ! is_multisite() ) {
                         $this->markTestSkipped();
+                }
+
+                if ( function_exists( 'wp_initialize_site' ) ) {
+                        $this->setExpectedDeprecated( 'wpmu_new_blog' );
+                        $this->setExpectedDeprecated( 'delete_blog' );
                 }
 
@@ -1071 +1083 @@
         /**
          * @group bp_blogs_remove_blog_for_user
-         * @expectedDeprecated wpmu_new_blog
          */
         public function test_bp_blogs_remove_blog_for_user_is_contributor() {
                 if ( ! is_multisite() ) {
                         $this->markTestSkipped();
+                }
+
+                if ( function_exists( 'wp_initialize_site' ) ) {
+                        $this->setExpectedDeprecated( 'wpmu_new_blog' );
                 }