Changeset 41719 for trunk/tests/phpunit/tests/multisite/site.php

Timestamp:

10/03/2017 07:40:01 PM (8 years ago)

Author:

flixos90

Message:

Multisite: Improve get_blog_details() by using get_site_by().

get_site_by() is now the preferred way to retrieve a site object by lookup for identifying data. By using a coherent structure and get_sites() internally, it has several advantages over the direct database queries and complex code in get_blog_details(). Therefore get_blog_details() is now a wrapper for get_site_by(), providing backward compatibility fixes where necessary.

Unit tests have been adjusted to account for the blog-details and blog-lookup cache groups, which are no longer needed.

Props spacedmonkey, jeremyfelt, flixos90.
Fixes #40228.

File:

• trunk/tests/phpunit/tests/multisite/site.php (modified) (6 diffs)

trunk/tests/phpunit/tests/multisite/site.php

@@ -119 +119 @@
         $details = get_blog_details( $blog_id, false );
 
-        // Combine domain and path for a site specific cache key.
-        $key = md5( $details->domain . $details->path );
-
-        $this->assertEquals( $details, wp_cache_get( $blog_id . 'short', 'blog-details' ) );
+        $cached_details = wp_cache_get( $blog_id, 'sites' );
+        $this->assertNotFalse( $cached_details );
+        $this->assertEqualSets( get_object_vars( $details ), get_object_vars( $cached_details ) );
 
         // get_blogaddress_by_name()
         $this->assertEquals( 'http://' . $details->domain . $details->path, get_blogaddress_by_name( trim( $details->path, '/' ) ) );
 
-        // These are empty until get_blog_details() is called with $get_all = true
-        $this->assertEquals( false, wp_cache_get( $blog_id, 'blog-details' ) );
-        $this->assertEquals( false, wp_cache_get( $key, 'blog-lookup' ) );
+        // This is empty until get_blog_details() is called with $get_all = true
+        $this->assertEquals( false, wp_cache_get( $blog_id, 'site-details' ) );
 
         // $get_all = true, populate the full blog-details cache and the blog slug lookup cache
         $details = get_blog_details( $blog_id, true );
-        $this->assertEquals( $details, wp_cache_get( $blog_id, 'blog-details' ) );
-        $this->assertEquals( $details, wp_cache_get( $key, 'blog-lookup' ) );
+        $cached_details = wp_cache_get( $blog_id, 'site-details' );
+        $this->assertNotFalse( $cached_details );
+        $this->assertEqualSets( get_object_vars( $details ), get_object_vars( $cached_details ) );
 
         // Check existence of each database table for the created site.
@@ -197 +196 @@
         wpmu_delete_blog( $blog_id, false );
 
-        $this->assertEquals( false, wp_cache_get( $blog_id, 'blog-details' ) );
-        $this->assertEquals( false, wp_cache_get( $blog_id . 'short', 'blog-details' ) );
-        $this->assertEquals( false, wp_cache_get( $key, 'blog-lookup' ) );
+        $this->assertEquals( false, wp_cache_get( $blog_id, 'sites' ) );
+        $this->assertEquals( false, wp_cache_get( $blog_id, 'site-details' ) );
         $this->assertEquals( false, wp_cache_get( $key, 'blog-id-cache' ) );
     }
@@ -235 +233 @@
         wpmu_delete_blog( $blog_id, true );
 
-        $this->assertEquals( false, wp_cache_get( $blog_id, 'blog-details' ) );
-        $this->assertEquals( false, wp_cache_get( $blog_id . 'short', 'blog-details' ) );
-        $this->assertEquals( false, wp_cache_get( $key, 'blog-lookup' ) );
+        $this->assertEquals( false, wp_cache_get( $blog_id, 'sites' ) );
+        $this->assertEquals( false, wp_cache_get( $blog_id, 'site-details' ) );
         $this->assertEquals( false, wp_cache_get( $key, 'blog-id-cache' ) );
     }
@@ -273 +270 @@
         wpmu_delete_blog( $blog_id, true );
 
-        $this->assertEquals( false, wp_cache_get( $blog_id, 'blog-details' ) );
-        $this->assertEquals( false, wp_cache_get( $blog_id . 'short', 'blog-details' ) );
-        $this->assertEquals( false, wp_cache_get( $key, 'blog-lookup' ) );
+        $this->assertEquals( false, wp_cache_get( $blog_id, 'sites' ) );
+        $this->assertEquals( false, wp_cache_get( $blog_id, 'site-details' ) );
         $this->assertEquals( false, wp_cache_get( $key, 'blog-id-cache' ) );
     }
@@ -391 +387 @@
         get_blog_details( $blog_id );
 
-        // When the cache is primed with an invalid site, the value is set to -1.
-        $this->assertEquals( -1, wp_cache_get( $blog_id, 'blog-details' ) );
+        // When the cache is primed with an invalid site, the value is not set.
+        $this->assertFalse( wp_cache_get( $blog_id, 'site-details' ) );
 
         // Create a site in the invalid site's place.
@@ -398 +394 @@
 
         // When a new site is created, its cache is cleared through refresh_blog_details.
-        $this->assertFalse( wp_cache_get( $blog_id, 'blog-details' )  );
+        $this->assertFalse( wp_cache_get( $blog_id, 'site-details' )  );
 
         $blog = get_blog_details( $blog_id );
 
         // When the cache is refreshed, it should now equal the site data.
-        $this->assertEquals( $blog, wp_cache_get( $blog_id, 'blog-details' ) );
+        $cached_blog = wp_cache_get( $blog_id, 'site-details' );
+        $this->assertNotFalse( $cached_blog );
+        $this->assertEqualSets( get_object_vars( $blog ), get_object_vars( $cached_blog ) );
     }