Ticket #21977: unittest.21977.diff

tests/xmlrpc/wp/editTerm.php

@@ -92 +92 @@
                 $this->make_user_by_role( 'editor' );
 
                 $result = $this->myxmlrpcserver->wp_editTerm( array( 1, 'editor', 'editor', $this->child_term['term_id'], array( 'taxonomy' => 'category', 'parent' => '', 'name' => 'test' ) ) );
-                $this->assertInstanceOf( 'IXR_Error', $result );
-                $this->assertEquals( 500, $result->code );
-                $this->assertEquals( __('Empty Term'), $result->message );
+                $this->assertNotInstanceOf( 'IXR_Error', $result );
+                $this->assertInternalType( 'boolean', $result );
+
+                $term = get_term( $this->child_term['term_id'], 'category' );
+                $this->assertEquals( '0', $term->parent );
         }
 
+        function test_parent_null() {
+                $this->make_user_by_role( 'editor' );
+
+                $result = $this->myxmlrpcserver->wp_editTerm( array( 1, 'editor', 'editor', $this->child_term['term_id'], array( 'taxonomy' => 'category', 'parent' => NULL, 'name' => 'test' ) ) );
+
+                $this->assertNotInstanceOf( 'IXR_Error', $result );
+                $this->assertInternalType( 'boolean', $result );
+
+                $term = get_term( $this->child_term['term_id'], 'category' );
+                $this->assertEquals( '0', $term->parent );
+        }
+
         function test_parent_invalid() {
                 $this->make_user_by_role( 'editor' );
 

tests/xmlrpc/wp/newTerm.php

@@ -47 +47 @@
                 $this->assertEquals( __( 'You are not allowed to create terms in this taxonomy.' ), $result->message );
         }
 
-        function test_empty_term() {
+        function test_empty_term_name() {
                 $this->make_user_by_role( 'editor' );
 
                 $result = $this->myxmlrpcserver->wp_newTerm( array( 1, 'editor', 'editor', array( 'taxonomy' => 'category', 'name' => '' ) ) );
@@ -65 +65 @@
                 $this->assertEquals( __( 'This taxonomy is not hierarchical.' ), $result->message );
         }
 
+        function test_parent_empty() {
+                $this->make_user_by_role( 'editor' );
+
+                $result = $this->myxmlrpcserver->wp_newTerm( array( 1, 'editor', 'editor', array( 'taxonomy' => 'category', 'parent' => '', 'name' => 'test' ) ) );
+                $this->assertNotInstanceOf( 'IXR_Error', $result );
+                $this->assertStringMatchesFormat( '%d', $result );
+        }
+
+        function test_parent_null() {
+                $this->make_user_by_role( 'editor' );
+
+                $result = $this->myxmlrpcserver->wp_newTerm( array( 1, 'editor', 'editor', array( 'taxonomy' => 'category', 'parent' => NULL, 'name' => 'test' ) ) );
+                $this->assertNotInstanceOf( 'IXR_Error', $result );
+                $this->assertStringMatchesFormat( '%d', $result );
+        }
+
         function test_parent_invalid() {
                 $this->make_user_by_role( 'editor' );