Changeset 37233 for trunk/tests/phpunit/tests/multisite/network.php

Timestamp:

04/18/2016 01:28:56 AM (9 years ago)

Author:

jeremyfelt

Message:

Tests: Improve get_blog_count() tests

• Use wp_update_network_counts() to update the database with the most current data before testing.
• Use wp_update_network_counts() to update the database with the most current data after deleting the sites created during the test.
• Create only 1 extra site in each test rather than 4. This shaves several seconds off the test time.
• Stop testing for an extra count now that we update the network counts properly. Previously we looked at $site_count_start + 9 rather than 8. Now this is + 1, which aligns with the actual number of sites created.
• Test 3 explicit conditions - default, filter applied as true, and filter applied as false.
• Reset data before testing assertion to avoid a suspended state.

See #36566.

File:

• trunk/tests/phpunit/tests/multisite/network.php (modified) (1 diff)

trunk/tests/phpunit/tests/multisite/network.php

@@ -87 +87 @@
      * @ticket 22917
      */
-    function test_enable_live_network_site_counts_filter() {
+    public function test_get_blog_count_no_filter_applied() {
+        wp_update_network_counts();
         $site_count_start = get_blog_count();
-        // false for large networks by default
-        add_filter( 'enable_live_network_counts', '__return_false' );
-        self::factory()->blog->create_many( 4 );
-
-        // count only updated when cron runs, so unchanged
-        $this->assertEquals( $site_count_start, (int) get_blog_count() );
-
-        add_filter( 'enable_live_network_counts', '__return_true' );
-        $site_ids = self::factory()->blog->create_many( 4 );
-
-        $this->assertEquals( $site_count_start + 9, (int) get_blog_count() );
-
-        //clean up
-        remove_filter( 'enable_live_network_counts', '__return_false' );
-        remove_filter( 'enable_live_network_counts', '__return_true' );
+
+        $site_ids = self::factory()->blog->create_many( 1 );
+        $actual = (int) get_blog_count(); // count only updated when cron runs, so unchanged
+
         foreach ( $site_ids as $site_id ) {
             wpmu_delete_blog( $site_id, true );
         }
-    }
+        wp_update_network_counts();
+
+        $this->assertEquals( $site_count_start + 1, $actual );
+    }
+
+    /**
+     * @ticket 22917
+     */
+    public function test_get_blog_count_enable_live_network_counts_false() {
+        wp_update_network_counts();
+        $site_count_start = get_blog_count();
+
+        add_filter( 'enable_live_network_counts', '__return_false' );
+        $site_ids = self::factory()->blog->create_many( 1 );
+        $actual = (int) get_blog_count(); // count only updated when cron runs, so unchanged
+        remove_filter( 'enable_live_network_counts', '__return_false' );
+
+        foreach ( $site_ids as $site_id ) {
+            wpmu_delete_blog( $site_id, true );
+        }
+        wp_update_network_counts();
+
+        $this->assertEquals( $site_count_start, $actual );
+    }
+
+    /**
+     * @ticket 22917
+     */
+    public function test_get_blog_count_enabled_live_network_counts_true() {
+        wp_update_network_counts();
+        $site_count_start = get_blog_count();
+
+        add_filter( 'enable_live_network_counts', '__return_true' );
+        $site_ids = self::factory()->blog->create_many( 1 );
+        $actual = get_blog_count();
+        remove_filter( 'enable_live_network_counts', '__return_true' );
+
+        foreach ( $site_ids as $site_id ) {
+            wpmu_delete_blog( $site_id, true );
+        }
+        wp_update_network_counts();
+
+        $this->assertEquals( $site_count_start + 1, $actual );
+    }
+
     /**
      * @ticket 22917