Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #1797370 by xjm: Remove t() from assertion messages in tests for the openid module.

8.0.x
Dries 2012-09-28 10:20:55 -04:00
parent 88209f1e0e
commit 5c39787962
4 changed files with 103 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
core/modules/openid/lib/Drupal/openid/Tests/OpenIDFunctionalTest.php
View File

@ -140,8 +140,8 @@ class OpenIDFunctionalTest extends OpenIDTestBase {
$this->addIdentity($identity); $this->addIdentity($identity);
$response = variable_get('openid_test_hook_openid_response_response'); $response = variable_get('openid_test_hook_openid_response_response');
$account = variable_get('openid_test_hook_openid_response_account'); $account = variable_get('openid_test_hook_openid_response_account');
$this->assertEqual($response['openid.claimed_id'], $identity, t('hook_openid_response() was invoked.')); $this->assertEqual($response['openid.claimed_id'], $identity, 'hook_openid_response() was invoked.');
$this->assertEqual($account->uid, $this->web_user->uid, t('Proper user object passed to hook_openid_response().')); $this->assertEqual($account->uid, $this->web_user->uid, 'Proper user object passed to hook_openid_response().');
$this->drupalLogout(); $this->drupalLogout();
@ -149,11 +149,11 @@ class OpenIDFunctionalTest extends OpenIDTestBase {
variable_del('openid_test_hook_openid_response_response'); variable_del('openid_test_hook_openid_response_response');
variable_del('openid_test_hook_openid_response_account'); variable_del('openid_test_hook_openid_response_account');
$this->submitLoginForm($identity); $this->submitLoginForm($identity);
$this->assertLink(t('Log out'), 0, t('User was logged in.')); $this->assertLink(t('Log out'), 0, 'User was logged in.');
$response = variable_get('openid_test_hook_openid_response_response'); $response = variable_get('openid_test_hook_openid_response_response');
$account = variable_get('openid_test_hook_openid_response_account'); $account = variable_get('openid_test_hook_openid_response_account');
$this->assertEqual($response['openid.claimed_id'], $identity, t('hook_openid_response() was invoked.')); $this->assertEqual($response['openid.claimed_id'], $identity, 'hook_openid_response() was invoked.');
$this->assertEqual($account->uid, $this->web_user->uid, t('Proper user object passed to hook_openid_response().')); $this->assertEqual($account->uid, $this->web_user->uid, 'Proper user object passed to hook_openid_response().');
$this->drupalLogout(); $this->drupalLogout();
@ -162,12 +162,12 @@ class OpenIDFunctionalTest extends OpenIDTestBase {
$this->drupalPost('user/login', $edit, t('Log in')); $this->drupalPost('user/login', $edit, t('Log in'));
// Check we are on the OpenID redirect form. // Check we are on the OpenID redirect form.
$this->assertTitle(t('OpenID redirect'), t('OpenID redirect page was displayed.')); $this->assertTitle(t('OpenID redirect'), 'OpenID redirect page was displayed.');
// Submit form to the OpenID Provider Endpoint. // Submit form to the OpenID Provider Endpoint.
$this->drupalPost(NULL, array(), t('Send')); $this->drupalPost(NULL, array(), t('Send'));
$this->assertLink(t('Log out'), 0, t('User was logged in.')); $this->assertLink(t('Log out'), 0, 'User was logged in.');
// Verify user was redirected away from user/login to an accessible page. // Verify user was redirected away from user/login to an accessible page.
$this->assertResponse(200); $this->assertResponse(200);
@ -179,9 +179,9 @@ class OpenIDFunctionalTest extends OpenIDTestBase {
variable_set('openid_test_identity', $new_identity); variable_set('openid_test_identity', $new_identity);
variable_set('openid_test_request_alter', array('checkid_setup' => array('openid.identity' => $new_identity))); variable_set('openid_test_request_alter', array('checkid_setup' => array('openid.identity' => $new_identity)));
$this->submitLoginForm($identity); $this->submitLoginForm($identity);
$this->assertLink(t('Log out'), 0, t('User was logged in.')); $this->assertLink(t('Log out'), 0, 'User was logged in.');
$response = variable_get('openid_test_hook_openid_response_response'); $response = variable_get('openid_test_hook_openid_response_response');
$this->assertEqual($response['openid.identity'], $new_identity, t('hook_openid_request_alter() were invoked.')); $this->assertEqual($response['openid.identity'], $new_identity, 'hook_openid_request_alter() were invoked.');
} }
/** /**
@ -204,12 +204,12 @@ class OpenIDFunctionalTest extends OpenIDTestBase {
$this->drupalPost('user/login', $edit, t('Log in')); $this->drupalPost('user/login', $edit, t('Log in'));
// Check we are on the OpenID redirect form. // Check we are on the OpenID redirect form.
$this->assertTitle(t('OpenID redirect'), t('OpenID redirect page was displayed.')); $this->assertTitle(t('OpenID redirect'), 'OpenID redirect page was displayed.');
// Submit form to the OpenID Provider Endpoint. // Submit form to the OpenID Provider Endpoint.
$this->drupalPost(NULL, array(), t('Send')); $this->drupalPost(NULL, array(), t('Send'));
$this->assertLink(t('Log out'), 0, t('User was logged in.')); $this->assertLink(t('Log out'), 0, 'User was logged in.');
// Verify user was redirected away from user/login to an accessible page. // Verify user was redirected away from user/login to an accessible page.
$this->assertText(t('Operating in maintenance mode.')); $this->assertText(t('Operating in maintenance mode.'));
@ -225,14 +225,14 @@ class OpenIDFunctionalTest extends OpenIDTestBase {
// Add identity to user's profile. // Add identity to user's profile.
$identity = url('openid-test/yadis/xrds', array('absolute' => TRUE)); $identity = url('openid-test/yadis/xrds', array('absolute' => TRUE));
$this->addIdentity($identity); $this->addIdentity($identity);
$this->assertText($identity, t('Identity appears in list.')); $this->assertText($identity, 'Identity appears in list.');
// Delete the newly added identity. // Delete the newly added identity.
$this->clickLink(t('Delete')); $this->clickLink(t('Delete'));
$this->drupalPost(NULL, array(), t('Confirm')); $this->drupalPost(NULL, array(), t('Confirm'));
$this->assertText(t('OpenID deleted.'), t('Identity deleted')); $this->assertText(t('OpenID deleted.'), 'Identity deleted');
$this->assertNoText($identity, t('Identity no longer appears in list.')); $this->assertNoText($identity, 'Identity no longer appears in list.');
} }
/** /**
@ -256,11 +256,11 @@ class OpenIDFunctionalTest extends OpenIDTestBase {
'accounts[' . $this->web_user->uid . ']' => TRUE, 'accounts[' . $this->web_user->uid . ']' => TRUE,
); );
$this->drupalPost('admin/people', $edit, t('Update')); $this->drupalPost('admin/people', $edit, t('Update'));
$this->assertRaw('The update has been performed.', t('Account was blocked.')); $this->assertRaw('The update has been performed.', 'Account was blocked.');
$this->drupalLogout(); $this->drupalLogout();
$this->submitLoginForm($identity); $this->submitLoginForm($identity);
$this->assertRaw(t('The username %name has not been activated or is blocked.', array('%name' => $this->web_user->name)), t('User login was blocked.')); $this->assertRaw(t('The username %name has not been activated or is blocked.', array('%name' => $this->web_user->name)), 'User login was blocked.');
} }
/** /**
@ -284,14 +284,14 @@ class OpenIDFunctionalTest extends OpenIDTestBase {
$this->drupalPost('user/' . $this->web_user->uid . '/openid', $edit, t('Add an OpenID')); $this->drupalPost('user/' . $this->web_user->uid . '/openid', $edit, t('Add an OpenID'));
if ($claimed_id === FALSE) { if ($claimed_id === FALSE) {
$this->assertRaw(t('Sorry, that is not a valid OpenID. Ensure you have spelled your ID correctly.'), t('Invalid identity was rejected.')); $this->assertRaw(t('Sorry, that is not a valid OpenID. Ensure you have spelled your ID correctly.'), 'Invalid identity was rejected.');
return; return;
} }
// OpenID 1 used a HTTP redirect, OpenID 2 uses a HTML form that is submitted automatically using JavaScript. // OpenID 1 used a HTTP redirect, OpenID 2 uses a HTML form that is submitted automatically using JavaScript.
if ($version == 2) { if ($version == 2) {
// Check we are on the OpenID redirect form. // Check we are on the OpenID redirect form.
$this->assertTitle(t('OpenID redirect'), t('OpenID redirect page was displayed.')); $this->assertTitle(t('OpenID redirect'), 'OpenID redirect page was displayed.');
// Submit form to the OpenID Provider Endpoint. // Submit form to the OpenID Provider Endpoint.
$this->drupalPost(NULL, array(), t('Send')); $this->drupalPost(NULL, array(), t('Send'));
@ -300,7 +300,7 @@ class OpenIDFunctionalTest extends OpenIDTestBase {
if (!isset($claimed_id)) { if (!isset($claimed_id)) {
$claimed_id = $identity; $claimed_id = $identity;
} }
$this->assertRaw(t('Successfully added %identity', array('%identity' => $claimed_id)), t('Identity %identity was added.', array('%identity' => $identity))); $this->assertRaw(t('Successfully added %identity', array('%identity' => $claimed_id)), format_string('Identity %identity was added.', array('%identity' => $identity)));
} }
/** /**
@ -373,8 +373,8 @@ class OpenIDFunctionalTest extends OpenIDTestBase {
variable_set('openid_test_response', $response); variable_set('openid_test_response', $response);
$this->submitLoginForm($identity); $this->submitLoginForm($identity);
$this->assertNoRaw('OpenID login failed.'); $this->assertNoRaw('OpenID login failed.');
$this->assertFieldByName('name', '', t('No username was supplied by provider.')); $this->assertFieldByName('name', '', 'No username was supplied by provider.');
$this->assertFieldByName('mail', '', t('No e-mail address was supplied by provider.')); $this->assertFieldByName('mail', '', 'No e-mail address was supplied by provider.');
// Check that unsigned SREG fields are ignored. // Check that unsigned SREG fields are ignored.
$response = array( $response = array(
@ -385,7 +385,7 @@ class OpenIDFunctionalTest extends OpenIDTestBase {
variable_set('openid_test_response', $response); variable_set('openid_test_response', $response);
$this->submitLoginForm($identity); $this->submitLoginForm($identity);
$this->assertNoRaw('OpenID login failed.'); $this->assertNoRaw('OpenID login failed.');
$this->assertFieldByName('name', 'john', t('Username was supplied by provider.')); $this->assertFieldByName('name', 'john', 'Username was supplied by provider.');
$this->assertFieldByName('mail', '', t('E-mail address supplied by provider was ignored.')); $this->assertFieldByName('mail', '', 'E-mail address supplied by provider was ignored.');
} }
} }

82
core/modules/openid/lib/Drupal/openid/Tests/OpenIDRegistrationTest.php
View File

@ -68,16 +68,16 @@ class OpenIDRegistrationTest extends OpenIDTestBase {
// Use a User-supplied Identity that is the URL of an XRDS document. // Use a User-supplied Identity that is the URL of an XRDS document.
$identity = url('openid-test/yadis/xrds', array('absolute' => TRUE)); $identity = url('openid-test/yadis/xrds', array('absolute' => TRUE));
$this->submitLoginForm($identity); $this->submitLoginForm($identity);
$this->assertRaw(t('Once you have verified your e-mail address, you may log in via OpenID.'), t('User was asked to verify e-mail address.')); $this->assertRaw(t('Once you have verified your e-mail address, you may log in via OpenID.'), 'User was asked to verify e-mail address.');
$this->assertRaw(t('A welcome message with further instructions has been sent to your e-mail address.'), t('A welcome message was sent to the user.')); $this->assertRaw(t('A welcome message with further instructions has been sent to your e-mail address.'), 'A welcome message was sent to the user.');
$reset_url = $this->getPasswordResetURLFromMail(); $reset_url = $this->getPasswordResetURLFromMail();
$user = user_load_by_name('john'); $user = user_load_by_name('john');
$this->assertTrue($user, t('User was registered with right username.')); $this->assertTrue($user, 'User was registered with right username.');
$this->assertEqual($user->mail, 'john@example.com', t('User was registered with right email address.')); $this->assertEqual($user->mail, 'john@example.com', 'User was registered with right email address.');
$this->assertEqual($user->timezone, 'Europe/London', t('User was registered with right timezone.')); $this->assertEqual($user->timezone, 'Europe/London', 'User was registered with right timezone.');
$this->assertEqual($user->preferred_langcode, 'pt', t('User was registered with right language.')); $this->assertEqual($user->preferred_langcode, 'pt', 'User was registered with right language.');
$this->assertFalse($user->data, t('No additional user info was saved.')); $this->assertFalse($user->data, 'No additional user info was saved.');
$this->submitLoginForm($identity); $this->submitLoginForm($identity);
$this->assertRaw(t('You must validate your email address for this account before logging in via OpenID.')); $this->assertRaw(t('You must validate your email address for this account before logging in via OpenID.'));
@ -90,7 +90,7 @@ class OpenIDRegistrationTest extends OpenIDTestBase {
// Verify that the account was activated. // Verify that the account was activated.
$this->submitLoginForm($identity); $this->submitLoginForm($identity);
$this->assertLink(t('Log out'), 0, t('User was logged in.')); $this->assertLink(t('Log out'), 0, 'User was logged in.');
} }
/** /**
@ -119,19 +119,19 @@ class OpenIDRegistrationTest extends OpenIDTestBase {
// Use a User-supplied Identity that is the URL of an XRDS document. // Use a User-supplied Identity that is the URL of an XRDS document.
$identity = url('openid-test/yadis/xrds', array('absolute' => TRUE)); $identity = url('openid-test/yadis/xrds', array('absolute' => TRUE));
$this->submitLoginForm($identity); $this->submitLoginForm($identity);
$this->assertLink(t('Log out'), 0, t('User was logged in.')); $this->assertLink(t('Log out'), 0, 'User was logged in.');
$user = user_load_by_name('john'); $user = user_load_by_name('john');
$this->assertTrue($user, t('User was registered with right username.')); $this->assertTrue($user, 'User was registered with right username.');
$this->assertEqual($user->mail, 'john@example.com', t('User was registered with right email address.')); $this->assertEqual($user->mail, 'john@example.com', 'User was registered with right email address.');
$this->assertEqual($user->timezone, 'Europe/London', t('User was registered with right timezone.')); $this->assertEqual($user->timezone, 'Europe/London', 'User was registered with right timezone.');
$this->assertEqual($user->preferred_langcode, 'pt-br', t('User was registered with right language.')); $this->assertEqual($user->preferred_langcode, 'pt-br', 'User was registered with right language.');
$this->assertFalse($user->data, t('No additional user info was saved.')); $this->assertFalse($user->data, 'No additional user info was saved.');
$this->drupalLogout(); $this->drupalLogout();
$this->submitLoginForm($identity); $this->submitLoginForm($identity);
$this->assertLink(t('Log out'), 0, t('User was logged in.')); $this->assertLink(t('Log out'), 0, 'User was logged in.');
} }
/** /**
@ -155,34 +155,34 @@ class OpenIDRegistrationTest extends OpenIDTestBase {
$identity = url('openid-test/yadis/xrds', array('absolute' => TRUE)); $identity = url('openid-test/yadis/xrds', array('absolute' => TRUE));
$this->submitLoginForm($identity); $this->submitLoginForm($identity);
$this->assertRaw(t('Account registration using the information provided by your OpenID provider failed due to the reasons listed below. Complete the registration by filling out the form below. If you already have an account, you can <a href="@login">log in</a> now and add your OpenID under "My account".', array('@login' => url('user/login'))), t('User was asked to complete the registration process manually.')); $this->assertRaw(t('Account registration using the information provided by your OpenID provider failed due to the reasons listed below. Complete the registration by filling out the form below. If you already have an account, you can <a href="@login">log in</a> now and add your OpenID under "My account".', array('@login' => url('user/login'))), 'User was asked to complete the registration process manually.');
$this->assertRaw(t('The name %name is already taken.', array('%name' => $web_user->name)), t('Form validation error for username was displayed.')); $this->assertRaw(t('The name %name is already taken.', array('%name' => $web_user->name)), 'Form validation error for username was displayed.');
$this->assertRaw(t('The e-mail address %mail is not valid.', array('%mail' => 'mail@invalid#')), t('Form validation error for e-mail address was displayed.')); $this->assertRaw(t('The e-mail address %mail is not valid.', array('%mail' => 'mail@invalid#')), 'Form validation error for e-mail address was displayed.');
$this->assertTrue(variable_get('openid_test_hook_openid_response_response'), t('hook_openid_response() was invoked.')); $this->assertTrue(variable_get('openid_test_hook_openid_response_response'), 'hook_openid_response() was invoked.');
$this->assertFalse(variable_get('openid_test_hook_openid_response_account', TRUE), t('No user object passed to hook_openid_response().')); $this->assertFalse(variable_get('openid_test_hook_openid_response_account', TRUE), 'No user object passed to hook_openid_response().');
// Enter username and e-mail address manually. // Enter username and e-mail address manually.
variable_del('openid_test_hook_openid_response_response'); variable_del('openid_test_hook_openid_response_response');
$edit = array('name' => 'john', 'mail' => 'john@example.com'); $edit = array('name' => 'john', 'mail' => 'john@example.com');
$this->drupalPost(NULL, $edit, t('Create new account')); $this->drupalPost(NULL, $edit, t('Create new account'));
$this->assertRaw(t('Once you have verified your e-mail address, you may log in via OpenID.'), t('User was asked to verify e-mail address.')); $this->assertRaw(t('Once you have verified your e-mail address, you may log in via OpenID.'), 'User was asked to verify e-mail address.');
$reset_url = $this->getPasswordResetURLFromMail(); $reset_url = $this->getPasswordResetURLFromMail();
$user = user_load_by_name('john'); $user = user_load_by_name('john');
$this->assertTrue($user, t('User was registered with right username.')); $this->assertTrue($user, 'User was registered with right username.');
$this->assertEqual($user->preferred_langcode, language_default()->langcode, t('User language is site default.')); $this->assertEqual($user->preferred_langcode, language_default()->langcode, 'User language is site default.');
$this->assertFalse($user->data, t('No additional user info was saved.')); $this->assertFalse($user->data, 'No additional user info was saved.');
// Follow the one-time login that was sent in the welcome e-mail. // Follow the one-time login that was sent in the welcome e-mail.
$this->drupalGet($reset_url); $this->drupalGet($reset_url);
$this->drupalPost(NULL, array(), t('Log in')); $this->drupalPost(NULL, array(), t('Log in'));
$this->assertFalse(variable_get('openid_test_hook_openid_response_response'), t('hook_openid_response() was not invoked.')); $this->assertFalse(variable_get('openid_test_hook_openid_response_response'), 'hook_openid_response() was not invoked.');
// The user is taken to user/%uid/edit. // The user is taken to user/%uid/edit.
$this->assertFieldByName('mail', 'john@example.com', t('User was registered with right e-mail address.')); $this->assertFieldByName('mail', 'john@example.com', 'User was registered with right e-mail address.');
$this->clickLink(t('OpenID identities')); $this->clickLink(t('OpenID identities'));
$this->assertRaw($identity, t('OpenID identity was registered.')); $this->assertRaw($identity, 'OpenID identity was registered.');
} }
/** /**
@ -198,30 +198,30 @@ class OpenIDRegistrationTest extends OpenIDTestBase {
// Use a User-supplied Identity that is the URL of an XRDS document. // Use a User-supplied Identity that is the URL of an XRDS document.
$identity = url('openid-test/yadis/xrds', array('absolute' => TRUE)); $identity = url('openid-test/yadis/xrds', array('absolute' => TRUE));
$this->submitLoginForm($identity); $this->submitLoginForm($identity);
$this->assertRaw(t('Complete the registration by filling out the form below. If you already have an account, you can <a href="@login">log in</a> now and add your OpenID under "My account".', array('@login' => url('user/login'))), t('User was asked to complete the registration process manually.')); $this->assertRaw(t('Complete the registration by filling out the form below. If you already have an account, you can <a href="@login">log in</a> now and add your OpenID under "My account".', array('@login' => url('user/login'))), 'User was asked to complete the registration process manually.');
$this->assertNoRaw(t('You must enter a username.'), t('Form validation error for username was not displayed.')); $this->assertNoRaw(t('You must enter a username.'), 'Form validation error for username was not displayed.');
$this->assertNoRaw(t('You must enter an e-mail address.'), t('Form validation error for e-mail address was not displayed.')); $this->assertNoRaw(t('You must enter an e-mail address.'), 'Form validation error for e-mail address was not displayed.');
// Enter username and e-mail address manually. // Enter username and e-mail address manually.
$edit = array('name' => 'john', 'mail' => 'john@example.com'); $edit = array('name' => 'john', 'mail' => 'john@example.com');
$this->drupalPost(NULL, $edit, t('Create new account')); $this->drupalPost(NULL, $edit, t('Create new account'));
$this->assertRaw(t('Once you have verified your e-mail address, you may log in via OpenID.'), t('User was asked to verify e-mail address.')); $this->assertRaw(t('Once you have verified your e-mail address, you may log in via OpenID.'), 'User was asked to verify e-mail address.');
$reset_url = $this->getPasswordResetURLFromMail(); $reset_url = $this->getPasswordResetURLFromMail();
$user = user_load_by_name('john'); $user = user_load_by_name('john');
$this->assertTrue($user, t('User was registered with right username.')); $this->assertTrue($user, 'User was registered with right username.');
$this->assertEqual($user->preferred_langcode, language_default()->langcode, t('User language is site default.')); $this->assertEqual($user->preferred_langcode, language_default()->langcode, 'User language is site default.');
$this->assertFalse($user->data, t('No additional user info was saved.')); $this->assertFalse($user->data, 'No additional user info was saved.');
// Follow the one-time login that was sent in the welcome e-mail. // Follow the one-time login that was sent in the welcome e-mail.
$this->drupalGet($reset_url); $this->drupalGet($reset_url);
$this->drupalPost(NULL, array(), t('Log in')); $this->drupalPost(NULL, array(), t('Log in'));
// The user is taken to user/%uid/edit. // The user is taken to user/%uid/edit.
$this->assertFieldByName('mail', 'john@example.com', t('User was registered with right e-mail address.')); $this->assertFieldByName('mail', 'john@example.com', 'User was registered with right e-mail address.');
$this->clickLink(t('OpenID identities')); $this->clickLink(t('OpenID identities'));
$this->assertRaw($identity, t('OpenID identity was registered.')); $this->assertRaw($identity, 'OpenID identity was registered.');
} }
/** /**
@ -260,12 +260,12 @@ class OpenIDRegistrationTest extends OpenIDTestBase {
// Use a User-supplied Identity that is the URL of an XRDS document. // Use a User-supplied Identity that is the URL of an XRDS document.
$identity = url('openid-test/yadis/xrds', array('absolute' => TRUE)); $identity = url('openid-test/yadis/xrds', array('absolute' => TRUE));
$this->submitLoginForm($identity); $this->submitLoginForm($identity);
$this->assertLink(t('Log out'), 0, t('User was logged in.')); $this->assertLink(t('Log out'), 0, 'User was logged in.');
$user = user_load_by_name('john'); $user = user_load_by_name('john');
$this->assertTrue($user, t('User was registered with right username.')); $this->assertTrue($user, 'User was registered with right username.');
$this->assertEqual($user->mail, 'john@example.com', t('User was registered with right email address.')); $this->assertEqual($user->mail, 'john@example.com', 'User was registered with right email address.');
$this->assertEqual($user->timezone, 'Europe/London', t('User was registered with right timezone.')); $this->assertEqual($user->timezone, 'Europe/London', 'User was registered with right timezone.');
$this->assertEqual($user->preferred_langcode, 'pt-pt', t('User was registered with right language.')); $this->assertEqual($user->preferred_langcode, 'pt-pt', 'User was registered with right language.');
} }
} }

76
core/modules/openid/lib/Drupal/openid/Tests/OpenIDTest.php
View File

@ -39,25 +39,25 @@ class OpenIDTest extends WebTestBase {
* Test _openid_dh_XXX_to_XXX() functions. * Test _openid_dh_XXX_to_XXX() functions.
*/ */
function testConversion() { function testConversion() {
$this->assertEqual(_openid_dh_long_to_base64('12345678901234567890123456789012345678901234567890'), 'CHJ/Y2mq+DyhUCZ0evjH8ZbOPwrS', t('_openid_dh_long_to_base64() returned expected result.')); $this->assertEqual(_openid_dh_long_to_base64('12345678901234567890123456789012345678901234567890'), 'CHJ/Y2mq+DyhUCZ0evjH8ZbOPwrS', '_openid_dh_long_to_base64() returned expected result.');
$this->assertEqual(_openid_dh_base64_to_long('BsH/g8Nrpn2dtBSdu/sr1y8hxwyx'), '09876543210987654321098765432109876543210987654321', t('_openid_dh_base64_to_long() returned expected result.')); $this->assertEqual(_openid_dh_base64_to_long('BsH/g8Nrpn2dtBSdu/sr1y8hxwyx'), '09876543210987654321098765432109876543210987654321', '_openid_dh_base64_to_long() returned expected result.');
$this->assertEqual(_openid_dh_long_to_binary('12345678901234567890123456789012345678901234567890'), "\x08r\x7fci\xaa\xf8<\xa1P&tz\xf8\xc7\xf1\x96\xce?\x0a\xd2", t('_openid_dh_long_to_binary() returned expected result.')); $this->assertEqual(_openid_dh_long_to_binary('12345678901234567890123456789012345678901234567890'), "\x08r\x7fci\xaa\xf8<\xa1P&tz\xf8\xc7\xf1\x96\xce?\x0a\xd2", '_openid_dh_long_to_binary() returned expected result.');
$this->assertEqual(_openid_dh_binary_to_long("\x06\xc1\xff\x83\xc3k\xa6}\x9d\xb4\x14\x9d\xbb\xfb+\xd7/!\xc7\x0c\xb1"), '09876543210987654321098765432109876543210987654321', t('_openid_dh_binary_to_long() returned expected result.')); $this->assertEqual(_openid_dh_binary_to_long("\x06\xc1\xff\x83\xc3k\xa6}\x9d\xb4\x14\x9d\xbb\xfb+\xd7/!\xc7\x0c\xb1"), '09876543210987654321098765432109876543210987654321', '_openid_dh_binary_to_long() returned expected result.');
} }
/** /**
* Test _openid_dh_xorsecret(). * Test _openid_dh_xorsecret().
*/ */
function testOpenidDhXorsecret() { function testOpenidDhXorsecret() {
$this->assertEqual(_openid_dh_xorsecret('123456790123456790123456790', "abc123ABC\x00\xFF"), "\xa4'\x06\xbe\xf1.\x00y\xff\xc2\xc1", t('_openid_dh_xorsecret() returned expected result.')); $this->assertEqual(_openid_dh_xorsecret('123456790123456790123456790', "abc123ABC\x00\xFF"), "\xa4'\x06\xbe\xf1.\x00y\xff\xc2\xc1", '_openid_dh_xorsecret() returned expected result.');
} }
/** /**
* Test _openid_get_bytes(). * Test _openid_get_bytes().
*/ */
function testOpenidGetBytes() { function testOpenidGetBytes() {
$this->assertEqual(strlen(_openid_get_bytes(20)), 20, t('_openid_get_bytes() returned expected result.')); $this->assertEqual(strlen(_openid_get_bytes(20)), 20, '_openid_get_bytes() returned expected result.');
} }
/** /**
@ -77,7 +77,7 @@ class OpenIDTest extends WebTestBase {
); );
$association = new stdClass(); $association = new stdClass();
$association->mac_key = "1234567890abcdefghij\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\xF0\xF1\xF2\xF3\xF4\xF5\xF6\xF7\xF8\xF9"; $association->mac_key = "1234567890abcdefghij\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\xF0\xF1\xF2\xF3\xF4\xF5\xF6\xF7\xF8\xF9";
$this->assertEqual(_openid_signature($association, $response, array('foo', 'bar')), 'QnKZQzSFstT+GNiJDFOptdcZjrc=', t('Expected signature calculated.')); $this->assertEqual(_openid_signature($association, $response, array('foo', 'bar')), 'QnKZQzSFstT+GNiJDFOptdcZjrc=', 'Expected signature calculated.');
} }
/** /**
@ -88,26 +88,26 @@ class OpenIDTest extends WebTestBase {
// section 7.2. If the user-supplied string starts with xri:// it should be // section 7.2. If the user-supplied string starts with xri:// it should be
// stripped and the resulting string should be treated as an XRI when it // stripped and the resulting string should be treated as an XRI when it
// starts with "=", "@", "+", "$", "!" or "(". // starts with "=", "@", "+", "$", "!" or "(".
$this->assertTrue(_openid_is_xri('xri://=foo'), t('_openid_is_xri() returned expected result for an xri identifier with xri scheme.')); $this->assertTrue(_openid_is_xri('xri://=foo'), '_openid_is_xri() returned expected result for an xri identifier with xri scheme.');
$this->assertTrue(_openid_is_xri('xri://@foo'), t('_openid_is_xri() returned expected result for an xri identifier with xri scheme.')); $this->assertTrue(_openid_is_xri('xri://@foo'), '_openid_is_xri() returned expected result for an xri identifier with xri scheme.');
$this->assertTrue(_openid_is_xri('xri://+foo'), t('_openid_is_xri() returned expected result for an xri identifier with xri scheme.')); $this->assertTrue(_openid_is_xri('xri://+foo'), '_openid_is_xri() returned expected result for an xri identifier with xri scheme.');
$this->assertTrue(_openid_is_xri('xri://$foo'), t('_openid_is_xri() returned expected result for an xri identifier with xri scheme.')); $this->assertTrue(_openid_is_xri('xri://$foo'), '_openid_is_xri() returned expected result for an xri identifier with xri scheme.');
$this->assertTrue(_openid_is_xri('xri://!foo'), t('_openid_is_xri() returned expected result for an xri identifier with xri scheme..')); $this->assertTrue(_openid_is_xri('xri://!foo'), '_openid_is_xri() returned expected result for an xri identifier with xri scheme..');
$this->assertTrue(_openid_is_xri('xri://(foo'), t('_openid_is_xri() returned expected result for an xri identifier with xri scheme..')); $this->assertTrue(_openid_is_xri('xri://(foo'), '_openid_is_xri() returned expected result for an xri identifier with xri scheme..');
$this->assertTrue(_openid_is_xri('=foo'), t('_openid_is_xri() returned expected result for an xri identifier.')); $this->assertTrue(_openid_is_xri('=foo'), '_openid_is_xri() returned expected result for an xri identifier.');
$this->assertTrue(_openid_is_xri('@foo'), t('_openid_is_xri() returned expected result for an xri identifier.')); $this->assertTrue(_openid_is_xri('@foo'), '_openid_is_xri() returned expected result for an xri identifier.');
$this->assertTrue(_openid_is_xri('+foo'), t('_openid_is_xri() returned expected result for an xri identifier.')); $this->assertTrue(_openid_is_xri('+foo'), '_openid_is_xri() returned expected result for an xri identifier.');
$this->assertTrue(_openid_is_xri('$foo'), t('_openid_is_xri() returned expected result for an xri identifier.')); $this->assertTrue(_openid_is_xri('$foo'), '_openid_is_xri() returned expected result for an xri identifier.');
$this->assertTrue(_openid_is_xri('!foo'), t('_openid_is_xri() returned expected result for an xri identifier.')); $this->assertTrue(_openid_is_xri('!foo'), '_openid_is_xri() returned expected result for an xri identifier.');
$this->assertTrue(_openid_is_xri('(foo'), t('_openid_is_xri() returned expected result for an xri identifier.')); $this->assertTrue(_openid_is_xri('(foo'), '_openid_is_xri() returned expected result for an xri identifier.');
$this->assertFalse(_openid_is_xri('foo'), t('_openid_is_xri() returned expected result for an http URL.')); $this->assertFalse(_openid_is_xri('foo'), '_openid_is_xri() returned expected result for an http URL.');
$this->assertFalse(_openid_is_xri('xri://foo'), t('_openid_is_xri() returned expected result for an http URL.')); $this->assertFalse(_openid_is_xri('xri://foo'), '_openid_is_xri() returned expected result for an http URL.');
$this->assertFalse(_openid_is_xri('http://foo/'), t('_openid_is_xri() returned expected result for an http URL.')); $this->assertFalse(_openid_is_xri('http://foo/'), '_openid_is_xri() returned expected result for an http URL.');
$this->assertFalse(_openid_is_xri('http://example.com/'), t('_openid_is_xri() returned expected result for an http URL.')); $this->assertFalse(_openid_is_xri('http://example.com/'), '_openid_is_xri() returned expected result for an http URL.');
$this->assertFalse(_openid_is_xri('user@example.com/'), t('_openid_is_xri() returned expected result for an http URL.')); $this->assertFalse(_openid_is_xri('user@example.com/'), '_openid_is_xri() returned expected result for an http URL.');
$this->assertFalse(_openid_is_xri('http://user@example.com/'), t('_openid_is_xri() returned expected result for an http URL.')); $this->assertFalse(_openid_is_xri('http://user@example.com/'), '_openid_is_xri() returned expected result for an http URL.');
} }
/** /**
@ -117,16 +117,16 @@ class OpenIDTest extends WebTestBase {
// Test that the normalization is according to OpenID Authentication 2.0, // Test that the normalization is according to OpenID Authentication 2.0,
// section 7.2 and 11.5.2. // section 7.2 and 11.5.2.
$this->assertEqual(openid_normalize('$foo'), '$foo', t('openid_normalize() correctly normalized an XRI.')); $this->assertEqual(openid_normalize('$foo'), '$foo', 'openid_normalize() correctly normalized an XRI.');
$this->assertEqual(openid_normalize('xri://$foo'), '$foo', t('openid_normalize() correctly normalized an XRI with an xri:// scheme.')); $this->assertEqual(openid_normalize('xri://$foo'), '$foo', 'openid_normalize() correctly normalized an XRI with an xri:// scheme.');
$this->assertEqual(openid_normalize('example.com/'), 'http://example.com/', t('openid_normalize() correctly normalized a URL with a missing scheme.')); $this->assertEqual(openid_normalize('example.com/'), 'http://example.com/', 'openid_normalize() correctly normalized a URL with a missing scheme.');
$this->assertEqual(openid_normalize('example.com'), 'http://example.com/', t('openid_normalize() correctly normalized a URL with a missing scheme and empty path.')); $this->assertEqual(openid_normalize('example.com'), 'http://example.com/', 'openid_normalize() correctly normalized a URL with a missing scheme and empty path.');
$this->assertEqual(openid_normalize('http://example.com'), 'http://example.com/', t('openid_normalize() correctly normalized a URL with an empty path.')); $this->assertEqual(openid_normalize('http://example.com'), 'http://example.com/', 'openid_normalize() correctly normalized a URL with an empty path.');
$this->assertEqual(openid_normalize('http://example.com/path'), 'http://example.com/path', t('openid_normalize() correctly normalized a URL with a path.')); $this->assertEqual(openid_normalize('http://example.com/path'), 'http://example.com/path', 'openid_normalize() correctly normalized a URL with a path.');
$this->assertEqual(openid_normalize('http://example.com/path#fragment'), 'http://example.com/path', t('openid_normalize() correctly normalized a URL with a fragment.')); $this->assertEqual(openid_normalize('http://example.com/path#fragment'), 'http://example.com/path', 'openid_normalize() correctly normalized a URL with a fragment.');
} }
/** /**
@ -145,24 +145,24 @@ class OpenIDTest extends WebTestBase {
); );
$values = openid_extract_namespace($response, 'http://example.com/ns/dummy', NULL, FALSE); $values = openid_extract_namespace($response, 'http://example.com/ns/dummy', NULL, FALSE);
$this->assertEqual($values, array(), t('Nothing found for unused namespace.')); $this->assertEqual($values, array(), 'Nothing found for unused namespace.');
$values = openid_extract_namespace($response, 'http://example.com/ns/dummy', 'sreg', FALSE); $values = openid_extract_namespace($response, 'http://example.com/ns/dummy', 'sreg', FALSE);
$this->assertEqual($values, array('nickname' => 'john'), t('Value found for fallback prefix.')); $this->assertEqual($values, array('nickname' => 'john'), 'Value found for fallback prefix.');
$values = openid_extract_namespace($response, OPENID_NS_SREG, 'sreg', FALSE); $values = openid_extract_namespace($response, OPENID_NS_SREG, 'sreg', FALSE);
$this->assertEqual($values, array('nickname' => 'george', 'email' => 'george@example.com'), t('Namespace takes precedence over fallback prefix.')); $this->assertEqual($values, array('nickname' => 'george', 'email' => 'george@example.com'), 'Namespace takes precedence over fallback prefix.');
// ext1.email is signed, but ext1.nickname is not. // ext1.email is signed, but ext1.nickname is not.
$values = openid_extract_namespace($response, OPENID_NS_SREG, 'sreg', TRUE); $values = openid_extract_namespace($response, OPENID_NS_SREG, 'sreg', TRUE);
$this->assertEqual($values, array('email' => 'george@example.com'), t('Unsigned namespaced fields ignored.')); $this->assertEqual($values, array('email' => 'george@example.com'), 'Unsigned namespaced fields ignored.');
$values = openid_extract_namespace($response, 'http://example.com/ns/ext2', 'sreg', FALSE); $values = openid_extract_namespace($response, 'http://example.com/ns/ext2', 'sreg', FALSE);
$this->assertEqual($values, array('foo' => '123', 'bar' => '456'), t('Unsigned fields found.')); $this->assertEqual($values, array('foo' => '123', 'bar' => '456'), 'Unsigned fields found.');
// ext2.foo and ext2.bar are ignored, because ns.ext2 is not signed. The // ext2.foo and ext2.bar are ignored, because ns.ext2 is not signed. The
// fallback prefix is not used, because the namespace is specified. // fallback prefix is not used, because the namespace is specified.
$values = openid_extract_namespace($response, 'http://example.com/ns/ext2', 'sreg', TRUE); $values = openid_extract_namespace($response, 'http://example.com/ns/ext2', 'sreg', TRUE);
$this->assertEqual($values, array(), t('Unsigned fields ignored.')); $this->assertEqual($values, array(), 'Unsigned fields ignored.');
} }
} }

2
core/modules/openid/lib/Drupal/openid/Tests/OpenIDTestBase.php
View File

@ -56,7 +56,7 @@ abstract class OpenIDTestBase extends WebTestBase {
$this->drupalPost('', $edit, t('Log in')); $this->drupalPost('', $edit, t('Log in'));
// Check we are on the OpenID redirect form. // Check we are on the OpenID redirect form.
$this->assertTitle(t('OpenID redirect'), t('OpenID redirect page was displayed.')); $this->assertTitle(t('OpenID redirect'), 'OpenID redirect page was displayed.');
// Submit form to the OpenID Provider Endpoint. // Submit form to the OpenID Provider Endpoint.
$this->drupalPost(NULL, array(), t('Send')); $this->drupalPost(NULL, array(), t('Send'));