Changeset 25394

Timestamp:

09/12/2013 06:41:36 AM (11 years ago)

Author:

wonderboymusic

Message:

• sort() returns a boolean, not a sorted set. Move the calls out of the assertions and fix the test methods.
• Fix instances where Only variables should be passed by reference was being triggered by assigning array_keys() return value to a var

See #25282.

Location:

trunk/tests/phpunit/tests/xmlrpc/wp

Files:

• getProfile.php (modified) (1 diff)
• getUser.php (modified) (2 diffs)

trunk/tests/phpunit/tests/xmlrpc/wp/getProfile.php

@@ -40 +40 @@
         $this->assertEquals( $editor_id, $result['user_id'] );
 
-        $expected_fields = array_merge( array( 'user_id' ), $fields );
-        $this->assertEquals( sort( $expected_fields ), sort( array_keys( $result ) ) );
+        $expected_fields = array( 'user_id', 'email', 'bio' );
+        $keys = array_keys( $result );
+        sort( $expected_fields );
+        sort( $keys );
+        $this->assertEqualSets( $expected_fields, $keys );
     }
 }

trunk/tests/phpunit/tests/xmlrpc/wp/getUser.php

@@ -127 +127 @@
 
         $expected_fields = array( 'user_id', 'username', 'email', 'registered', 'display_name', 'nicename' );
-        $this->assertEquals( sort( $expected_fields ), sort( array_keys( $result ) ) );
+        $keys = array_keys( $result );
+        sort( $expected_fields );
+        sort( $keys );
+        $this->assertEqualSets( $expected_fields, $keys );
     }
 
@@ -139 +142 @@
         $this->assertEquals( $editor_id, $result['user_id'] );
 
-        $expected_fields = array_merge( array( 'user_id' ), $fields );
-        $this->assertEquals( sort( $expected_fields ), sort( array_keys( $result ) ) );
+        $expected_fields = array( 'user_id', 'email', 'bio' );
+        $keys = array_keys( $result );
+        sort( $expected_fields );
+        sort( $keys );
+        $this->assertEqualSets( $expected_fields, $keys );
     }
 }