From 13381bfcdce1660762373586f60297fcfa230917 Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Thu, 12 Sep 2013 06:41:36 +0000 Subject: [PATCH] * `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. git-svn-id: https://develop.svn.wordpress.org/trunk@25394 602fd350-edb4-49c9-b593-d223f7449a82 --- tests/phpunit/tests/xmlrpc/wp/getProfile.php | 7 +++++-- tests/phpunit/tests/xmlrpc/wp/getUser.php | 12 +++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/tests/phpunit/tests/xmlrpc/wp/getProfile.php b/tests/phpunit/tests/xmlrpc/wp/getProfile.php index 834dcfba8f..cc2da3e46a 100644 --- a/tests/phpunit/tests/xmlrpc/wp/getProfile.php +++ b/tests/phpunit/tests/xmlrpc/wp/getProfile.php @@ -39,7 +39,10 @@ class Tests_XMLRPC_wp_getProfile extends WP_XMLRPC_UnitTestCase { $this->assertNotInstanceOf( 'IXR_Error', $result ); $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 ); } } diff --git a/tests/phpunit/tests/xmlrpc/wp/getUser.php b/tests/phpunit/tests/xmlrpc/wp/getUser.php index 75c3b278d5..23eba73ae5 100644 --- a/tests/phpunit/tests/xmlrpc/wp/getUser.php +++ b/tests/phpunit/tests/xmlrpc/wp/getUser.php @@ -126,7 +126,10 @@ class Tests_XMLRPC_wp_getUser extends WP_XMLRPC_UnitTestCase { $this->assertEquals( $editor_id, $result['user_id'] ); $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 ); } function test_arbitrary_fields() { @@ -138,7 +141,10 @@ class Tests_XMLRPC_wp_getUser extends WP_XMLRPC_UnitTestCase { $this->assertNotInstanceOf( 'IXR_Error', $result ); $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 ); } }