Changeset 1209 in tests

Timestamp:

02/11/2013 06:32:19 PM (12 years ago)

Author:

ryan

Message:

Update cache tests to reflect new last_changed value. See #WP23448

File:

• trunk/tests/term/getTerms.php (modified) (6 diffs)

trunk/tests/term/getTerms.php

@@ -20 +20 @@
         foreach ( $posts as $post )
             wp_set_object_terms( $post, rand_str(), 'post_tag' );
+        wp_cache_delete( 'last_changed', 'terms' );
 
         $this->assertFalse( wp_cache_get( 'last_changed', 'terms' ) );
 
         $num_queries = $wpdb->num_queries;
-        $last_changed = 1;
 
         // last_changed and num_queries should bump
         $terms = get_terms( 'post_tag' );
         $this->assertEquals( 15, count( $terms ) );
-        $this->assertEquals( 1, wp_cache_get( 'last_changed', 'terms' ) );
+        $this->assertNotEmpty( $time1 = wp_cache_get( 'last_changed', 'terms' ) );
         $this->assertEquals( $num_queries + 1, $wpdb->num_queries );
 
@@ -37 +37 @@
         $terms = get_terms( 'post_tag' );
         $this->assertEquals( 15, count( $terms ) );
-        $this->assertEquals( $last_changed, wp_cache_get( 'last_changed', 'terms' ) );
+        $this->assertEquals( $time1, wp_cache_get( 'last_changed', 'terms' ) );
         $this->assertEquals( $num_queries, $wpdb->num_queries );
 
@@ -46 +46 @@
         $terms = get_terms( 'post_tag', array( 'number' => 10 ) );
         $this->assertEquals( 10, count( $terms ) );
-        $this->assertEquals( $last_changed, wp_cache_get( 'last_changed', 'terms' ) );
+        $this->assertEquals( $time1, wp_cache_get( 'last_changed', 'terms' ) );
         $this->assertEquals( $num_queries + 1, $wpdb->num_queries );
 
@@ -54 +54 @@
         $terms = get_terms( 'post_tag', array( 'number' => 10 ) );
         $this->assertEquals( 10, count( $terms ) );
-        $this->assertEquals( $last_changed, wp_cache_get( 'last_changed', 'terms' ) );
+        $this->assertEquals( $time1, wp_cache_get( 'last_changed', 'terms' ) );
         $this->assertEquals( $num_queries, $wpdb->num_queries );
 
@@ -61 +61 @@
 
         $num_queries = $wpdb->num_queries;
-        // Bump by two because both wp_delete_term() and wp_update_term_count_now() call clean_term_cache().
-        $last_changed += 2;
+        $this->assertNotEquals( $time1, $time2 = wp_cache_get( 'last_changed', 'terms' ) );
 
         // last_changed and num_queries should bump after a term is deleted
         $terms = get_terms( 'post_tag' );
         $this->assertEquals( 14, count( $terms ) );
-        $this->assertEquals( $last_changed, wp_cache_get( 'last_changed', 'terms' ) );
+        $this->assertEquals( $time2, wp_cache_get( 'last_changed', 'terms' ) );
         $this->assertEquals( $num_queries + 1, $wpdb->num_queries );
 
@@ -75 +74 @@
         $terms = get_terms( 'post_tag' );
         $this->assertEquals( 14, count( $terms ) );
-        $this->assertEquals( $last_changed, wp_cache_get( 'last_changed', 'terms' ) );
+        $this->assertEquals( $time2, wp_cache_get( 'last_changed', 'terms' ) );
         $this->assertEquals( $num_queries, $wpdb->num_queries );