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

Timestamp:

04/03/2017 11:13:40 PM (8 years ago)

Author:

flixos90

Message:

Multisite: Support the $network_id parameter of get_blog_count().

The get_blog_count() function used to support an $id parameter for the network ID prior to WordPress 3.1. This parameter has not been used since the introduction of get_site_option() and was later deprecated in [25113]. With get_network_option() however it is possible to support the parameter again, now properly renamed as $network_id.

A unit test has for the parameter has been added as well. Another unit test in the same class was adjusted to work properly with multiple networks existing.

Fixes #37865.

File:

• trunk/tests/phpunit/tests/multisite/network.php (modified) (4 diffs)

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

@@ -13 +13 @@
     protected $suppress = false;
 
+    protected static $different_network_id;
+    protected static $different_site_ids = array();
+
     function setUp() {
         global $wpdb;
@@ -26 +29 @@
     }
 
+    public static function wpSetUpBeforeClass( $factory ) {
+        self::$different_network_id = $factory->network->create( array( 'domain' => 'wordpress.org', 'path' => '/' ) );
+
+        $sites = array(
+            array( 'domain' => 'wordpress.org', 'path' => '/',     'site_id' => self::$different_network_id ),
+            array( 'domain' => 'wordpress.org', 'path' => '/foo/', 'site_id' => self::$different_network_id ),
+            array( 'domain' => 'wordpress.org', 'path' => '/bar/', 'site_id' => self::$different_network_id ),
+        );
+
+        foreach ( $sites as $site ) {
+            self::$different_site_ids[] = $factory->blog->create( $site );
+        }
+    }
+
+    public static function wpTearDownAfterClass() {
+        global $wpdb;
+
+        foreach( self::$different_site_ids as $id ) {
+            wpmu_delete_blog( $id, true );
+        }
+
+        $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->sitemeta} WHERE site_id = %d", self::$different_network_id ) );
+        $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->site} WHERE id= %d", self::$different_network_id ) );
+
+        wp_update_network_site_counts();
+    }
+
     /**
      * By default, only one network exists and has a network ID of 1.
@@ -67 +97 @@
         global $wpdb, $current_site;
 
-        $id = self::factory()->network->create();
-        $temp_id = $id + 1;
-
-        $current_site->id = (int) $id;
+        $temp_id = self::$different_network_id + 1;
+
+        $current_site->id = (int) self::$different_network_id;
         $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->site} SET id=%d WHERE id=1", $temp_id ) );
         $main_network_id = get_main_network_id();
         $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->site} SET id=1 WHERE id=%d", $temp_id ) );
 
-        $this->assertEquals( $id, $main_network_id );
+        $this->assertEquals( self::$different_network_id, $main_network_id );
     }
 
@@ -158 +187 @@
 
     /**
+     * @ticket 37865
+     */
+    public function test_get_blog_count_on_different_network() {
+        global $current_site, $wpdb;
+
+        // switch_to_network()...
+        $orig_network_id = $current_site->id;
+        $orig_wpdb_network_id = $wpdb->siteid;
+        $current_site->id = self::$different_network_id;
+        $wpdb->siteid = self::$different_network_id;
+        wp_update_network_site_counts();
+        $current_site->id = $orig_network_id;
+        $wpdb->siteid = $orig_wpdb_network_id;
+
+        $site_count = get_blog_count( self::$different_network_id );
+
+        $this->assertSame( count( self::$different_site_ids ), $site_count );
+    }
+
+    /**
      * @ticket 22917
      */