vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-06-28 22:30:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tests: First pass at using assertSame() instead of assertEquals() in most of the unit tests.

Browse Source 
This ensures that not only the return values match the expected results, but also that their type is the same.

Going forward, stricter type checking by using `assertSame()` should generally be preferred to `assertEquals()` where appropriate, to make the tests more reliable.

Props johnbillion, jrf, SergeyBiryukov.
See #38266.

git-svn-id: https://develop.svn.wordpress.org/trunk@48937 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov
2020-09-02 00:35:36 +00:00
parent ba7c6a2d5f
commit 164b22cf6a
426 changed files with 7959 additions and 7949 deletions
Download Patch File Download Diff File Expand all files Collapse all files

184
tests/phpunit/tests/user.php
View File

@@ -101,12 +101,12 @@ class Tests_User extends WP_UnitTestCase {
// Set and get.
update_user_option( self::$author_id, $key, $val );
$this->assertEquals( $val, get_user_option( $key, self::$author_id ) );
$this->assertSame( $val, get_user_option( $key, self::$author_id ) );
// Change and get again.
$val2 = rand_str();
update_user_option( self::$author_id, $key, $val2 );
$this->assertEquals( $val2, get_user_option( $key, self::$author_id ) );
$this->assertSame( $val2, get_user_option( $key, self::$author_id ) );
}
/**
@@ -117,29 +117,29 @@ class Tests_User extends WP_UnitTestCase {
$val = 'value1';
// Get a meta key that doesn't exist.
$this->assertEquals( '', get_user_meta( self::$author_id, $key, true ) );
$this->assertSame( '', get_user_meta( self::$author_id, $key, true ) );
// Set and get.
update_user_meta( self::$author_id, $key, $val );
$this->assertEquals( $val, get_user_meta( self::$author_id, $key, true ) );
$this->assertSame( $val, get_user_meta( self::$author_id, $key, true ) );
// Change and get again.
$val2 = 'value2';
update_user_meta( self::$author_id, $key, $val2 );
$this->assertEquals( $val2, get_user_meta( self::$author_id, $key, true ) );
$this->assertSame( $val2, get_user_meta( self::$author_id, $key, true ) );
// Delete and get.
delete_user_meta( self::$author_id, $key );
$this->assertEquals( '', get_user_meta( self::$author_id, $key, true ) );
$this->assertSame( '', get_user_meta( self::$author_id, $key, true ) );
// Delete by key AND value.
update_user_meta( self::$author_id, $key, $val );
// Incorrect key: key still exists.
delete_user_meta( self::$author_id, $key, rand_str() );
$this->assertEquals( $val, get_user_meta( self::$author_id, $key, true ) );
$this->assertSame( $val, get_user_meta( self::$author_id, $key, true ) );
// Correct key: deleted.
delete_user_meta( self::$author_id, $key, $val );
$this->assertEquals( '', get_user_meta( self::$author_id, $key, true ) );
$this->assertSame( '', get_user_meta( self::$author_id, $key, true ) );
}
@@ -197,11 +197,11 @@ class Tests_User extends WP_UnitTestCase {
$this->assertFalse( isset( $user->fooooooooo ) );
$user->$key = 'foo';
$this->assertEquals( 'foo', $user->$key );
$this->assertEquals( 'foo', $user->data->$key ); // This will fail with WP < 3.3.
$this->assertSame( 'foo', $user->$key );
$this->assertSame( 'foo', $user->data->$key ); // This will fail with WP < 3.3.
foreach ( get_object_vars( $user ) as $key => $value ) {
$this->assertEquals( $value, $user->$key );
$this->assertSame( $value, $user->$key );
}
}
@@ -216,7 +216,7 @@ class Tests_User extends WP_UnitTestCase {
// Test custom fields.
$user->customField = 123;
$this->assertEquals( $user->customField, 123 );
$this->assertSame( $user->customField, 123 );
unset( $user->customField );
$this->assertFalse( isset( $user->customField ) );
return $user;
@@ -259,7 +259,7 @@ class Tests_User extends WP_UnitTestCase {
$this->assertTrue( isset( $user->foo ) );
$this->assertEquals( 'foo', $user->foo );
$this->assertSame( 'foo', $user->foo );
}
/**
@@ -269,9 +269,9 @@ class Tests_User extends WP_UnitTestCase {
$user = new WP_User( self::$author_id );
$this->assertTrue( isset( $user->id ) );
$this->assertEquals( $user->ID, $user->id );
$this->assertSame( $user->ID, $user->id );
$user->id = 1234;
$this->assertEquals( $user->ID, $user->id );
$this->assertSame( $user->ID, $user->id );
}
/**
@@ -297,51 +297,51 @@ class Tests_User extends WP_UnitTestCase {
function test_construction() {
$user = new WP_User( self::$author_id );
$this->assertInstanceOf( 'WP_User', $user );
$this->assertEquals( self::$author_id, $user->ID );
$this->assertSame( self::$author_id, $user->ID );
$user2 = new WP_User( 0, $user->user_login );
$this->assertInstanceOf( 'WP_User', $user2 );
$this->assertEquals( self::$author_id, $user2->ID );
$this->assertEquals( $user->user_login, $user2->user_login );
$this->assertSame( self::$author_id, $user2->ID );
$this->assertSame( $user->user_login, $user2->user_login );
$user3 = new WP_User();
$this->assertInstanceOf( 'WP_User', $user3 );
$this->assertEquals( 0, $user3->ID );
$this->assertSame( 0, $user3->ID );
$this->assertFalse( isset( $user3->user_login ) );
$user3->init( $user->data );
$this->assertEquals( self::$author_id, $user3->ID );
$this->assertSame( self::$author_id, $user3->ID );
$user4 = new WP_User( $user->user_login );
$this->assertInstanceOf( 'WP_User', $user4 );
$this->assertEquals( self::$author_id, $user4->ID );
$this->assertEquals( $user->user_login, $user4->user_login );
$this->assertSame( self::$author_id, $user4->ID );
$this->assertSame( $user->user_login, $user4->user_login );
$user5 = new WP_User( null, $user->user_login );
$this->assertInstanceOf( 'WP_User', $user5 );
$this->assertEquals( self::$author_id, $user5->ID );
$this->assertEquals( $user->user_login, $user5->user_login );
$this->assertSame( self::$author_id, $user5->ID );
$this->assertSame( $user->user_login, $user5->user_login );
$user6 = new WP_User( $user );
$this->assertInstanceOf( 'WP_User', $user6 );
$this->assertEquals( self::$author_id, $user6->ID );
$this->assertEquals( $user->user_login, $user6->user_login );
$this->assertSame( self::$author_id, $user6->ID );
$this->assertSame( $user->user_login, $user6->user_login );
$user7 = new WP_User( $user->data );
$this->assertInstanceOf( 'WP_User', $user7 );
$this->assertEquals( self::$author_id, $user7->ID );
$this->assertEquals( $user->user_login, $user7->user_login );
$this->assertSame( self::$author_id, $user7->ID );
$this->assertSame( $user->user_login, $user7->user_login );
}
function test_get() {
$user = new WP_User( self::$author_id );
$this->assertEquals( 'author_login', $user->get( 'user_login' ) );
$this->assertEquals( 'author@email.com', $user->get( 'user_email' ) );
$this->assertSame( 'author_login', $user->get( 'user_login' ) );
$this->assertSame( 'author@email.com', $user->get( 'user_email' ) );
$this->assertEquals( 0, $user->get( 'use_ssl' ) );
$this->assertEquals( '', $user->get( 'field_that_does_not_exist' ) );
$this->assertSame( '', $user->get( 'field_that_does_not_exist' ) );
update_user_meta( self::$author_id, 'dashed-key', 'abcdefg' );
$this->assertEquals( 'abcdefg', $user->get( 'dashed-key' ) );
$this->assertSame( 'abcdefg', $user->get( 'dashed-key' ) );
}
function test_has_prop() {
@@ -358,7 +358,7 @@ class Tests_User extends WP_UnitTestCase {
$user = new WP_User( self::$author_id );
update_user_meta( self::$author_id, 'description', 'about me' );
$this->assertEquals( 'about me', $user->get( 'description' ) );
$this->assertSame( 'about me', $user->get( 'description' ) );
$user_data = array(
'ID' => self::$author_id,
@@ -367,10 +367,10 @@ class Tests_User extends WP_UnitTestCase {
wp_update_user( $user_data );
$user = new WP_User( self::$author_id );
$this->assertEquals( 'test user', $user->get( 'display_name' ) );
$this->assertSame( 'test user', $user->get( 'display_name' ) );
// Make sure there is no collateral damage to fields not in $user_data.
$this->assertEquals( 'about me', $user->get( 'description' ) );
$this->assertSame( 'about me', $user->get( 'description' ) );
// Pass as stdClass.
$user_data = array(
@@ -380,12 +380,12 @@ class Tests_User extends WP_UnitTestCase {
wp_update_user( (object) $user_data );
$user = new WP_User( self::$author_id );
$this->assertEquals( 'a test user', $user->get( 'display_name' ) );
$this->assertSame( 'a test user', $user->get( 'display_name' ) );
$user->display_name = 'some test user';
wp_update_user( $user );
$this->assertEquals( 'some test user', $user->get( 'display_name' ) );
$this->assertSame( 'some test user', $user->get( 'display_name' ) );
// Test update of fields in _get_additional_user_keys().
$user_data = array(
@@ -419,7 +419,7 @@ class Tests_User extends WP_UnitTestCase {
$this->assertNotEmpty( $userdata );
$this->assertInstanceOf( 'WP_User', $userdata );
$this->assertEquals( $userdata->ID, self::$sub_id );
$this->assertSame( $userdata->ID, self::$sub_id );
$prefix = $wpdb->get_blog_prefix();
$cap_key = $prefix . 'capabilities';
$this->assertTrue( isset( $userdata->$cap_key ) );
@@ -471,7 +471,7 @@ class Tests_User extends WP_UnitTestCase {
$this->assertNotEmpty( $authordata );
$this->assertInstanceOf( 'WP_User', $authordata );
$this->assertEquals( $authordata->ID, self::$author_id );
$this->assertSame( $authordata->ID, self::$author_id );
if ( $old_post_id ) {
setup_postdata( get_post( $old_post_id ) );
@@ -498,25 +498,25 @@ class Tests_User extends WP_UnitTestCase {
// @ticket 23480
$user1 = WP_User::get_data_by( 'id', -1 );
$this->assertEquals( false, $user1 );
$this->assertFalse( $user1 );
$user2 = WP_User::get_data_by( 'id', 0 );
$this->assertEquals( false, $user2 );
$this->assertFalse( $user2 );
$user3 = WP_User::get_data_by( 'id', null );
$this->assertEquals( false, $user3 );
$this->assertFalse( $user3 );
$user4 = WP_User::get_data_by( 'id', '' );
$this->assertEquals( false, $user4 );
$this->assertFalse( $user4 );
$user5 = WP_User::get_data_by( 'id', false );
$this->assertEquals( false, $user5 );
$this->assertFalse( $user5 );
$user6 = WP_User::get_data_by( 'id', $user->user_nicename );
$this->assertEquals( false, $user6 );
$this->assertFalse( $user6 );
$user7 = WP_User::get_data_by( 'id', 99999 );
$this->assertEquals( false, $user7 );
$this->assertFalse( $user7 );
}
/**
@@ -585,7 +585,7 @@ class Tests_User extends WP_UnitTestCase {
// Reload the data.
$pwd_after = get_userdata( $testuserid )->user_pass;
$this->assertEquals( $pwd_before, $pwd_after );
$this->assertSame( $pwd_before, $pwd_after );
}
/**
@@ -624,7 +624,7 @@ class Tests_User extends WP_UnitTestCase {
'user_email' => 'taco@burrito.com',
)
);
$this->assertEquals( $id1, email_exists( 'taco@burrito.com' ) );
$this->assertSame( $id1, email_exists( 'taco@burrito.com' ) );
$id2 = wp_insert_user(
array(
@@ -655,7 +655,7 @@ class Tests_User extends WP_UnitTestCase {
'user_email' => 'blackburn@battlefield4.com',
)
);
$this->assertEquals( $id1, email_exists( 'blackburn@battlefield4.com' ) );
$this->assertSame( $id1, email_exists( 'blackburn@battlefield4.com' ) );
$id2 = wp_insert_user(
array(
@@ -664,7 +664,7 @@ class Tests_User extends WP_UnitTestCase {
'user_email' => 'miller@battlefield4.com',
)
);
$this->assertEquals( $id2, email_exists( 'miller@battlefield4.com' ) );
$this->assertSame( $id2, email_exists( 'miller@battlefield4.com' ) );
if ( ! is_wp_error( $id2 ) ) {
wp_update_user(
@@ -673,7 +673,7 @@ class Tests_User extends WP_UnitTestCase {
'user_email' => 'david@battlefield4.com',
)
);
$this->assertEquals( $id2, email_exists( 'david@battlefield4.com' ) );
$this->assertSame( $id2, email_exists( 'david@battlefield4.com' ) );
$return = wp_update_user(
array(
@@ -703,7 +703,7 @@ class Tests_User extends WP_UnitTestCase {
$response = wp_insert_user( $user_data );
$this->assertInstanceOf( 'WP_Error', $response );
$this->assertEquals( 'invalid_username', $response->get_error_code() );
$this->assertSame( 'invalid_username', $response->get_error_code() );
remove_filter( 'illegal_user_logins', array( $this, '_illegal_user_logins' ) );
@@ -723,7 +723,7 @@ class Tests_User extends WP_UnitTestCase {
$response = register_new_user( $user_login, $user_email );
$this->assertInstanceOf( 'WP_Error', $response );
$this->assertEquals( 'invalid_username', $response->get_error_code() );
$this->assertSame( 'invalid_username', $response->get_error_code() );
remove_filter( 'illegal_user_logins', array( $this, '_illegal_user_logins' ) );
@@ -746,13 +746,13 @@ class Tests_User extends WP_UnitTestCase {
$response = wpmu_validate_user_signup( $user_data['user_login'], $user_data['user_email'] );
$this->assertInstanceOf( 'WP_Error', $response['errors'] );
$this->assertEquals( 'user_name', $response['errors']->get_error_code() );
$this->assertSame( 'user_name', $response['errors']->get_error_code() );
remove_filter( 'illegal_user_logins', array( $this, '_illegal_user_logins' ) );
$response = wpmu_validate_user_signup( $user_data['user_login'], $user_data['user_email'] );
$this->assertInstanceOf( 'WP_Error', $response['errors'] );
$this->assertEquals( 0, count( $response['errors']->get_error_codes() ) );
$this->assertSame( 0, count( $response['errors']->get_error_codes() ) );
}
function _illegal_user_logins_data() {
@@ -815,7 +815,7 @@ class Tests_User extends WP_UnitTestCase {
);
$user_id = wp_insert_user( $user_details );
$this->assertEquals( $user_id, email_exists( $user_details['user_email'] ) );
$this->assertSame( $user_id, email_exists( $user_details['user_email'] ) );
// Check that providing an empty password doesn't remove a user's password.
$user_details['ID'] = $user_id;
@@ -1044,7 +1044,7 @@ class Tests_User extends WP_UnitTestCase {
clean_user_cache( $user );
$user = get_userdata( $user->ID );
$this->assertEquals( 'key', $user->user_activation_key );
$this->assertSame( 'key', $user->user_activation_key );
// Check that changing something other than the email doesn't remove the key.
$userdata = array(
@@ -1054,7 +1054,7 @@ class Tests_User extends WP_UnitTestCase {
wp_update_user( $userdata );
$user = get_userdata( $user->ID );
$this->assertEquals( 'key', $user->user_activation_key );
$this->assertSame( 'key', $user->user_activation_key );
// Now check that changing the email does remove it.
$userdata = array(
@@ -1076,7 +1076,7 @@ class Tests_User extends WP_UnitTestCase {
clean_user_cache( $user );
$user = get_userdata( $user->ID );
$this->assertEquals( 'key', $user->user_activation_key );
$this->assertSame( 'key', $user->user_activation_key );
$userdata = array(
'ID' => $user->ID,
@@ -1154,7 +1154,7 @@ class Tests_User extends WP_UnitTestCase {
);
$update = wp_update_user( $userdata );
$this->assertEquals( self::$editor_id, $update );
$this->assertSame( self::$editor_id, $update );
}
/**
@@ -1169,11 +1169,11 @@ class Tests_User extends WP_UnitTestCase {
$update = wp_update_user( $userdata );
// Was this successful?
$this->assertEquals( self::$editor_id, $update );
$this->assertSame( self::$editor_id, $update );
// Verify that the email address has been updated.
$user = get_userdata( self::$editor_id );
$this->assertEquals( $user->user_email, 'test2@test.com' );
$this->assertSame( $user->user_email, 'test2@test.com' );
}
/**
@@ -1468,7 +1468,7 @@ class Tests_User extends WP_UnitTestCase {
$response = edit_user();
$this->assertInstanceOf( 'WP_Error', $response );
$this->assertEquals( 'pass', $response->get_error_code() );
$this->assertSame( 'pass', $response->get_error_code() );
// Check new user with password set.
$_POST['pass1'] = 'password';
@@ -1479,7 +1479,7 @@ class Tests_User extends WP_UnitTestCase {
$this->assertInternalType( 'int', $user_id );
$this->assertInstanceOf( 'WP_User', $user );
$this->assertEquals( 'nickname1', $user->nickname );
$this->assertSame( 'nickname1', $user->nickname );
// Check updating user with empty password.
$_POST['nickname'] = 'nickname_updated';
@@ -1489,7 +1489,7 @@ class Tests_User extends WP_UnitTestCase {
$user_id = edit_user( $user_id );
$this->assertInternalType( 'int', $user_id );
$this->assertEquals( 'nickname_updated', $user->nickname );
$this->assertSame( 'nickname_updated', $user->nickname );
// Check updating user with missing second password.
$_POST['nickname'] = 'nickname_updated2';
@@ -1499,8 +1499,8 @@ class Tests_User extends WP_UnitTestCase {
$response = edit_user( $user_id );
$this->assertInstanceOf( 'WP_Error', $response );
$this->assertEquals( 'pass', $response->get_error_code() );
$this->assertEquals( 'nickname_updated', $user->nickname );
$this->assertSame( 'pass', $response->get_error_code() );
$this->assertSame( 'nickname_updated', $user->nickname );
// Check updating user with empty password via `check_passwords` action.
add_action( 'check_passwords', array( $this, 'action_check_passwords_blank_pw' ), 10, 2 );
@@ -1508,7 +1508,7 @@ class Tests_User extends WP_UnitTestCase {
remove_action( 'check_passwords', array( $this, 'action_check_passwords_blank_pw' ) );
$this->assertInternalType( 'int', $user_id );
$this->assertEquals( 'nickname_updated2', $user->nickname );
$this->assertSame( 'nickname_updated2', $user->nickname );
}
/**
@@ -1547,10 +1547,10 @@ class Tests_User extends WP_UnitTestCase {
// The new email address gets put into user_meta.
$new_email_meta = get_user_meta( $user->ID, '_new_email', true );
$this->assertEquals( 'after@example.com', $new_email_meta['newemail'] );
$this->assertSame( 'after@example.com', $new_email_meta['newemail'] );
// The email address of the user doesn't change. $_POST['email'] should be the email address pre-update.
$this->assertEquals( $_POST['email'], $user->user_email );
$this->assertSame( $_POST['email'], $user->user_email );
}
/**
@@ -1587,7 +1587,7 @@ class Tests_User extends WP_UnitTestCase {
$this->assertEmpty( $new_email_meta );
// $_POST['email'] should be the email address posted from the form.
$this->assertEquals( $_POST['email'], 'after@example.com' );
$this->assertSame( $_POST['email'], 'after@example.com' );
}
/**
@@ -1723,11 +1723,11 @@ class Tests_User extends WP_UnitTestCase {
$this->assertTrue( $actual['done'] );
// Contains 'Community Events Location'.
$this->assertEquals( 'Community Events Location', $actual['data'][1]['group_label'] );
$this->assertSame( 'Community Events Location', $actual['data'][1]['group_label'] );
// Contains location IP.
$this->assertEquals( 'IP', $actual['data'][1]['data'][0]['name'] );
$this->assertEquals( '0.0.0.0', $actual['data'][1]['data'][0]['value'] );
$this->assertSame( 'IP', $actual['data'][1]['data'][0]['name'] );
$this->assertSame( '0.0.0.0', $actual['data'][1]['data'][0]['value'] );
}
/**
@@ -1752,23 +1752,23 @@ class Tests_User extends WP_UnitTestCase {
$this->assertTrue( $actual['done'] );
// Contains 'Community Events Location'.
$this->assertEquals( 'Community Events Location', $actual['data'][1]['group_label'] );
$this->assertSame( 'Community Events Location', $actual['data'][1]['group_label'] );
// Contains location city.
$this->assertEquals( 'City', $actual['data'][1]['data'][0]['name'] );
$this->assertEquals( 'Cincinnati', $actual['data'][1]['data'][0]['value'] );
$this->assertSame( 'City', $actual['data'][1]['data'][0]['name'] );
$this->assertSame( 'Cincinnati', $actual['data'][1]['data'][0]['value'] );
// Contains location country.
$this->assertEquals( 'Country', $actual['data'][1]['data'][1]['name'] );
$this->assertEquals( 'US', $actual['data'][1]['data'][1]['value'] );
$this->assertSame( 'Country', $actual['data'][1]['data'][1]['name'] );
$this->assertSame( 'US', $actual['data'][1]['data'][1]['value'] );
// Contains location latitude.
$this->assertEquals( 'Latitude', $actual['data'][1]['data'][2]['name'] );
$this->assertEquals( '39.1271100', $actual['data'][1]['data'][2]['value'] );
$this->assertSame( 'Latitude', $actual['data'][1]['data'][2]['name'] );
$this->assertSame( '39.1271100', $actual['data'][1]['data'][2]['value'] );
// Contains location longitude.
$this->assertEquals( 'Longitude', $actual['data'][1]['data'][3]['name'] );
$this->assertEquals( '-84.5143900', $actual['data'][1]['data'][3]['value'] );
$this->assertSame( 'Longitude', $actual['data'][1]['data'][3]['name'] );
$this->assertSame( '-84.5143900', $actual['data'][1]['data'][3]['value'] );
}
@@ -1796,23 +1796,23 @@ class Tests_User extends WP_UnitTestCase {
$this->assertTrue( $actual['done'] );
// Contains Session Tokens.
$this->assertEquals( 'Session Tokens', $actual['data'][1]['group_label'] );
$this->assertSame( 'Session Tokens', $actual['data'][1]['group_label'] );
// Contains Expiration.
$this->assertEquals( 'Expiration', $actual['data'][1]['data'][0]['name'] );
$this->assertEquals( 'January 31, 2020 09:13 AM', $actual['data'][1]['data'][0]['value'] );
$this->assertSame( 'Expiration', $actual['data'][1]['data'][0]['name'] );
$this->assertSame( 'January 31, 2020 09:13 AM', $actual['data'][1]['data'][0]['value'] );
// Contains IP.
$this->assertEquals( 'IP', $actual['data'][1]['data'][1]['name'] );
$this->assertEquals( '0.0.0.0', $actual['data'][1]['data'][1]['value'] );
$this->assertSame( 'IP', $actual['data'][1]['data'][1]['name'] );
$this->assertSame( '0.0.0.0', $actual['data'][1]['data'][1]['value'] );
// Contains IP.
$this->assertEquals( 'User Agent', $actual['data'][1]['data'][2]['name'] );
$this->assertEquals( 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36', $actual['data'][1]['data'][2]['value'] );
$this->assertSame( 'User Agent', $actual['data'][1]['data'][2]['name'] );
$this->assertSame( 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36', $actual['data'][1]['data'][2]['value'] );
// Contains IP.
$this->assertEquals( 'Last Login', $actual['data'][1]['data'][3]['name'] );
$this->assertEquals( 'January 29, 2020 09:13 AM', $actual['data'][1]['data'][3]['value'] );
$this->assertSame( 'Last Login', $actual['data'][1]['data'][3]['name'] );
$this->assertSame( 'January 29, 2020 09:13 AM', $actual['data'][1]['data'][3]['value'] );
}
/**