From 2127c9322d94f392b6bd876e432acfc47cd237a3 Mon Sep 17 00:00:00 2001
From: Scott Taylor <wonderboymusic@git.wordpress.org>
Date: Thu, 6 Feb 2014 05:19:05 +0000
Subject: [PATCH] Move some cache related tests to the new `term/cache.php`
 from [27103].

git-svn-id: https://develop.svn.wordpress.org/trunk@27104 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/phpunit/tests/term.php       | 112 -----------------------------
 tests/phpunit/tests/term/cache.php | 111 ++++++++++++++++++++++++++++
 2 files changed, 111 insertions(+), 112 deletions(-)

diff --git a/tests/phpunit/tests/term.php b/tests/phpunit/tests/term.php
index 19ffcd0469..465c635013 100644
--- a/tests/phpunit/tests/term.php
+++ b/tests/phpunit/tests/term.php
@@ -567,116 +567,4 @@ class Tests_Term extends WP_UnitTestCase {
 		// this previously returned 2
 		$this->assertEquals( 0, $count );
 	}
-
-	/**
-	 * @ticket 22526
-	 */
-	function test_get_taxonomy_last_changed() {
-		$last_changed = get_taxonomy_last_changed( 'category' );
-		$last_changed_cache = wp_cache_get( 'last_changed', 'category' );
-		$this->assertEquals( $last_changed, $last_changed_cache );
-		wp_cache_delete( 'last_changed', 'category' );
-		$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' ) );
-		$post_id = $this->factory->post->create();
-		wp_set_post_categories( $post_id, $term->term_id );
-
-		$post = get_post( $post_id );
-		$cats1 = get_the_category( $post->ID );
-		$this->assertEquals( $term->name, reset( $cats1 )->name );
-
-		wp_update_term( $term->term_id, 'category', array( 'name' => 'Bar' ) );
-		$cats2 = get_the_category( $post->ID );
-		$this->assertNotEquals( $term->name, reset( $cats2 )->name );
-	}
-
-	function test_hierachy_invalidation() {
-		$tax = 'burrito';
-		register_taxonomy( $tax, 'post', array( 'hierarchical' => true ) );
-		$this->assertTrue( get_taxonomy( $tax )->hierarchical );
-
-		$step = 1;
-		$parent_id = 0;
-		$children = 0;
-
-		foreach ( range( 1, 99 ) as $i ) {
-			switch ( $step ) {
-			case 1:
-				$parent = wp_insert_term( 'Parent' . $i, $tax );
-				$parent_id = $parent['term_id'];
-				break;
-			case 2:
-				$parent = wp_insert_term( 'Child' . $i, $tax, array( 'parent' => $parent_id ) );
-				$parent_id = $parent['term_id'];
-				$children++;
-				break;
-			case 3:
-				wp_insert_term( 'Grandchild' . $i, $tax, array( 'parent' => $parent_id ) );
-				$parent_id = 0;
-				$children++;
-				break;
-			}
-
-			$terms = get_terms( $tax, array( 'hide_empty' => false ) );
-			$this->assertEquals( $i, count( $terms ) );
-			if ( 1 < $i ) {
-				$hierarchy = _get_term_hierarchy( $tax );
-				$this->assertNotEmpty( $hierarchy );
-				$this->assertEquals( $children, count( $hierarchy, COUNT_RECURSIVE ) - count( $hierarchy ) );
-			}
-
-			if ( $i % 3 === 0 ) {
-				$step = 1;
-			} else {
-				$step++;
-			}
-		}
-
-		_unregister_taxonomy( $tax );
-	}
 }
diff --git a/tests/phpunit/tests/term/cache.php b/tests/phpunit/tests/term/cache.php
index d62b53bc4b..d054c774b5 100644
--- a/tests/phpunit/tests/term/cache.php
+++ b/tests/phpunit/tests/term/cache.php
@@ -27,6 +27,117 @@ class Tests_Term_Cache extends WP_UnitTestCase {
 		$hierarchy = _get_term_hierarchy( 'category' );
 
 		$this->assertEquals( array( $term_id1 => array( $term_id1_child ), $term_id2 => array( $term_id2_child ) ), $hierarchy );
+	}
 
+	/**
+	 * @ticket 22526
+	 */
+	function test_get_taxonomy_last_changed() {
+		$last_changed = get_taxonomy_last_changed( 'category' );
+		$last_changed_cache = wp_cache_get( 'last_changed', 'category' );
+		$this->assertEquals( $last_changed, $last_changed_cache );
+		wp_cache_delete( 'last_changed', 'category' );
+		$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' ) );
+		$post_id = $this->factory->post->create();
+		wp_set_post_categories( $post_id, $term->term_id );
+
+		$post = get_post( $post_id );
+		$cats1 = get_the_category( $post->ID );
+		$this->assertEquals( $term->name, reset( $cats1 )->name );
+
+		wp_update_term( $term->term_id, 'category', array( 'name' => 'Bar' ) );
+		$cats2 = get_the_category( $post->ID );
+		$this->assertNotEquals( $term->name, reset( $cats2 )->name );
+	}
+
+	function test_hierachy_invalidation() {
+		$tax = 'burrito';
+		register_taxonomy( $tax, 'post', array( 'hierarchical' => true ) );
+		$this->assertTrue( get_taxonomy( $tax )->hierarchical );
+
+		$step = 1;
+		$parent_id = 0;
+		$children = 0;
+
+		foreach ( range( 1, 99 ) as $i ) {
+			switch ( $step ) {
+			case 1:
+				$parent = wp_insert_term( 'Parent' . $i, $tax );
+				$parent_id = $parent['term_id'];
+				break;
+			case 2:
+				$parent = wp_insert_term( 'Child' . $i, $tax, array( 'parent' => $parent_id ) );
+				$parent_id = $parent['term_id'];
+				$children++;
+				break;
+			case 3:
+				wp_insert_term( 'Grandchild' . $i, $tax, array( 'parent' => $parent_id ) );
+				$parent_id = 0;
+				$children++;
+				break;
+			}
+
+			$terms = get_terms( $tax, array( 'hide_empty' => false ) );
+			$this->assertEquals( $i, count( $terms ) );
+			if ( 1 < $i ) {
+				$hierarchy = _get_term_hierarchy( $tax );
+				$this->assertNotEmpty( $hierarchy );
+				$this->assertEquals( $children, count( $hierarchy, COUNT_RECURSIVE ) - count( $hierarchy ) );
+			}
+
+			if ( $i % 3 === 0 ) {
+				$step = 1;
+			} else {
+				$step++;
+			}
+		}
+
+		_unregister_taxonomy( $tax );
 	}
 }
\ No newline at end of file