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

trunk/tests/phpunit/testcases/blogs/class-bp-blogs-blog.php

@@ -6 +6 @@
  */
 class BP_Tests_BP_Blogs_Blog_TestCases extends BP_UnitTestCase {
-    /**
-     * @expectedDeprecated wpmu_new_blog
-     */
     public function test_get_with_search_terms() {
         if ( ! is_multisite() ) {
             $this->markTestSkipped();
+        }
+
+        if ( function_exists( 'wp_initialize_site' ) ) {
+            $this->setExpectedDeprecated( 'wpmu_new_blog' );
         }
 
@@ -35 +36 @@
     /**
      * @ticket BP5858
-     * @expectedDeprecated wpmu_new_blog
      */
     public function test_get_with_search_terms_should_match_description() {
         if ( ! is_multisite() ) {
             $this->markTestSkipped();
+        }
+
+        if ( function_exists( 'wp_initialize_site' ) ) {
+            $this->setExpectedDeprecated( 'wpmu_new_blog' );
         }
 
@@ -64 +68 @@
     }
 
-    /**
-     * @expectedDeprecated wpmu_new_blog
-     */
     public function test_search_blogs() {
         if ( ! is_multisite() ) {
             $this->markTestSkipped();
+        }
+
+        if ( function_exists( 'wp_initialize_site' ) ) {
+            $this->setExpectedDeprecated( 'wpmu_new_blog' );
         }
 
@@ -94 +99 @@
     /**
      * @group get_by_letter
-     * @expectedDeprecated wpmu_new_blog
      */
     public function test_get_by_letter() {
@@ -100 +104 @@
             $this->markTestSkipped();
             return;
+        }
+
+        if ( function_exists( 'wp_initialize_site' ) ) {
+            $this->setExpectedDeprecated( 'wpmu_new_blog' );
         }
 
@@ -124 +132 @@
     /**
      * @group get_order_by
-     * @expectedDeprecated wpmu_new_blog
      */
     public function test_get_order_by() {
         if ( ! is_multisite() ) {
             $this->markTestSkipped();
+        }
+
+        if ( function_exists( 'wp_initialize_site' ) ) {
+            $this->setExpectedDeprecated( 'wpmu_new_blog' );
         }