Changeset 30113

Timestamp:

10/30/2014 04:15:03 AM (12 years ago)

Author:

boonebgorges

Message:

Streamline some get_terms() cache tests.

• Split large method into a number of smaller tests.
• Create fewer fixtures.

See #30017.

File:

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

trunk/tests/phpunit/tests/term/getTerms.php

@@ -15 +15 @@
          * @ticket 23326
          */
-        function test_get_terms_cache() {
+        public function test_get_terms_cache() {
                 global $wpdb;
 
-                $posts = $this->factory->post->create_many( 15, array( 'post_type' => 'post' ) );
-                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' ) );
+                $this->set_up_three_posts_and_tags();
 
                 $num_queries = $wpdb->num_queries;
@@ -29 +24 @@
                 // last_changed and num_queries should bump
                 $terms = get_terms( 'post_tag' );
-                $this->assertEquals( 15, count( $terms ) );
+                $this->assertEquals( 3, count( $terms ) );
                 $time1 = wp_cache_get( 'last_changed', 'terms' );
                 $this->assertNotEmpty( $time1 );
@@ -38 +33 @@
                 // Again. last_changed and num_queries should remain the same.
                 $terms = get_terms( 'post_tag' );
-                $this->assertEquals( 15, count( $terms ) );
+                $this->assertEquals( 3, count( $terms ) );
                 $this->assertEquals( $time1, wp_cache_get( 'last_changed', 'terms' ) );
                 $this->assertEquals( $num_queries, $wpdb->num_queries );
-
+        }
+
+        /**
+         * @ticket 23326
+         */
+        public function test_get_terms_cache_should_be_missed_when_passing_number() {
+                global $wpdb;
+
+                $this->set_up_three_posts_and_tags();
+
+                // Prime cache
+                $terms = get_terms( 'post_tag' );
+                $time1 = wp_cache_get( 'last_changed', 'terms' );
                 $num_queries = $wpdb->num_queries;
 
-
-                // Different query. num_queries should bump, last_changed should remain the same.
-                $terms = get_terms( 'post_tag', array( 'number' => 10 ) );
-                $this->assertEquals( 10, count( $terms ) );
+                // num_queries should bump, last_changed should remain the same.
+                $terms = get_terms( 'post_tag', array( 'number' => 2 ) );
+                $this->assertEquals( 2, count( $terms ) );
                 $this->assertEquals( $time1, wp_cache_get( 'last_changed', 'terms' ) );
                 $this->assertEquals( $num_queries + 1, $wpdb->num_queries );
@@ -54 +60 @@
 
                 // Again. last_changed and num_queries should remain the same.
-                $terms = get_terms( 'post_tag', array( 'number' => 10 ) );
-                $this->assertEquals( 10, count( $terms ) );
+                $terms = get_terms( 'post_tag', array( 'number' => 2 ) );
+                $this->assertEquals( 2, count( $terms ) );
                 $this->assertEquals( $time1, wp_cache_get( 'last_changed', 'terms' ) );
                 $this->assertEquals( $num_queries, $wpdb->num_queries );
-
-                // Force last_changed to bump
+        }
+
+        /**
+         * @ticket 23326
+         */
+        public function test_wp_delete_term_should_invalidate_cache() {
+                global $wpdb;
+
+                $this->set_up_three_posts_and_tags();
+
+                // Prime cache
+                $terms = get_terms( 'post_tag' );
+                $time1 = wp_cache_get( 'last_changed', 'terms' );
+                $num_queries = $wpdb->num_queries;
+
+                // Force last_changed to bump.
                 wp_delete_term( $terms[0]->term_id, 'post_tag' );
 
@@ -65 +85 @@
                 $this->assertNotEquals( $time1, $time2 = wp_cache_get( 'last_changed', 'terms' ) );
 
-                // last_changed and num_queries should bump after a term is deleted
+                // last_changed and num_queries should bump after a term is deleted.
                 $terms = get_terms( 'post_tag' );
-                $this->assertEquals( 14, count( $terms ) );
+                $this->assertEquals( 2, count( $terms ) );
                 $this->assertEquals( $time2, wp_cache_get( 'last_changed', 'terms' ) );
                 $this->assertEquals( $num_queries + 1, $wpdb->num_queries );
@@ -75 +95 @@
                 // Again. last_changed and num_queries should remain the same.
                 $terms = get_terms( 'post_tag' );
-                $this->assertEquals( 14, count( $terms ) );
+                $this->assertEquals( 2, count( $terms ) );
                 $this->assertEquals( $time2, wp_cache_get( 'last_changed', 'terms' ) );
                 $this->assertEquals( $num_queries, $wpdb->num_queries );
@@ -1053 +1073 @@
                 );
         }
+
+        protected function set_up_three_posts_and_tags() {
+                $posts = $this->factory->post->create_many( 3, array( 'post_type' => 'post' ) );
+                foreach ( $posts as $post ) {
+                        wp_set_object_terms( $post, rand_str(), 'post_tag' );
+                }
+
+                wp_cache_delete( 'last_changed', 'terms' );
+        }
 }