Changeset 8040

Timestamp:

03/05/2014 02:27:27 AM (11 years ago)

Author:

boonebgorges

Message:

More generous tests for blog meta cache

The current test assumes we know exhaustively what the blog meta keys will be.
The new technique only checks to make sure that our whitelist is present in the
cache, which is all we really need to check to verify that the cache priming
is working.

File:

• trunk/tests/testcases/blogs/cache.php (modified) (2 diffs)

trunk/tests/testcases/blogs/cache.php

@@ -73 +73 @@
         );
 
-        $this->assertSame( $b1_expected, wp_cache_get( $b1, 'blog_meta' ) );
-        $this->assertSame( $b2_expected, wp_cache_get( $b2, 'blog_meta' ) );
+        // The cache may contain more than just this, so loop through
+        // and check only relevant keys
+        $b1_found = wp_cache_get( $b1, 'blog_meta' );
+        foreach ( $b1_expected as $k => $v ) {
+            $this->assertSame( $v, $b1_found[ $k ] );
+        }
+
+        $b2_found = wp_cache_get( $b2, 'blog_meta' );
+        foreach ( $b2_expected as $k => $v ) {
+            $this->assertSame( $v, $b2_found[ $k ] );
+        }
     }
 
@@ -156 +165 @@
         );
 
-        $this->assertSame( $b1_expected, wp_cache_get( $b1, 'blog_meta' ) );
-        $this->assertSame( $b2_expected, wp_cache_get( $b2, 'blog_meta' ) );
+        // The cache may contain more than just this, so loop through
+        // and check only relevant keys
+        $b1_found = wp_cache_get( $b1, 'blog_meta' );
+        foreach ( $b1_expected as $k => $v ) {
+            $this->assertSame( $v, $b1_found[ $k ] );
+        }
+
+        $b2_found = wp_cache_get( $b2, 'blog_meta' );
+        foreach ( $b2_expected as $k => $v ) {
+            $this->assertSame( $v, $b2_found[ $k ] );
+        }
 
         $this->set_current_user( $old_user );