diff options
Diffstat (limited to 'modules/simpletest/tests/password.test')
-rw-r--r-- | modules/simpletest/tests/password.test | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/modules/simpletest/tests/password.test b/modules/simpletest/tests/password.test index e100c2ef6..5259d19e8 100644 --- a/modules/simpletest/tests/password.test +++ b/modules/simpletest/tests/password.test @@ -35,26 +35,26 @@ class PasswordHashingTest extends DrupalWebTestCase { $password = 'baz'; $account = (object) array('name' => 'foo', 'pass' => md5($password)); // The md5 password should be flagged as needing an update. - $this->assertTrue(user_needs_new_hash($account), t('User with md5 password needs a new hash.')); + $this->assertTrue(user_needs_new_hash($account), 'User with md5 password needs a new hash.'); // Re-hash the password. $old_hash = $account->pass; $account->pass = user_hash_password($password); - $this->assertIdentical(_password_get_count_log2($account->pass), DRUPAL_MIN_HASH_COUNT, t('Re-hashed password has the minimum number of log2 iterations.')); - $this->assertTrue($account->pass != $old_hash, t('Password hash changed.')); - $this->assertTrue(user_check_password($password, $account), t('Password check succeeds.')); + $this->assertIdentical(_password_get_count_log2($account->pass), DRUPAL_MIN_HASH_COUNT, 'Re-hashed password has the minimum number of log2 iterations.'); + $this->assertTrue($account->pass != $old_hash, 'Password hash changed.'); + $this->assertTrue(user_check_password($password, $account), 'Password check succeeds.'); // Since the log2 setting hasn't changed and the user has a valid password, // user_needs_new_hash() should return FALSE. - $this->assertFalse(user_needs_new_hash($account), t('User does not need a new hash.')); + $this->assertFalse(user_needs_new_hash($account), 'User does not need a new hash.'); // Increment the log2 iteration to MIN + 1. variable_set('password_count_log2', DRUPAL_MIN_HASH_COUNT + 1); - $this->assertTrue(user_needs_new_hash($account), t('User needs a new hash after incrementing the log2 count.')); + $this->assertTrue(user_needs_new_hash($account), 'User needs a new hash after incrementing the log2 count.'); // Re-hash the password. $old_hash = $account->pass; $account->pass = user_hash_password($password); - $this->assertIdentical(_password_get_count_log2($account->pass), DRUPAL_MIN_HASH_COUNT + 1, t('Re-hashed password has the correct number of log2 iterations.')); - $this->assertTrue($account->pass != $old_hash, t('Password hash changed again.')); + $this->assertIdentical(_password_get_count_log2($account->pass), DRUPAL_MIN_HASH_COUNT + 1, 'Re-hashed password has the correct number of log2 iterations.'); + $this->assertTrue($account->pass != $old_hash, 'Password hash changed again.'); // Now the hash should be OK. - $this->assertFalse(user_needs_new_hash($account), t('Re-hashed password does not need a new hash.')); - $this->assertTrue(user_check_password($password, $account), t('Password check succeeds with re-hashed password.')); + $this->assertFalse(user_needs_new_hash($account), 'Re-hashed password does not need a new hash.'); + $this->assertTrue(user_check_password($password, $account), 'Password check succeeds with re-hashed password.'); } } |