<!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>[Tests][922] trunk: Don't fatal when wp_insert_term() returns WP_Error.</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, #logmsg > ol { margin-left: 0; 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://unit-tests.trac.wordpress.org/changeset/922">922</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-07-19 16:31:22 +0000 (Thu, 19 Jul 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't fatal when wp_insert_term() returns WP_Error. Props kurtpayne. fixes <a href="http://unit-tests.trac.wordpress.org/ticket/107">#107</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkincludesfactoryphp">trunk/includes/factory.php</a></li>
<li><a href="#trunkteststermphp">trunk/tests/term.php</a></li>
<li><a href="#trunktestsxmlrpcwpdeleteTermphp">trunk/tests/xmlrpc/wp/deleteTerm.php</a></li>
<li><a href="#trunktestsxmlrpcwpeditTermphp">trunk/tests/xmlrpc/wp/editTerm.php</a></li>
<li><a href="#trunktestsxmlrpcwpgetTermphp">trunk/tests/xmlrpc/wp/getTerm.php</a></li>
<li><a href="#trunktestsxmlrpcwpnewPostphp">trunk/tests/xmlrpc/wp/newPost.php</a></li>
<li><a href="#trunktestsxmlrpcwpnewTermphp">trunk/tests/xmlrpc/wp/newTerm.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkincludesfactoryphp"></a>
<div class="modfile"><h4>Modified: trunk/includes/factory.php (921 => 922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/includes/factory.php 2012-07-19 16:19:36 UTC (rev 921)
+++ trunk/includes/factory.php 2012-07-19 16:31:22 UTC (rev 922)
</span><span class="lines">@@ -117,6 +117,8 @@
</span><span class="cx">
</span><span class="cx"> function create_object( $args ) {
</span><span class="cx"> $term_id_pair = wp_insert_term( $args['name'], $args['taxonomy'], $args );
</span><ins>+ if ( is_wp_error( $term_id_pair ) )
+ return $term_id_pair;
</ins><span class="cx"> return $term_id_pair['term_id'];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkteststermphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/term.php (921 => 922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/term.php 2012-07-19 16:19:36 UTC (rev 921)
+++ trunk/tests/term.php 2012-07-19 16:31:22 UTC (rev 922)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> $initial_count = wp_count_terms( $this->taxonomy );
</span><span class="cx">
</span><span class="cx"> $t = wp_insert_term( $term, $this->taxonomy );
</span><del>- $this->assertTrue( is_array($t) );
</del><ins>+ $this->assertInternalType( 'array', $t );
</ins><span class="cx"> $this->assertFalse( is_wp_error($t) );
</span><span class="cx"> $this->assertTrue( $t['term_id'] > 0 );
</span><span class="cx"> $this->assertTrue( $t['term_taxonomy_id'] > 0 );
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> // insert a term
</span><span class="cx"> $term = rand_str();
</span><span class="cx"> $t = wp_insert_term( $term, $this->taxonomy );
</span><del>-
</del><ins>+ $this->assertInternalType( 'array', $t );
</ins><span class="cx"> $this->assertEquals( $t['term_id'], term_exists($t['term_id']) );
</span><span class="cx"> $this->assertEquals( $t['term_id'], term_exists($term) );
</span><span class="cx">
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> // insert a term
</span><span class="cx"> $term = rand_str();
</span><span class="cx"> $t = wp_insert_term( $term, $this->taxonomy );
</span><del>-
</del><ins>+ $this->assertInternalType( 'array', $t );
</ins><span class="cx"> $term_obj = get_term_by('name', $term, $this->taxonomy);
</span><span class="cx"> $this->assertEquals( $t['term_id'], term_exists($term_obj->slug) );
</span><span class="cx">
</span><span class="lines">@@ -81,6 +81,7 @@
</span><span class="cx"> for ($i=0; $i<3; $i++ ) {
</span><span class="cx"> $term = rand_str();
</span><span class="cx"> $result = wp_insert_term( $term, $this->taxonomy );
</span><ins>+ $this->assertInternalType( 'array', $result );
</ins><span class="cx"> $term_id[$term] = $result['term_id'];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -174,6 +175,7 @@
</span><span class="cx"> for ($i=0; $i<3; $i++ ) {
</span><span class="cx"> $term = rand_str();
</span><span class="cx"> $result = wp_insert_term( $term, $this->taxonomy );
</span><ins>+ $this->assertInternalType( 'array', $result );
</ins><span class="cx"> $terms_1[$i] = $result['term_id'];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -235,7 +237,9 @@
</span><span class="cx"> $term2 = rand_str();
</span><span class="cx">
</span><span class="cx"> $t = wp_insert_term( $term, 'category' );
</span><ins>+ $this->assertInternalType( 'array', $t );
</ins><span class="cx"> $t2 = wp_insert_term( $term, 'category', array( 'parent' => $t['term_id'] ) );
</span><ins>+ $this->assertInternalType( 'array', $t2 );
</ins><span class="cx"> if ( function_exists( 'term_is_ancestor_of' ) ) {
</span><span class="cx"> $this->assertTrue( term_is_ancestor_of( $t['term_id'], $t2['term_id'], 'category' ) );
</span><span class="cx"> $this->assertFalse( term_is_ancestor_of( $t2['term_id'], $t['term_id'], 'category' ) );
</span><span class="lines">@@ -273,9 +277,13 @@
</span><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><ins>+ $this->assertInternalType( 'array', $a );
</ins><span class="cx"> $b = wp_insert_term( 'child', $this->taxonomy, array( 'parent' => $a['term_id'] ) );
</span><ins>+ $this->assertInternalType( 'array', $b );
</ins><span class="cx"> $c = wp_insert_term( 'neighbor', $this->taxonomy );
</span><ins>+ $this->assertInternalType( 'array', $c );
</ins><span class="cx"> $d = wp_insert_term( 'pet', $this->taxonomy, array( 'parent' => $c['term_id'] ) );
</span><ins>+ $this->assertInternalType( 'array', $c );
</ins><span class="cx">
</span><span class="cx"> $a_term = get_term( $a['term_id'], $this->taxonomy );
</span><span class="cx"> $b_term = get_term( $b['term_id'], $this->taxonomy );
</span></span></pre></div>
<a id="trunktestsxmlrpcwpdeleteTermphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/xmlrpc/wp/deleteTerm.php (921 => 922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/xmlrpc/wp/deleteTerm.php 2012-07-19 16:19:36 UTC (rev 921)
+++ trunk/tests/xmlrpc/wp/deleteTerm.php 2012-07-19 16:31:22 UTC (rev 922)
</span><span class="lines">@@ -10,6 +10,7 @@
</span><span class="cx"> parent::setUp();
</span><span class="cx">
</span><span class="cx"> $this->term = wp_insert_term( 'term' . rand_str() , 'category' );
</span><ins>+ $this->assertInternalType( 'array', $this->term );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_invalid_username_password() {
</span></span></pre></div>
<a id="trunktestsxmlrpcwpeditTermphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/xmlrpc/wp/editTerm.php (921 => 922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/xmlrpc/wp/editTerm.php 2012-07-19 16:19:36 UTC (rev 921)
+++ trunk/tests/xmlrpc/wp/editTerm.php 2012-07-19 16:31:22 UTC (rev 922)
</span><span class="lines">@@ -12,8 +12,11 @@
</span><span class="cx"> parent::setUp();
</span><span class="cx">
</span><span class="cx"> $this->parent_term = wp_insert_term( 'parent' . rand_str() , 'category' );
</span><ins>+ $this->assertInternalType( 'array', $this->parent_term );
</ins><span class="cx"> $this->child_term = wp_insert_term( 'child' . rand_str() , 'category' );
</span><ins>+ $this->assertInternalType( 'array', $this->child_term );
</ins><span class="cx"> $this->post_tag = wp_insert_term( 'test' . rand_str() , 'post_tag' );
</span><ins>+ $this->assertInternalType( 'array', $this->post_tag );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_invalid_username_password() {
</span></span></pre></div>
<a id="trunktestsxmlrpcwpgetTermphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/xmlrpc/wp/getTerm.php (921 => 922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/xmlrpc/wp/getTerm.php 2012-07-19 16:19:36 UTC (rev 921)
+++ trunk/tests/xmlrpc/wp/getTerm.php 2012-07-19 16:31:22 UTC (rev 922)
</span><span class="lines">@@ -10,6 +10,7 @@
</span><span class="cx"> parent::setUp();
</span><span class="cx">
</span><span class="cx"> $this->term = wp_insert_term( 'term' . rand_str() , 'category' );
</span><ins>+ $this->assertInternalType( 'array', $this->term );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_invalid_username_password() {
</span></span></pre></div>
<a id="trunktestsxmlrpcwpnewPostphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/xmlrpc/wp/newPost.php (921 => 922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/xmlrpc/wp/newPost.php 2012-07-19 16:19:36 UTC (rev 921)
+++ trunk/tests/xmlrpc/wp/newPost.php 2012-07-19 16:31:22 UTC (rev 922)
</span><span class="lines">@@ -244,8 +244,11 @@
</span><span class="cx"> $this->make_user_by_role( 'editor' );
</span><span class="cx">
</span><span class="cx"> $tag1 = wp_create_tag ( rand_str( 30 ) );
</span><ins>+ $this->assertInternalType( 'array', $tag1 );
</ins><span class="cx"> $tag2 = wp_create_tag ( rand_str( 30 ) );
</span><ins>+ $this->assertInternalType( 'array', $tag2 );
</ins><span class="cx"> $tag3 = wp_create_tag ( rand_str( 30 ) );
</span><ins>+ $this->assertInternalType( 'array', $tag3 );
</ins><span class="cx">
</span><span class="cx"> $post = array(
</span><span class="cx"> 'post_title' => 'Test',
</span></span></pre></div>
<a id="trunktestsxmlrpcwpnewTermphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/xmlrpc/wp/newTerm.php (921 => 922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/xmlrpc/wp/newTerm.php 2012-07-19 16:19:36 UTC (rev 921)
+++ trunk/tests/xmlrpc/wp/newTerm.php 2012-07-19 16:31:22 UTC (rev 922)
</span><span class="lines">@@ -10,6 +10,7 @@
</span><span class="cx"> parent::setUp();
</span><span class="cx">
</span><span class="cx"> $this->parent_term = wp_insert_term( 'parent' . rand_str(), 'category' );
</span><ins>+ $this->assertInternalType( 'array', $this->parent_term );
</ins><span class="cx"> $this->parent_term = $this->parent_term['term_id'];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>