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

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

@@ -8 +8 @@
     /**
      * @group bp_blogs_update_meta_cache
-     * @expectedDeprecated wpmu_new_blog
      */
     public function test_bp_blogs_update_meta_cache() {
         if ( ! is_multisite() ) {
             $this->markTestSkipped();
+        }
+
+        if ( function_exists( 'wp_initialize_site' ) ) {
+            $this->setExpectedDeprecated( 'wpmu_new_blog' );
         }
 
@@ -90 +93 @@
      * @group bp_blogs_update_meta_cache
      * @group bp_has_blogs
-     * @expectedDeprecated wpmu_new_blog
      */
     public function test_bp_blogs_update_meta_cache_bp_has_blogs() {
         if ( ! is_multisite() ) {
             $this->markTestSkipped();
+        }
+
+        if ( function_exists( 'wp_initialize_site' ) ) {
+            $this->setExpectedDeprecated( 'wpmu_new_blog' );
         }
 
@@ -185 +191 @@
      * @group bp_blogs_update_meta_cache
      * @group bp_has_blogs
-     * @expectedDeprecated wpmu_new_blog
      */
     public function test_bp_blogs_update_meta_cache_bp_has_blogs_false() {
         if ( ! is_multisite() ) {
             $this->markTestSkipped();
+        }
+
+        if ( function_exists( 'wp_initialize_site' ) ) {
+            $this->setExpectedDeprecated( 'wpmu_new_blog' );
         }
 
@@ -261 +270 @@
     /**
      * @group bp_blogs_total_blogs
-     * @expectedDeprecated wpmu_new_blog
      * @expectedDeprecated delete_blog
      */
@@ -267 +275 @@
         if ( ! is_multisite() ) {
             $this->markTestSkipped();
+        }
+
+        if ( function_exists( 'wp_initialize_site' ) ) {
+            $this->setExpectedDeprecated( 'wpmu_new_blog' );
+            $this->setExpectedDeprecated( 'delete_blog' );
         }
 
@@ -297 +310 @@
     /**
      * @group update_blog_details
-     * @expectedDeprecated wpmu_new_blog
      */
     public function test_update_blog_details_should_purge_blogmeta_cache() {
         if ( ! is_multisite() ) {
             $this->markTestSkipped();
+        }
+
+        if ( function_exists( 'wp_initialize_site' ) ) {
+            $this->setExpectedDeprecated( 'wpmu_new_blog' );
         }