Changeset 53767 for trunk/tests/phpunit/tests/cache.php

Timestamp:

07/23/2022 02:56:51 PM (2 years ago)

Author:

SergeyBiryukov

Message:

Cache API: Make the placement of wp_cache_flush_group() more consistent.

Includes:

• Placing WP_Object_Cache::flush_group() next to ::flush().
• Placing wp_cache_supports_group_flush() next to wp_cache_flush_group().
• Placing the wp_cache_flush_group() unit test next to the ::flush() method test.
• Removing test name from assertion messages, as it is already mentioned directly above in case of failure.
• Adjusting function descriptions per the documentation standards.

Follow-up to [52706], [53763].

See #55647, #4476.

File:

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

trunk/tests/phpunit/tests/cache.php

@@ -128 +128 @@
         // If there is no value get returns false.
         $this->assertFalse( $this->cache->get( $key ) );
+    }
+
+    /**
+     * @ticket 4476
+     * @ticket 9773
+     *
+     * @covers ::wp_cache_flush_group
+     */
+    public function test_wp_cache_flush_group() {
+        $key = 'my-key';
+        $val = 'my-val';
+
+        wp_cache_set( $key, $val, 'group-test' );
+        wp_cache_set( $key, $val, 'group-kept' );
+
+        $this->assertSame( $val, wp_cache_get( $key, 'group-test' ), 'group-test should contain my-val' );
+
+        if ( wp_using_ext_object_cache() ) {
+            $this->setExpectedIncorrectUsage( 'wp_cache_flush_group' );
+        }
+
+        $results = wp_cache_flush_group( 'group-test' );
+
+        if ( wp_using_ext_object_cache() ) {
+            $this->assertFalse( $results );
+        } else {
+            $this->assertTrue( $results );
+            $this->assertFalse( wp_cache_get( $key, 'group-test' ), 'group-test should return false' );
+            $this->assertSame( $val, wp_cache_get( $key, 'group-kept' ), 'group-kept should still contain my-val' );
+        }
     }
 
@@ -416 +446 @@
         $this->assertSame( $expected, $found );
     }
-
-    /**
-     * @ticket 4476
-     * @ticket 9773
-     *
-     * test wp_cache_flush_group
-     *
-     * @covers ::wp_cache_flush_group
-     */
-    public function test_wp_cache_flush_group() {
-        $key = 'my-key';
-        $val = 'my-val';
-
-        wp_cache_set( $key, $val, 'group-test' );
-        wp_cache_set( $key, $val, 'group-kept' );
-
-        $this->assertSame( $val, wp_cache_get( $key, 'group-test' ), 'test_wp_cache_flush_group: group-test should contain my-val' );
-
-        if ( wp_using_ext_object_cache() ) {
-            $this->setExpectedIncorrectUsage( 'wp_cache_flush_group' );
-        }
-
-        $results = wp_cache_flush_group( 'group-test' );
-
-        if ( wp_using_ext_object_cache() ) {
-            $this->assertFalse( $results );
-        } else {
-            $this->assertTrue( $results );
-            $this->assertFalse( wp_cache_get( $key, 'group-test' ), 'test_wp_cache_flush_group: group-test should return false' );
-            $this->assertSame( $val, wp_cache_get( $key, 'group-kept' ), 'test_wp_cache_flush_group: group-kept should still contain my-val' );
-        }
-    }
 }