<!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>[28953] trunk/tests/phpunit/tests/term.php: Reorder test functions in term.php for consistency.</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/28953">28953</a></dd>
<dt>Author</dt> <dd>SergeyBiryukov</dd>
<dt>Date</dt> <dd>2014-07-02 01:49:41 +0000 (Wed, 02 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Reorder test functions in term.php for consistency. Add @ticket references.
see <a href="http://core.trac.wordpress.org/ticket/26570">#26570</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunitteststermphp">trunk/tests/phpunit/tests/term.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunitteststermphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/term.php (28952 => 28953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/term.php 2014-07-02 01:38:22 UTC (rev 28952)
+++ trunk/tests/phpunit/tests/term.php 2014-07-02 01:49:41 UTC (rev 28953)
</span><span class="lines">@@ -88,6 +88,25 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * @ticket 21651
+ */
+ function test_get_term_by_tt_id() {
+ $term1 = wp_insert_term( 'Foo', 'category' );
+ $term2 = get_term_by( 'term_taxonomy_id', $term1['term_taxonomy_id'], 'category' );
+ $this->assertEquals( get_term( $term1['term_id'], 'category' ), $term2 );
+ }
+
+ /**
+ * @ticket 15919
+ */
+ function test_wp_count_terms() {
+ $count = wp_count_terms( 'category', array( 'hide_empty' => true ) );
+ // the terms inserted in setUp aren't attached to any posts, so should return 0
+ // this previously returned 2
+ $this->assertEquals( 0, $count );
+ }
+
+ /**
</ins><span class="cx"> * @ticket 26339
</span><span class="cx"> */
</span><span class="cx"> function test_get_object_terms() {
</span><span class="lines">@@ -109,7 +128,64 @@
</span><span class="cx"> return $terms;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function test_get_object_terms_by_slug() {
+ $post_id = $this->factory->post->create();
+
+ $terms_1 = array('Foo', 'Bar', 'Baz');
+ $terms_1_slugs = array('foo', 'bar', 'baz');
+
+ // set the initial terms
+ $tt_1 = wp_set_object_terms( $post_id, $terms_1, $this->taxonomy );
+ $this->assertEquals( 3, count($tt_1) );
+
+ // make sure they're correct
+ $terms = wp_get_object_terms($post_id, $this->taxonomy, array('fields' => 'slugs', 'orderby' => 't.term_id'));
+ $this->assertEquals( $terms_1_slugs, $terms );
+ }
+
</ins><span class="cx"> /**
</span><ins>+ * @ticket 11003
+ */
+ function test_wp_get_object_terms_no_dupes() {
+ $post_id1 = $this->factory->post->create();
+ $post_id2 = $this->factory->post->create();
+ $cat_id = $this->factory->category->create();
+ $cat_id2 = $this->factory->category->create();
+ wp_set_post_categories( $post_id1, array( $cat_id, $cat_id2 ) );
+ wp_set_post_categories( $post_id2, $cat_id );
+
+ $terms = wp_get_object_terms( array( $post_id1, $post_id2 ), 'category' );
+ $this->assertCount( 2, $terms );
+ $this->assertEquals( array( $cat_id, $cat_id2 ), wp_list_pluck( $terms, 'term_id' ) );
+
+ $terms2 = wp_get_object_terms( array( $post_id1, $post_id2 ), 'category', array(
+ 'fields' => 'all_with_object_id'
+ ) );
+
+ $this->assertCount( 3, $terms2 );
+ $this->assertEquals( array( $cat_id, $cat_id, $cat_id2 ), wp_list_pluck( $terms2, 'term_id' ) );
+ }
+
+ /**
+ * @ticket 17646
+ */
+ function test_get_object_terms_types() {
+ $post_id = $this->factory->post->create();
+ $term = wp_insert_term( 'one', $this->taxonomy );
+ wp_set_object_terms( $post_id, $term, $this->taxonomy );
+
+ $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 );
+
+ $terms = wp_get_object_terms( $post_id, $this->taxonomy, array( 'fields' => 'ids' ) );
+ $term = array_shift( $terms );
+ $this->assertInternalType( 'int', $term, 'term' );
+ }
+
+ /**
</ins><span class="cx"> * @ticket 26570
</span><span class="cx"> */
</span><span class="cx"> function test_set_object_terms() {
</span><span class="lines">@@ -259,64 +335,14 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function test_change_object_terms_by_name() {
- // set some terms on an object; then change them while leaving one intact
-
</del><ins>+ function test_set_object_terms_invalid() {
</ins><span class="cx"> $post_id = $this->factory->post->create();
</span><span class="cx">
</span><del>- $terms_1 = array('foo', 'bar', 'baz');
- $terms_2 = array('bar', 'bing');
-
- // set the initial terms
- $tt_1 = wp_set_object_terms( $post_id, $terms_1, $this->taxonomy );
- $this->assertEquals( 3, count($tt_1) );
-
- // make sure they're correct
- $terms = wp_get_object_terms($post_id, $this->taxonomy, array('fields' => 'names', 'orderby' => 't.term_id'));
- $this->assertEquals( $terms_1, $terms );
-
- // change the terms
- $tt_2 = wp_set_object_terms( $post_id, $terms_2, $this->taxonomy );
- $this->assertEquals( 2, count($tt_2) );
-
- // make sure they're correct
- $terms = wp_get_object_terms($post_id, $this->taxonomy, array('fields' => 'names', 'orderby' => 't.term_id'));
- $this->assertEquals( $terms_2, $terms );
-
- // make sure the tt id for 'bar' matches
- $this->assertEquals( $tt_1[1], $tt_2[0] );
-
</del><ins>+ // bogus taxonomy
+ $result = wp_set_object_terms( $post_id, array(rand_str()), rand_str() );
+ $this->assertTrue( is_wp_error($result) );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- /**
- * @ticket 22560
- */
- function test_object_term_cache() {
- $post_id = $this->factory->post->create();
-
- $terms_1 = array('foo', 'bar', 'baz');
- $terms_2 = array('bar', 'bing');
-
- // Cache should be empty after a set.
- $tt_1 = wp_set_object_terms( $post_id, $terms_1, $this->taxonomy );
- $this->assertEquals( 3, count($tt_1) );
- $this->assertFalse( wp_cache_get( $post_id, $this->taxonomy . '_relationships') );
-
- // wp_get_object_terms() does not prime the cache.
- wp_get_object_terms( $post_id, $this->taxonomy, array('fields' => 'names', 'orderby' => 't.term_id') );
- $this->assertFalse( wp_cache_get( $post_id, $this->taxonomy . '_relationships') );
-
- // get_the_terms() does prime the cache.
- $terms = get_the_terms( $post_id, $this->taxonomy );
- $cache = wp_cache_get( $post_id, $this->taxonomy . '_relationships');
- $this->assertInternalType( 'array', $cache );
-
- // Cache should be empty after a set.
- $tt_2 = wp_set_object_terms( $post_id, $terms_2, $this->taxonomy );
- $this->assertEquals( 2, count($tt_2) );
- $this->assertFalse( wp_cache_get( $post_id, $this->taxonomy . '_relationships') );
- }
-
</del><span class="cx"> function test_change_object_terms_by_id() {
</span><span class="cx"> // set some terms on an object; then change them while leaving one intact
</span><span class="cx">
</span><span class="lines">@@ -361,27 +387,33 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function test_get_object_terms_by_slug() {
</del><ins>+ function test_change_object_terms_by_name() {
+ // set some terms on an object; then change them while leaving one intact
+
</ins><span class="cx"> $post_id = $this->factory->post->create();
</span><span class="cx">
</span><del>- $terms_1 = array('Foo', 'Bar', 'Baz');
- $terms_1_slugs = array('foo', 'bar', 'baz');
</del><ins>+ $terms_1 = array('foo', 'bar', 'baz');
+ $terms_2 = array('bar', 'bing');
</ins><span class="cx">
</span><span class="cx"> // set the initial terms
</span><span class="cx"> $tt_1 = wp_set_object_terms( $post_id, $terms_1, $this->taxonomy );
</span><span class="cx"> $this->assertEquals( 3, count($tt_1) );
</span><span class="cx">
</span><span class="cx"> // make sure they're correct
</span><del>- $terms = wp_get_object_terms($post_id, $this->taxonomy, array('fields' => 'slugs', 'orderby' => 't.term_id'));
- $this->assertEquals( $terms_1_slugs, $terms );
- }
</del><ins>+ $terms = wp_get_object_terms($post_id, $this->taxonomy, array('fields' => 'names', 'orderby' => 't.term_id'));
+ $this->assertEquals( $terms_1, $terms );
</ins><span class="cx">
</span><del>- function test_set_object_terms_invalid() {
- $post_id = $this->factory->post->create();
</del><ins>+ // change the terms
+ $tt_2 = wp_set_object_terms( $post_id, $terms_2, $this->taxonomy );
+ $this->assertEquals( 2, count($tt_2) );
</ins><span class="cx">
</span><del>- // bogus taxonomy
- $result = wp_set_object_terms( $post_id, array(rand_str()), rand_str() );
- $this->assertTrue( is_wp_error($result) );
</del><ins>+ // make sure they're correct
+ $terms = wp_get_object_terms($post_id, $this->taxonomy, array('fields' => 'names', 'orderby' => 't.term_id'));
+ $this->assertEquals( $terms_2, $terms );
+
+ // make sure the tt id for 'bar' matches
+ $this->assertEquals( $tt_1[1], $tt_2[0] );
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -458,6 +490,42 @@
</span><span class="cx"> $this->assertEquals( $initial_count, wp_count_terms('category') );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /**
+ * @ticket 16550
+ */
+ function test_wp_set_post_categories() {
+ $post_id = $this->factory->post->create();
+ $post = get_post( $post_id );
+
+ $this->assertInternalType( 'array', $post->post_category );
+ $this->assertEquals( 1, count( $post->post_category ) );
+ $this->assertEquals( get_option( 'default_category' ), $post->post_category[0] );
+ $term1 = wp_insert_term( 'Foo', 'category' );
+ $term2 = wp_insert_term( 'Bar', 'category' );
+ $term3 = wp_insert_term( 'Baz', 'category' );
+ wp_set_post_categories( $post_id, array( $term1['term_id'], $term2['term_id'] ) );
+ $this->assertEquals( 2, count( $post->post_category ) );
+ $this->assertEquals( array( $term2['term_id'], $term1['term_id'] ) , $post->post_category );
+
+ wp_set_post_categories( $post_id, $term3['term_id'], true );
+ $this->assertEquals( array( $term2['term_id'], $term3['term_id'], $term1['term_id'] ) , $post->post_category );
+
+ $term4 = wp_insert_term( 'Burrito', 'category' );
+ wp_set_post_categories( $post_id, $term4['term_id'] );
+ $this->assertEquals( array( $term4['term_id'] ), $post->post_category );
+
+ wp_set_post_categories( $post_id, array( $term1['term_id'], $term2['term_id'] ), true );
+ $this->assertEquals( array( $term2['term_id'], $term4['term_id'], $term1['term_id'] ), $post->post_category );
+
+ wp_set_post_categories( $post_id, array(), true );
+ $this->assertEquals( 1, count( $post->post_category ) );
+ $this->assertEquals( get_option( 'default_category' ), $post->post_category[0] );
+
+ wp_set_post_categories( $post_id, array() );
+ $this->assertEquals( 1, count( $post->post_category ) );
+ $this->assertEquals( get_option( 'default_category' ), $post->post_category[0] );
+ }
+
</ins><span class="cx"> function test_wp_unique_term_slug() {
</span><span class="cx"> // set up test data
</span><span class="cx"> $a = wp_insert_term( 'parent', $this->taxonomy );
</span><span class="lines">@@ -549,25 +617,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * @ticket 17646
- */
- function test_get_object_terms_types() {
- $post_id = $this->factory->post->create();
- $term = wp_insert_term( 'one', $this->taxonomy );
- wp_set_object_terms( $post_id, $term, $this->taxonomy );
-
- $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 );
-
- $terms = wp_get_object_terms( $post_id, $this->taxonomy, array( 'fields' => 'ids' ) );
- $term = array_shift( $terms );
- $this->assertInternalType( 'int', $term, 'term' );
- }
-
- /**
</del><span class="cx"> * @ticket 25852
</span><span class="cx"> */
</span><span class="cx"> function test_sanitize_term_field() {
</span><span class="lines">@@ -588,6 +637,35 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * @ticket 22560
+ */
+ function test_object_term_cache() {
+ $post_id = $this->factory->post->create();
+
+ $terms_1 = array('foo', 'bar', 'baz');
+ $terms_2 = array('bar', 'bing');
+
+ // Cache should be empty after a set.
+ $tt_1 = wp_set_object_terms( $post_id, $terms_1, $this->taxonomy );
+ $this->assertEquals( 3, count($tt_1) );
+ $this->assertFalse( wp_cache_get( $post_id, $this->taxonomy . '_relationships') );
+
+ // wp_get_object_terms() does not prime the cache.
+ wp_get_object_terms( $post_id, $this->taxonomy, array('fields' => 'names', 'orderby' => 't.term_id') );
+ $this->assertFalse( wp_cache_get( $post_id, $this->taxonomy . '_relationships') );
+
+ // get_the_terms() does prime the cache.
+ $terms = get_the_terms( $post_id, $this->taxonomy );
+ $cache = wp_cache_get( $post_id, $this->taxonomy . '_relationships');
+ $this->assertInternalType( 'array', $cache );
+
+ // Cache should be empty after a set.
+ $tt_2 = wp_set_object_terms( $post_id, $terms_2, $this->taxonomy );
+ $this->assertEquals( 2, count($tt_2) );
+ $this->assertFalse( wp_cache_get( $post_id, $this->taxonomy . '_relationships') );
+ }
+
+ /**
</ins><span class="cx"> * @ticket 24189
</span><span class="cx"> */
</span><span class="cx"> function test_object_term_cache_when_term_changes() {
</span><span class="lines">@@ -612,70 +690,4 @@
</span><span class="cx"> $this->assertEquals( $tag_id, $terms[0]->term_id );
</span><span class="cx"> $this->assertEquals( 'This description is even more amazing!', $terms[0]->description );
</span><span class="cx"> }
</span><del>-
- function test_wp_set_post_categories() {
- $post_id = $this->factory->post->create();
- $post = get_post( $post_id );
-
- $this->assertInternalType( 'array', $post->post_category );
- $this->assertEquals( 1, count( $post->post_category ) );
- $this->assertEquals( get_option( 'default_category' ), $post->post_category[0] );
- $term1 = wp_insert_term( 'Foo', 'category' );
- $term2 = wp_insert_term( 'Bar', 'category' );
- $term3 = wp_insert_term( 'Baz', 'category' );
- wp_set_post_categories( $post_id, array( $term1['term_id'], $term2['term_id'] ) );
- $this->assertEquals( 2, count( $post->post_category ) );
- $this->assertEquals( array( $term2['term_id'], $term1['term_id'] ) , $post->post_category );
-
- wp_set_post_categories( $post_id, $term3['term_id'], true );
- $this->assertEquals( array( $term2['term_id'], $term3['term_id'], $term1['term_id'] ) , $post->post_category );
-
- $term4 = wp_insert_term( 'Burrito', 'category' );
- wp_set_post_categories( $post_id, $term4['term_id'] );
- $this->assertEquals( array( $term4['term_id'] ), $post->post_category );
-
- wp_set_post_categories( $post_id, array( $term1['term_id'], $term2['term_id'] ), true );
- $this->assertEquals( array( $term2['term_id'], $term4['term_id'], $term1['term_id'] ), $post->post_category );
-
- wp_set_post_categories( $post_id, array(), true );
- $this->assertEquals( 1, count( $post->post_category ) );
- $this->assertEquals( get_option( 'default_category' ), $post->post_category[0] );
-
- wp_set_post_categories( $post_id, array() );
- $this->assertEquals( 1, count( $post->post_category ) );
- $this->assertEquals( get_option( 'default_category' ), $post->post_category[0] );
- }
-
- function test_get_term_by_tt_id() {
- $term1 = wp_insert_term( 'Foo', 'category' );
- $term2 = get_term_by( 'term_taxonomy_id', $term1['term_taxonomy_id'], 'category' );
- $this->assertEquals( get_term( $term1['term_id'], 'category' ), $term2 );
- }
-
- function test_wp_count_terms() {
- $count = wp_count_terms( 'category', array( 'hide_empty' => true ) );
- // the terms inserted in setUp aren't attached to any posts, so should return 0
- // this previously returned 2
- $this->assertEquals( 0, $count );
- }
-
- function test_wp_get_object_terms_no_dupes() {
- $post_id1 = $this->factory->post->create();
- $post_id2 = $this->factory->post->create();
- $cat_id = $this->factory->category->create();
- $cat_id2 = $this->factory->category->create();
- wp_set_post_categories( $post_id1, array( $cat_id, $cat_id2 ) );
- wp_set_post_categories( $post_id2, $cat_id );
-
- $terms = wp_get_object_terms( array( $post_id1, $post_id2 ), 'category' );
- $this->assertCount( 2, $terms );
- $this->assertEquals( array( $cat_id, $cat_id2 ), wp_list_pluck( $terms, 'term_id' ) );
-
- $terms2 = wp_get_object_terms( array( $post_id1, $post_id2 ), 'category', array(
- 'fields' => 'all_with_object_id'
- ) );
-
- $this->assertCount( 3, $terms2 );
- $this->assertEquals( array( $cat_id, $cat_id, $cat_id2 ), wp_list_pluck( $terms2, 'term_id' ) );
- }
</del><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>