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

Timestamp:

10/05/2018 05:24:17 PM (6 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/activity/functions.php (modified) (3 diffs)

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

@@ -805 +805 @@
      * @group bp_activity_format_activity_action_custom_post_type_post_ms
      * @group activity_tracking
-     * @expectedDeprecated wpmu_new_blog
      */
     public function test_bp_activity_format_activity_action_custom_post_type_post_ms() {
         if ( ! is_multisite() ) {
             $this->markTestSkipped();
+        }
+
+        if ( function_exists( 'wp_initialize_site' ) ) {
+            $this->setExpectedDeprecated( 'wpmu_new_blog' );
         }
 
@@ -918 +921 @@
      * @group bp_activity_format_activity_action_custom_post_type_post_ms
      * @group activity_tracking
-     * @expectedDeprecated wpmu_new_blog
      */
     public function test_bp_activity_format_activity_action_custom_string_post_type_post_ms() {
         if ( ! is_multisite() ) {
             $this->markTestSkipped();
+        }
+
+        if ( function_exists( 'wp_initialize_site' ) ) {
+            $this->setExpectedDeprecated( 'wpmu_new_blog' );
         }
 
@@ -1056 +1062 @@
     public function test_bp_activity_format_activity_action_custom_post_type_comment() {
         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 );