Changeset 27163 for trunk/tests/phpunit/tests/term/cache.php

Timestamp:

02/11/2014 04:49:11 PM (11 years ago)

Author:

wonderboymusic

Message:

Partially revert [27101], [27102], [27141], and [27142]. Those commits introduced new functions to sync up cache invalidation events. The current commit alters existing internals.

"The cache invalidation with static was introduced in r9102 with version 2.7. Multisite wasn't in core back then, so something like switch_to_blog() wasn't a concern, but now it breaks if you switch the blog in between calls to clean_term_cache."

This solution is simpler. All unit tests pass. Removes unnecessary tests linked to removed functions.

Props kovshenin.
Fixes #14485, #22526.

File:

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

trunk/tests/phpunit/tests/term/cache.php

@@ -33 +33 @@
      * @ticket 22526
      */
-    function test_get_taxonomy_last_changed() {
-        $last_changed = get_taxonomy_last_changed( 'category' );
-        $key = 'category_last_changed';
-        $last_changed_cache = wp_cache_get( $key, 'terms' );
-        $this->assertEquals( $last_changed, $last_changed_cache );
-        wp_cache_delete( $key, 'terms' );
-        $this->assertEquals( $last_changed, $last_changed_cache );
-        $last_changed = get_taxonomy_last_changed( 'category' );
-        $this->assertNotEquals( $last_changed, $last_changed_cache );
-
-        $last_changed2 = get_taxonomy_last_changed( 'category' );
-        $this->factory->category->create();
-        $last_changed3 = get_taxonomy_last_changed( 'category' );
-        $this->assertNotEquals( $last_changed2, $last_changed3 );
-    }
-
-    /**
-     * @ticket 22526
-     */
-    function test_set_taxonomy_last_changed() {
-        $last_changed1 = set_taxonomy_last_changed( 'category' );
-        $last_changed2 = set_taxonomy_last_changed( 'category' );
-        $this->assertNotEquals( $last_changed1, $last_changed2 );
-
-        $last_changed3 = set_taxonomy_last_changed( 'category' );
-        $last_changed4 = get_taxonomy_last_changed( 'category' );
-        $this->assertEquals( $last_changed3, $last_changed4 );
-    }
-
-    /**
-     * @ticket 22526
-     */
-    function test_post_taxonomy_is_fresh() {
-        $post_id = $this->factory->post->create();
-        $term_id = $this->factory->category->create( array( 'name' => 'Foo' ) );
-        wp_set_post_categories( $post_id, $term_id );
-
-        $this->assertFalse( post_taxonomy_is_fresh( $post_id, 'category' ) );
-        $this->assertTrue( post_taxonomy_is_fresh( $post_id, 'category' ) );
-        $this->assertTrue( post_taxonomy_is_fresh( $post_id, 'category' ) );
-
-        wp_update_term( $term_id, 'category', array( 'name' => 'Bar' ) );
-
-        $this->assertFalse( post_taxonomy_is_fresh( $post_id, 'category' ) );
-        get_the_category( $post_id );
-        $this->assertTrue( post_taxonomy_is_fresh( $post_id, 'category' ) );
-    }
-
-    /**
-     * @ticket 22526
-     */
     function test_category_name_change() {
         $term = $this->factory->category->create_and_get( array( 'name' => 'Foo' ) );
@@ -98 +47 @@
     }
 
+    /**
+     * @ticket 14485
+     */
     function test_hierachy_invalidation() {
         $tax = 'burrito';
@@ -127 +79 @@
             $terms = get_terms( $tax, array( 'hide_empty' => false ) );
             $this->assertEquals( $i, count( $terms ) );
-            if ( 1 < $i ) {
+            if ( $i > 1 ) {
                 $hierarchy = _get_term_hierarchy( $tax );
                 $this->assertNotEmpty( $hierarchy );