Changeset 9336 for trunk/tests/phpunit/testcases/xprofile/class-bp-xprofile-profiledata.php

Timestamp:

01/09/2015 08:38:37 PM (10 years ago)

Author:

johnjamesjacoby

Message:

XProfile data cache group updates:

• Switches from dynamic cache group to unique key for $user_id:$field_id.
• Introduces bp_xprofile_get_non_cached_field_ids() as a helper, based on bp_get_non_cached_field_ids().
• Registers bp_xprofile and bp_xprofile_data as global cache groups.
• Updates unit tests to pass with new cache keys.

Props r-a-y. Fixes #6100. See #5733.

File:

• trunk/tests/phpunit/testcases/xprofile/class-bp-xprofile-profiledata.php (modified) (11 diffs)

trunk/tests/phpunit/testcases/xprofile/class-bp-xprofile-profiledata.php

@@ -37 +37 @@
         $d = new BP_XProfile_ProfileData( $f, $u );
 
-        wp_cache_delete( $f, 'bp_xprofile_data_' . $u );
+        wp_cache_delete( "{$u}:{$f}", 'bp_xprofile_data' );
 
         $this->assertTrue( $d->exists() );
@@ -57 +57 @@
         $c = new stdClass;
         $c->id = 3;
-        wp_cache_set( $f, $c, 'bp_xprofile_data_' . $u );
+        wp_cache_set( "{$u}:{$f}", $c, 'bp_xprofile_data' );
 
         $this->assertTrue( $d->exists() );
@@ -74 +74 @@
 
         // Just to be sure
-        wp_cache_delete( $f, 'bp_xprofile_data_' . $u );
+        wp_cache_delete( "{$u}:{$f}", 'bp_xprofile_data' );
 
         $this->assertEquals( 0, BP_XProfile_ProfileData::get_fielddataid_byid( $f, $u ) );
@@ -97 +97 @@
 
         // Ensure it's deleted from cache
-        wp_cache_delete( $f, 'bp_xprofile_data_' . $u );
+        wp_cache_delete( "{$u}:{$f}", 'bp_xprofile_data' );
 
         $this->assertEquals( $d->id, BP_XProfile_ProfileData::get_fielddataid_byid( $f, $u ) );
@@ -116 +116 @@
         $d = new stdClass;
         $d->id = 5;
-        wp_cache_set( $f, $d, 'bp_xprofile_data_' . $u );
+        wp_cache_set( "{$u}:{$f}", $d, 'bp_xprofile_data' );
 
         $this->assertSame( 5, BP_XProfile_ProfileData::get_fielddataid_byid( $f, $u ) );
@@ -139 +139 @@
 
         // Ensure it's deleted from cache
-        wp_cache_delete( $f, 'bp_xprofile_data_' . $u );
+        wp_cache_delete( "{$u}:{$f}", 'bp_xprofile_data' );
 
         $this->assertSame( 'foo', BP_XProfile_ProfileData::get_value_byid( $f, $u ) );
@@ -180 +180 @@
 
         // Ensure it's deleted from cache
-        wp_cache_delete( $f, 'bp_xprofile_data_' . $u1 );
-        wp_cache_delete( $f, 'bp_xprofile_data_' . $u2 );
+        wp_cache_delete( "{$u1}:{$f}", 'bp_xprofile_data' );
+        wp_cache_delete( "{$u2}:{$f}", 'bp_xprofile_data' );
 
         $eu1 = new stdClass;
@@ -219 +219 @@
         $d->value = 'foo';
         $d->field_id = $f;
-        wp_cache_set( $f, $d, 'bp_xprofile_data_' . $u );
+        wp_cache_set( "{$u}:{$f}", $d, 'bp_xprofile_data' );
 
         $this->assertSame( 'foo', BP_XProfile_ProfileData::get_value_byid( $f, $u ) );
@@ -253 +253 @@
         $d2->last_updated = $time;
 
-        wp_cache_set( $f, $d1, 'bp_xprofile_data_' . $u1 );
-        wp_cache_set( $f, $d2, 'bp_xprofile_data_' . $u2 );
+        wp_cache_set( "{$u1}:{$f}", $d1, 'bp_xprofile_data' );
+        wp_cache_set( "{$u2}:{$f}", $d2, 'bp_xprofile_data' );
 
         $eu1 = new stdClass;
@@ -314 +314 @@
 
         // Ensure it's deleted from cache
-        wp_cache_delete( $f1, 'bp_xprofile_data_' . $u );
-        wp_cache_delete( $f2, 'bp_xprofile_data_' . $u );
+        wp_cache_delete( "{$u}:{$f1}", 'bp_xprofile_data' );
+        wp_cache_delete( "{$u}:{$f2}", 'bp_xprofile_data' );
 
         $u_obj = new WP_User( $u );
@@ -390 +390 @@
         $d2->id = 2;
 
-        wp_cache_set( $f1, $d1, 'bp_xprofile_data_' . $u );
-        wp_cache_set( $f2, $d2, 'bp_xprofile_data_' . $u );
+        wp_cache_set( "{$u}:{$f1}", $d1, 'bp_xprofile_data' );
+        wp_cache_set( "{$u}:{$f2}", $d2, 'bp_xprofile_data' );
 
         $u_obj = new WP_User( $u );