Changeset 26187

Timestamp:

11/15/2013 02:32:16 AM (13 years ago)

Author:

wonderboymusic

Message:

Remove the Featured Content term filters when running Unit Tests. Set the return value of wp_get_object_terms() to a var before passing to array_shift() in test_get_object_terms_types(), which expects a var to be passed by reference.

See #25282.

Location:

trunk/tests/phpunit

Files:

• includes/utils.php (modified) (1 diff)
• tests/term.php (modified) (2 diffs)
• tests/term/getTerms.php (modified) (2 diffs)

trunk/tests/phpunit/includes/utils.php

@@ -383 +383 @@
         }
 }
+
+function _clean_term_filters() {
+        remove_filter( 'get_terms',     array( 'Featured_Content', 'hide_featured_term'     ), 10, 2 );
+        remove_filter( 'get_the_terms', array( 'Featured_Content', 'hide_the_featured_term' ), 10, 3 );
+}

trunk/tests/phpunit/tests/term.php

@@ -9 +9 @@
         function setUp() {
                 parent::setUp();
+                
+                _clean_term_filters();
                 // insert one term into every post taxonomy
                 // otherwise term_ids and term_taxonomy_ids might be identical, which could mask bugs
@@ -442 +444 @@
                 wp_set_object_terms( $post_id, $term, $this->taxonomy );
 
-                $term = array_shift( wp_get_object_terms( $post_id, $this->taxonomy, array( 'fields' => 'all_with_object_id' ) ) );
+                $terms = wp_get_object_terms( $post_id, $this->taxonomy, array( 'fields' => 'all_with_object_id' ) );
+                $term = array_shift( $terms );
                 $int_fields = array( 'parent', 'term_id', 'count', 'term_group', 'term_taxonomy_id', 'object_id' );
                 foreach ( $int_fields as $field )
                         $this->assertInternalType( 'int', $term->$field, $field );
 
-                $term = array_shift( wp_get_object_terms( $post_id, $this->taxonomy, array( 'fields' => 'ids' ) ) );
+                $terms = wp_get_object_terms( $post_id, $this->taxonomy, array( 'fields' => 'ids' ) );
+                $term = array_shift( $terms );
                 $this->assertInternalType( 'int', $term, 'term' );
         }

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

@@ -7 +7 @@
         function setUp() {
                 parent::setUp();
-
+                
+                _clean_term_filters();
                 wp_cache_delete( 'last_changed', 'terms' );
         }
@@ -29 +30 @@
                 $terms = get_terms( 'post_tag' );
                 $this->assertEquals( 15, count( $terms ) );
-                $this->assertNotEmpty( $time1 = wp_cache_get( 'last_changed', 'terms' ) );
+                $time1 = wp_cache_get( 'last_changed', 'terms' );
+                $this->assertNotEmpty( $time1 );
                 $this->assertEquals( $num_queries + 1, $wpdb->num_queries );