Changeset 922 in tests

Timestamp:

07/19/2012 04:31:22 PM (12 years ago)

Author:

ryan

Message:

Don't fatal when wp_insert_term() returns WP_Error. Props kurtpayne. fixes #107

Location:

trunk

Files:

• includes/factory.php (modified) (1 diff)
• tests/term.php (modified) (7 diffs)
• tests/xmlrpc/wp/deleteTerm.php (modified) (1 diff)
• tests/xmlrpc/wp/editTerm.php (modified) (1 diff)
• tests/xmlrpc/wp/getTerm.php (modified) (1 diff)
• tests/xmlrpc/wp/newPost.php (modified) (1 diff)
• tests/xmlrpc/wp/newTerm.php (modified) (1 diff)

trunk/includes/factory.php

@@ -118 +118 @@
     function create_object( $args ) {
         $term_id_pair = wp_insert_term( $args['name'], $args['taxonomy'], $args );
+        if ( is_wp_error( $term_id_pair ) )
+            return $term_id_pair;
         return $term_id_pair['term_id'];
     }

trunk/tests/term.php

@@ -24 +24 @@
 
         $t = wp_insert_term( $term, $this->taxonomy );
-        $this->assertTrue( is_array($t) );
+        $this->assertInternalType( 'array', $t );
         $this->assertFalse( is_wp_error($t) );
         $this->assertTrue( $t['term_id'] > 0 );
@@ -45 +45 @@
         $term = rand_str();
         $t = wp_insert_term( $term, $this->taxonomy );
-
+        $this->assertInternalType( 'array', $t );
         $this->assertEquals( $t['term_id'], term_exists($t['term_id']) );
         $this->assertEquals( $t['term_id'], term_exists($term) );
@@ -67 +67 @@
         $term = rand_str();
         $t = wp_insert_term( $term, $this->taxonomy );
-
+        $this->assertInternalType( 'array', $t );
         $term_obj = get_term_by('name', $term, $this->taxonomy);
         $this->assertEquals( $t['term_id'], term_exists($term_obj->slug) );
@@ -82 +82 @@
             $term = rand_str();
             $result = wp_insert_term( $term, $this->taxonomy );
+            $this->assertInternalType( 'array', $result );
             $term_id[$term] = $result['term_id'];
         }
@@ -175 +176 @@
             $term = rand_str();
             $result = wp_insert_term( $term, $this->taxonomy );
+            $this->assertInternalType( 'array', $result );
             $terms_1[$i] = $result['term_id'];
         }
@@ -236 +238 @@
 
         $t = wp_insert_term( $term, 'category' );
+        $this->assertInternalType( 'array', $t );
         $t2 = wp_insert_term( $term, 'category', array( 'parent' => $t['term_id'] ) );
+        $this->assertInternalType( 'array', $t2 );
         if ( function_exists( 'term_is_ancestor_of' ) ) {
             $this->assertTrue( term_is_ancestor_of( $t['term_id'], $t2['term_id'], 'category' ) );
@@ -274 +278 @@
         // set up test data
         $a = wp_insert_term( 'parent', $this->taxonomy );
+        $this->assertInternalType( 'array', $a );
         $b = wp_insert_term( 'child',  $this->taxonomy, array( 'parent' => $a['term_id'] ) );
+        $this->assertInternalType( 'array', $b );
         $c = wp_insert_term( 'neighbor', $this->taxonomy );
+        $this->assertInternalType( 'array', $c );
         $d = wp_insert_term( 'pet',  $this->taxonomy, array( 'parent' => $c['term_id'] )  );
+        $this->assertInternalType( 'array', $c );
 
         $a_term = get_term( $a['term_id'], $this->taxonomy );

trunk/tests/xmlrpc/wp/deleteTerm.php

@@ -11 +11 @@
 
         $this->term = wp_insert_term( 'term' . rand_str() , 'category' );
+        $this->assertInternalType( 'array', $this->term );
     }
 

trunk/tests/xmlrpc/wp/editTerm.php

@@ -13 +13 @@
 
         $this->parent_term = wp_insert_term( 'parent' . rand_str() , 'category' );
+        $this->assertInternalType( 'array', $this->parent_term );
         $this->child_term = wp_insert_term( 'child' . rand_str() , 'category' );
+        $this->assertInternalType( 'array', $this->child_term );
         $this->post_tag = wp_insert_term( 'test' . rand_str() , 'post_tag' );
+        $this->assertInternalType( 'array', $this->post_tag );
     }
 

trunk/tests/xmlrpc/wp/getTerm.php

@@ -11 +11 @@
 
         $this->term = wp_insert_term( 'term' . rand_str() , 'category' );
+        $this->assertInternalType( 'array', $this->term );
     }
 

trunk/tests/xmlrpc/wp/newPost.php

@@ -245 +245 @@
 
         $tag1 = wp_create_tag ( rand_str( 30 ) );
+        $this->assertInternalType( 'array', $tag1 );
         $tag2 = wp_create_tag ( rand_str( 30 ) );
+        $this->assertInternalType( 'array', $tag2 );
         $tag3 = wp_create_tag ( rand_str( 30 ) );
+        $this->assertInternalType( 'array', $tag3 );
 
         $post = array(

trunk/tests/xmlrpc/wp/newTerm.php

@@ -11 +11 @@
 
         $this->parent_term = wp_insert_term( 'parent' . rand_str(), 'category' );
+        $this->assertInternalType( 'array', $this->parent_term );
         $this->parent_term = $this->parent_term['term_id'];
     }