<!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>[29830] trunk/tests/phpunit/tests: Improve unit test coverage for wp_insert_term().</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/29830">29830</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/29830","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-10-03 13:30:22 +0000 (Fri, 03 Oct 2014)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Improve unit test coverage for wp_insert_term().
See <a href="https://core.trac.wordpress.org/ticket/5809">#5809</a>, <a href="https://core.trac.wordpress.org/ticket/22023">#22023</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunitteststaxonomyphp">trunk/tests/phpunit/tests/taxonomy.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="trunktestsphpunitteststaxonomyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/taxonomy.php 2014-10-03 13:07:18 UTC (rev 29829)
+++ trunk/tests/phpunit/tests/taxonomy.php 2014-10-03 13:30:22 UTC (rev 29830)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -234,66 +234,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, wp_insert_category( $cat, false ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- /**
- * @ticket 17689
- */
- function test_duplicate_name() {
- $term = $this->factory->tag->create_and_get( array( 'name' => 'Bozo' ) );
- $this->assertFalse( is_wp_error( $term ) );
- $this->assertTrue( empty( $term->errors ) );
-
- // Test existing term name with unique slug
- $term1 = $this->factory->tag->create( array( 'name' => 'Bozo', 'slug' => 'bozo1' ) );
- $this->assertFalse( is_wp_error( $term1 ) );
- $this->assertTrue( empty($term1->errors ) );
-
- // Test an existing term name
- $term2 = $this->factory->tag->create( array( 'name' => 'Bozo' ) );
- $this->assertTrue( is_wp_error( $term2 ) );
- $this->assertNotEmpty( $term2->errors );
-
- // Test named terms ending in special characters
- $term3 = $this->factory->tag->create( array( 'name' => 'T$' ) );
- $term4 = $this->factory->tag->create( array( 'name' => 'T$$' ) );
- $term5 = $this->factory->tag->create( array( 'name' => 'T$$$' ) );
- $term6 = $this->factory->tag->create( array( 'name' => 'T$$$$' ) );
- $term7 = $this->factory->tag->create( array( 'name' => 'T$$$$' ) );
- $this->assertTrue( is_wp_error( $term7 ) );
- $this->assertNotEmpty( $term7->errors );
- $this->assertEquals( $term6, $term7->error_data['term_exists'] );
-
- $terms = array_map( 'get_tag', array( $term3, $term4, $term5, $term6 ) );
- $this->assertCount( 4, array_unique( wp_list_pluck( $terms, 'slug' ) ) );
-
- // Test named terms with only special characters
- $term8 = $this->factory->tag->create( array( 'name' => '$' ) );
- $term9 = $this->factory->tag->create( array( 'name' => '$$' ) );
- $term10 = $this->factory->tag->create( array( 'name' => '$$$' ) );
- $term11 = $this->factory->tag->create( array( 'name' => '$$$$' ) );
- $term12 = $this->factory->tag->create( array( 'name' => '$$$$' ) );
- $this->assertTrue( is_wp_error( $term12 ) );
- $this->assertNotEmpty( $term12->errors );
- $this->assertEquals( $term11, $term12->error_data['term_exists'] );
-
- $terms = array_map( 'get_tag', array( $term8, $term9, $term10, $term11 ) );
- $this->assertCount( 4, array_unique( wp_list_pluck( $terms, 'slug' ) ) );
-
- $term13 = $this->factory->tag->create( array( 'name' => 'A' ) );
- $this->assertFalse( is_wp_error( $term13 ) );
- $term14 = $this->factory->tag->create( array( 'name' => 'A' ) );
- $this->assertTrue( is_wp_error( $term14 ) );
- $term15 = $this->factory->tag->create( array( 'name' => 'A+', 'slug' => 'a' ) );
- $this->assertFalse( is_wp_error( $term15 ) );
- $term16 = $this->factory->tag->create( array( 'name' => 'A+' ) );
- $this->assertTrue( is_wp_error( $term16 ) );
- $term17 = $this->factory->tag->create( array( 'name' => 'A++' ) );
- $this->assertFalse( is_wp_error( $term17 ) );
- $term18 = $this->factory->tag->create( array( 'name' => 'A-', 'slug' => 'a' ) );
- $this->assertFalse( is_wp_error( $term18 ) );
- $term19 = $this->factory->tag->create( array( 'name' => 'A-' ) );
- $this->assertTrue( is_wp_error( $term19 ) );
- $term20 = $this->factory->tag->create( array( 'name' => 'A--' ) );
- $this->assertFalse( is_wp_error( $term20 ) );
- }
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunitteststermphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/term.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term.php 2014-10-03 13:07:18 UTC (rev 29829)
+++ trunk/tests/phpunit/tests/term.php 2014-10-03 13:30:22 UTC (rev 29830)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -244,6 +244,179 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, term_exists(NULL) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_insert_term_taxonomy_does_not_exist() {
+ $found = wp_insert_term( 'foo', 'bar' );
+
+ $this->assertTrue( is_wp_error( $found ) );
+ $this->assertSame( 'invalid_taxonomy', $found->get_error_code() );
+ }
+
+ public function test_wp_insert_term_pre_insert_term_filter_returns_wp_error() {
+ add_filter( 'pre_insert_term', array( $this, '_pre_insert_term_callback' ) );
+ $found = wp_insert_term( 'foo', 'post_tag' );
+ remove_filter( 'pre_insert_term', array( $this, '_pre_insert_term_callback' ) );
+
+ $this->assertTrue( is_wp_error( $found ) );
+ $this->assertSame( 'custom_error', $found->get_error_code() );
+ }
+
+ public function test_wp_insert_term_term_0() {
+ $found = wp_insert_term( 0, 'post_tag' );
+
+ $this->assertTrue( is_wp_error( $found ) );
+ $this->assertSame( 'invalid_term_id', $found->get_error_code() );
+ }
+
+ public function test_wp_insert_term_term_trims_to_empty_string() {
+ $found = wp_insert_term( ' ', 'post_tag' );
+
+ $this->assertTrue( is_wp_error( $found ) );
+ $this->assertSame( 'empty_term_name', $found->get_error_code() );
+ }
+
+ public function test_wp_insert_term_parent_does_not_exist() {
+ $found = wp_insert_term( 'foo', 'post_tag', array(
+ 'parent' => 999999,
+ ) );
+
+ $this->assertTrue( is_wp_error( $found ) );
+ $this->assertSame( 'missing_parent', $found->get_error_code() );
+ }
+
+ public function test_wp_insert_term_unslash_name() {
+ register_taxonomy( 'wptests_tax', 'post' );
+ $found = wp_insert_term( 'Let\\\'s all say \\"Hooray\\" for WordPress taxonomy', 'wptests_tax' );
+
+ $term = get_term( $found['term_id'], 'wptests_tax' );
+ _unregister_taxonomy( 'wptests_tax' );
+
+ $this->assertSame( 'Let\'s all say "Hooray" for WordPress taxonomy', $term->name );
+ }
+
+ public function test_wp_insert_term_unslash_description() {
+ register_taxonomy( 'wptests_tax', 'post' );
+ $found = wp_insert_term( 'Quality', 'wptests_tax', array(
+ 'description' => 'Let\\\'s all say \\"Hooray\\" for WordPress taxonomy',
+ ) );
+
+ $term = get_term( $found['term_id'], 'wptests_tax' );
+ _unregister_taxonomy( 'wptests_tax' );
+
+ $this->assertSame( 'Let\'s all say "Hooray" for WordPress taxonomy', $term->description );
+ }
+
+ public function test_wp_insert_term_parent_string() {
+ register_taxonomy( 'wptests_tax', 'post' );
+ $found = wp_insert_term( 'Quality', 'wptests_tax', array(
+ 'parent' => 'foo1',
+ ) );
+
+ $term = get_term( $found['term_id'], 'wptests_tax' );
+ _unregister_taxonomy( 'wptests_tax' );
+
+ // 'foo1' is cast to 0 in sanitize_term().
+ $this->assertSame( 0, $term->parent );
+ }
+
+ public function test_wp_insert_term_slug_empty_string() {
+ register_taxonomy( 'wptests_tax', 'post' );
+ $found = wp_insert_term( 'Quality', 'wptests_tax', array(
+ 'slug' => '',
+ ) );
+
+ $term = get_term( $found['term_id'], 'wptests_tax' );
+ _unregister_taxonomy( 'wptests_tax' );
+
+ $this->assertSame( 'quality', $term->slug );
+
+ }
+
+ public function test_wp_insert_term_slug_whitespace_string() {
+ register_taxonomy( 'wptests_tax', 'post' );
+ $found = wp_insert_term( 'Quality', 'wptests_tax', array(
+ 'slug' => ' ',
+ ) );
+
+ $term = get_term( $found['term_id'], 'wptests_tax' );
+ _unregister_taxonomy( 'wptests_tax' );
+
+ $this->assertSame( 'quality', $term->slug );
+ }
+
+ public function test_wp_insert_term_slug_0() {
+ register_taxonomy( 'wptests_tax', 'post' );
+ $found = wp_insert_term( 'Quality', 'wptests_tax', array(
+ 'slug' => 0,
+ ) );
+
+ $term = get_term( $found['term_id'], 'wptests_tax' );
+ _unregister_taxonomy( 'wptests_tax' );
+
+ $this->assertSame( 'quality', $term->slug );
+ }
+
+ /**
+ * @ticket 17689
+ */
+ public function test_wp_insert_term_duplicate_name() {
+ $term = $this->factory->tag->create_and_get( array( 'name' => 'Bozo' ) );
+ $this->assertFalse( is_wp_error( $term ) );
+ $this->assertTrue( empty( $term->errors ) );
+
+ // Test existing term name with unique slug
+ $term1 = $this->factory->tag->create( array( 'name' => 'Bozo', 'slug' => 'bozo1' ) );
+ $this->assertFalse( is_wp_error( $term1 ) );
+ $this->assertTrue( empty($term1->errors ) );
+
+ // Test an existing term name
+ $term2 = $this->factory->tag->create( array( 'name' => 'Bozo' ) );
+ $this->assertTrue( is_wp_error( $term2 ) );
+ $this->assertNotEmpty( $term2->errors );
+
+ // Test named terms ending in special characters
+ $term3 = $this->factory->tag->create( array( 'name' => 'T$' ) );
+ $term4 = $this->factory->tag->create( array( 'name' => 'T$$' ) );
+ $term5 = $this->factory->tag->create( array( 'name' => 'T$$$' ) );
+ $term6 = $this->factory->tag->create( array( 'name' => 'T$$$$' ) );
+ $term7 = $this->factory->tag->create( array( 'name' => 'T$$$$' ) );
+ $this->assertTrue( is_wp_error( $term7 ) );
+ $this->assertNotEmpty( $term7->errors );
+ $this->assertEquals( $term6, $term7->error_data['term_exists'] );
+
+ $terms = array_map( 'get_tag', array( $term3, $term4, $term5, $term6 ) );
+ $this->assertCount( 4, array_unique( wp_list_pluck( $terms, 'slug' ) ) );
+
+ // Test named terms with only special characters
+ $term8 = $this->factory->tag->create( array( 'name' => '$' ) );
+ $term9 = $this->factory->tag->create( array( 'name' => '$$' ) );
+ $term10 = $this->factory->tag->create( array( 'name' => '$$$' ) );
+ $term11 = $this->factory->tag->create( array( 'name' => '$$$$' ) );
+ $term12 = $this->factory->tag->create( array( 'name' => '$$$$' ) );
+ $this->assertTrue( is_wp_error( $term12 ) );
+ $this->assertNotEmpty( $term12->errors );
+ $this->assertEquals( $term11, $term12->error_data['term_exists'] );
+
+ $terms = array_map( 'get_tag', array( $term8, $term9, $term10, $term11 ) );
+ $this->assertCount( 4, array_unique( wp_list_pluck( $terms, 'slug' ) ) );
+
+ $term13 = $this->factory->tag->create( array( 'name' => 'A' ) );
+ $this->assertFalse( is_wp_error( $term13 ) );
+ $term14 = $this->factory->tag->create( array( 'name' => 'A' ) );
+ $this->assertTrue( is_wp_error( $term14 ) );
+ $term15 = $this->factory->tag->create( array( 'name' => 'A+', 'slug' => 'a' ) );
+ $this->assertFalse( is_wp_error( $term15 ) );
+ $term16 = $this->factory->tag->create( array( 'name' => 'A+' ) );
+ $this->assertTrue( is_wp_error( $term16 ) );
+ $term17 = $this->factory->tag->create( array( 'name' => 'A++' ) );
+ $this->assertFalse( is_wp_error( $term17 ) );
+ $term18 = $this->factory->tag->create( array( 'name' => 'A-', 'slug' => 'a' ) );
+ $this->assertFalse( is_wp_error( $term18 ) );
+ $term19 = $this->factory->tag->create( array( 'name' => 'A-' ) );
+ $this->assertTrue( is_wp_error( $term19 ) );
+ $term20 = $this->factory->tag->create( array( 'name' => 'A--' ) );
+ $this->assertFalse( is_wp_error( $term20 ) );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_insert_term_duplicate_name_slug_non_hierarchical() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'foo', 'post', array() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -315,6 +488,55 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $existing_term, $found->get_error_data() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_insert_term_should_return_term_id_and_term_taxonomy_id() {
+ register_taxonomy( 'wptests_tax', 'post' );
+ $found = wp_insert_term( 'foo', 'wptests_tax' );
+
+ $term_by_id = get_term( $found['term_id'], 'wptests_tax' );
+ $term_by_slug = get_term_by( 'slug', 'foo', 'wptests_tax' );
+ $term_by_ttid = get_term_by( 'term_taxonomy_id', $found['term_taxonomy_id'], 'wptests_tax' );
+
+ _unregister_taxonomy( 'wptests_tax' );
+
+ $this->assertInternalType( 'array', $found );
+ $this->assertNotEmpty( $found['term_id'] );
+ $this->assertNotEmpty( $found['term_taxonomy_id'] );
+ $this->assertNotEmpty( $term_by_id );
+ $this->assertEquals( $term_by_id, $term_by_slug );
+ $this->assertEquals( $term_by_id, $term_by_ttid );
+ }
+
+ public function test_wp_insert_term_should_clean_term_cache() {
+ register_taxonomy( 'wptests_tax', 'post', array(
+ 'hierarchical' => true,
+ ) );
+
+ $t = $this->factory->term->create( array(
+ 'taxonomy' => 'wptests_tax',
+ ) );
+
+ /**
+ * It doesn't appear that WordPress itself ever sets these
+ * caches, but we should ensure that they're being cleared for
+ * compatibility with third-party addons. Prime the caches
+ * manually.
+ */
+ wp_cache_set( 'all_ids', array( 1, 2, 3 ), 'wptests_tax' );
+ wp_cache_set( 'get', array( 1, 2, 3 ), 'wptests_tax' );
+
+ $found = wp_insert_term( 'foo', 'wptests_tax', array(
+ 'parent' => $t,
+ ) );
+ _unregister_taxonomy( 'wptests_tax' );
+
+ $this->assertSame( false, wp_cache_get( 'all_ids', 'wptests_tax' ) );
+ $this->assertSame( false, wp_cache_get( 'get', 'wptests_tax' ) );
+
+ $cached_children = get_option( 'wptests_tax_children' );
+ $this->assertNotEmpty( $cached_children[ $t ] );
+ $this->assertTrue( in_array( $found['term_id'], $cached_children[ $t ] ) );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 5381
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -945,4 +1167,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $cat_id2 = $this->factory->category->create( array( 'parent' => $cat_id1 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertWPError( $cat_id2 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /** Helpers **********************************************************/
+
+ public function _pre_insert_term_callback() {
+ return new WP_Error( 'custom_error' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>