<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[27104] trunk/tests/phpunit/tests: Move some cache related tests to the new `term/cache.php` from [27103].</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/27104">27104</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-02-06 05:19:05 +0000 (Thu, 06 Feb 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Move some cache related tests to the new `term/cache.php` from <a href="http://core.trac.wordpress.org/changeset/27103">[27103]</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunitteststermcachephp">trunk/tests/phpunit/tests/term/cache.php</a></li>
<li><a href="#trunktestsphpunitteststermphp">trunk/tests/phpunit/tests/term.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunitteststermcachephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/term/cache.php (27103 => 27104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/term/cache.php 2014-02-06 03:39:22 UTC (rev 27103)
+++ trunk/tests/phpunit/tests/term/cache.php    2014-02-06 05:19:05 UTC (rev 27104)
</span><span class="lines">@@ -27,6 +27,117 @@
</span><span class="cx">          $hierarchy = _get_term_hierarchy( 'category' );
</span><span class="cx"> 
</span><span class="cx">          $this->assertEquals( array( $term_id1 => array( $term_id1_child ), $term_id2 => array( $term_id2_child ) ), $hierarchy );
</span><ins>+       }
</ins><span class="cx"> 
</span><ins>+       /**
+        * @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 );
</ins><span class="cx">   }
</span><ins>+
+       /**
+        * @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 );
+       }
</ins><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunktestsphpunitteststermphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/term.php (27103 => 27104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/term.php       2014-02-06 03:39:22 UTC (rev 27103)
+++ trunk/tests/phpunit/tests/term.php  2014-02-06 05:19:05 UTC (rev 27104)
</span><span class="lines">@@ -567,116 +567,4 @@
</span><span class="cx">          // this previously returned 2
</span><span class="cx">          $this->assertEquals( 0, $count );
</span><span class="cx">  }
</span><del>-
-       /**
-        * @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 );
-       }
</del><span class="cx"> }
</span></span></pre>
</div>
</div>

</body>
</html>