Changeset 12246 for trunk/tests/phpunit/testcases/blogs/activity.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/activity.php (modified) (6 diffs)

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

@@ -24 +24 @@
      * @group activity_action
      * @group bp_blogs_format_activity_action_new_blog
-     * @expectedDeprecated wpmu_new_blog
      */
     public function test_bp_blogs_format_activity_action_new_blog() {
         if ( ! is_multisite() ) {
             $this->markTestSkipped();
+        }
+
+        if ( function_exists( 'wp_initialize_site' ) ) {
+            $this->setExpectedDeprecated( 'wpmu_new_blog' );
         }
 
@@ -118 +121 @@
      * @group activity_action
      * @group bp_blogs_format_activity_action_new_blog_post
-     * @expectedDeprecated wpmu_new_blog
      */
     public function test_bp_blogs_format_activity_action_new_blog_post_ms_nonrootblog() {
         if ( ! is_multisite() ) {
             $this->markTestSkipped();
+        }
+
+        if ( function_exists( 'wp_initialize_site' ) ) {
+            $this->setExpectedDeprecated( 'wpmu_new_blog' );
         }
 
@@ -160 +166 @@
      * @group bp_blogs_format_activity_action_new_blog_comment
      * @group post_type_comment_activities
-     * @expectedDeprecated wpmu_new_blog
      */
     public function test_bp_blogs_format_activity_action_new_blog_comment_ms_nonrootblog() {
         if ( ! is_multisite() ) {
             $this->markTestSkipped();
+        }
+
+        if ( function_exists( 'wp_initialize_site' ) ) {
+            $this->setExpectedDeprecated( 'wpmu_new_blog' );
         }
 
@@ -204 +213 @@
     /**
      * @group bp_blogs_format_activity_action_new_blog
-     * @expectedDeprecated wpmu_new_blog
      */
     public function test_bp_activity_format_activity_action_new_blog_backpat() {
         if ( ! is_multisite() ) {
             $this->markTestSkipped();
+        }
+
+        if ( function_exists( 'wp_initialize_site' ) ) {
+            $this->setExpectedDeprecated( 'wpmu_new_blog' );
         }
 
@@ -233 +245 @@
     /**
      * @group bp_blogs_format_activity_action_new_blog_post
-     * @expectedDeprecated wpmu_new_blog
      */
     public function test_bp_activity_format_activity_action_new_blog_post_backpat() {
         if ( ! is_multisite() ) {
             $this->markTestSkipped();
+        }
+
+        if ( function_exists( 'wp_initialize_site' ) ) {
+            $this->setExpectedDeprecated( 'wpmu_new_blog' );
         }
 
@@ -262 +277 @@
     /**
      * @group bp_blogs_format_activity_action_new_blog_comment
-     * @expectedDeprecated wpmu_new_blog
      */
     public function test_bp_activity_format_activity_action_new_blog_comment_backpat() {
         if ( ! is_multisite() ) {
             $this->markTestSkipped();
+        }
+
+        if ( function_exists( 'wp_initialize_site' ) ) {
+            $this->setExpectedDeprecated( 'wpmu_new_blog' );
         }