Ticket #35075: 35075.test.2.patch

tests/phpunit/tests/comment/query.php

@@ -1659 +1659 @@
 
         /**
          * @ticket 22400
+         * @ticket 35075
          */
-        public function test_comment_cache_key_should_ignore_custom_params() {
+        public function test_comment_cache_key_should_not_ignore_custom_query_vars() {
                 global $wpdb;
 
                 $p = self::factory()->post->create();
                 $c = self::factory()->comment->create( array( 'comment_post_ID' => $p ) );
 
+                $start_num = $wpdb->num_queries;
+
                 $q1 = new WP_Comment_Query();
                 $q1->query( array(
                         'post_id' => $p,
                         'fields' => 'ids',
                 ) );
 
-                $num_queries = $wpdb->num_queries;
+                $pre_cache_num = $wpdb->num_queries;
 
                 $q2 = new WP_Comment_Query();
                 $q2->query( array(
@@ -1681 +1684 @@
                         'foo' => 'bar',
                 ) );
 
-                $this->assertSame( $num_queries, $wpdb->num_queries );
+                $this->assertNotEquals( $start_num, $pre_cache_num );
+                $this->assertNotEquals( $pre_cache_num, $wpdb->num_queries );
         }
 
         /**

tests/phpunit/tests/post/getPages.php

@@ -334 +334 @@
 
         }
 
+        /**
+         * @ticket 35075
+         */
+        public function test_comment_cache_key_should_not_ignore_custom_query_vars() {
+                global $wpdb;
+
+                $page_id = self::factory()->post->create( array('post_type' => 'page') );
+
+                $start_num = $wpdb->num_queries;
+
+                $p1 = get_pages(array(
+                        'include' => $page_id
+                ));
+
+                $pre_cache_num = $wpdb->num_queries;
+
+                $p1 = get_pages(array(
+                        'include' => $page_id,
+                        'foo'     => 'bar'
+                ));
+
+                $this->assertNotEquals( $start_num, $pre_cache_num );
+                $this->assertNotEquals( $pre_cache_num, $wpdb->num_queries );
+        }
+
         function test_wp_list_pages_classes() {
                 $type = 'taco';
                 register_post_type( $type, array( 'hierarchical' => true, 'public' => true ) );

tests/phpunit/tests/term/getTerms.php

@@ -1665 +1665 @@
 
         }
 
+        /**
+         * @ticket 35075
+         */
+        public function test_comment_cache_key_should_not_ignore_custom_query_vars() {
+                global $wpdb;
+
+                $term_id = self::factory()->term->create( array( 'taxonomy' => 'category' ) );
+
+                $start_num = $wpdb->num_queries;
+
+                $t1 = get_terms('category', array(
+                        'include' => $term_id,
+                        'fields'  => 'ids'
+                ));
+
+                $pre_cache_num = $wpdb->num_queries;
+
+                $t2 = get_terms('category', array(
+                        'include' => $term_id,
+                        'fields'  => 'ids',
+                        'foo'     => 'bar'
+                ));
+
+                $this->assertNotEquals( $start_num, $pre_cache_num );
+                $this->assertNotEquals( $pre_cache_num, $wpdb->num_queries );
+        }
+
         protected function create_hierarchical_terms_and_posts() {
                 $terms = array();