diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-05-28 20:35:01 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-06-01 21:31:05 +0200 |
| commit | dc5a5a7cdfae8ba8e300b7db46eaa64fcc70824c (patch) | |
| tree | acad0a8f9f80664224a0f0f4a26bbb5350826ee6 /tests/passwords | |
| parent | 033272f968249a2951cf7dc6867b8f393d113f2d (diff) | |
| download | forums-dc5a5a7cdfae8ba8e300b7db46eaa64fcc70824c.tar forums-dc5a5a7cdfae8ba8e300b7db46eaa64fcc70824c.tar.gz forums-dc5a5a7cdfae8ba8e300b7db46eaa64fcc70824c.tar.bz2 forums-dc5a5a7cdfae8ba8e300b7db46eaa64fcc70824c.tar.xz forums-dc5a5a7cdfae8ba8e300b7db46eaa64fcc70824c.zip | |
[ticket/12352] Rename phpbb2_md5 driver to fit filenames of other drivers
PHPBB3-12352
Diffstat (limited to 'tests/passwords')
| -rw-r--r-- | tests/passwords/drivers_test.php | 16 | ||||
| -rw-r--r-- | tests/passwords/manager_test.php | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/tests/passwords/drivers_test.php b/tests/passwords/drivers_test.php index 0ac4719b45..3ef39df709 100644 --- a/tests/passwords/drivers_test.php +++ b/tests/passwords/drivers_test.php @@ -31,7 +31,7 @@ class phpbb_passwords_helper_test extends \phpbb_test_case 'passwords.driver.convert_password' => new \phpbb\passwords\driver\convert_password($config, $this->driver_helper), 'passwords.driver.sha1' => new \phpbb\passwords\driver\sha1($config, $this->driver_helper), ); - $this->passwords_drivers['passwords.driver.phpbb2_md5'] = new \phpbb\passwords\driver\phpbb2_md5($request, $this->passwords_drivers['passwords.driver.salted_md5'], $phpbb_root_path, $php_ext); + $this->passwords_drivers['passwords.driver.md5_phpbb2'] = new \phpbb\passwords\driver\md5_phpbb2($request, $this->passwords_drivers['passwords.driver.salted_md5'], $phpbb_root_path, $php_ext); } public function data_helper_encode64() @@ -122,7 +122,7 @@ class phpbb_passwords_helper_test extends \phpbb_test_case $this->assertSame($expected, $this->passwords_drivers[$driver]->get_settings_only($hash)); } - public function data_phpbb2_md5_check() + public function data_md5_phpbb2_check() { return array( array(false, 'foobar', 'ae2fc75e20ee25d4520766788fbc96ae'), @@ -136,9 +136,9 @@ class phpbb_passwords_helper_test extends \phpbb_test_case } /** - * @dataProvider data_phpbb2_md5_check + * @dataProvider data_md5_phpbb2_check */ - public function test_phpbb2_md5_check($expected, $password, $hash, $request_password = false) + public function test_md5_phpbb2_check($expected, $password, $hash, $request_password = false) { if (!$request_password) { @@ -148,14 +148,14 @@ class phpbb_passwords_helper_test extends \phpbb_test_case { $_REQUEST['password'] = $request_password; } - $this->assertSame($expected, $this->passwords_drivers['passwords.driver.phpbb2_md5']->check($password, $hash)); + $this->assertSame($expected, $this->passwords_drivers['passwords.driver.md5_phpbb2']->check($password, $hash)); } - public function test_phpbb2_md5_unneeded_functions() + public function test_md5_phpbb2_unneeded_functions() { - $this->assertSame(false, $this->passwords_drivers['passwords.driver.phpbb2_md5']->hash('foobar')); + $this->assertSame(false, $this->passwords_drivers['passwords.driver.md5_phpbb2']->hash('foobar')); - $this->assertSame(false, $this->passwords_drivers['passwords.driver.phpbb2_md5']->get_settings_only('ae2fc75e20ee25d4520766788fbc96ae')); + $this->assertSame(false, $this->passwords_drivers['passwords.driver.md5_phpbb2']->get_settings_only('ae2fc75e20ee25d4520766788fbc96ae')); } public function test_convert_password_driver() diff --git a/tests/passwords/manager_test.php b/tests/passwords/manager_test.php index 24243d76c4..2a53d79027 100644 --- a/tests/passwords/manager_test.php +++ b/tests/passwords/manager_test.php @@ -37,7 +37,7 @@ class phpbb_passwords_manager_test extends \phpbb_test_case 'passwords.driver.sha1_smf' => new \phpbb\passwords\driver\sha1_smf($config, $this->driver_helper), 'passwords.driver.sha1' => new \phpbb\passwords\driver\sha1($config, $this->driver_helper), ); - $this->passwords_drivers['passwords.driver.phpbb2_md5'] = new \phpbb\passwords\driver\phpbb2_md5($request, $this->passwords_drivers['passwords.driver.salted_md5'], $phpbb_root_path, $php_ext); + $this->passwords_drivers['passwords.driver.md5_phpbb2'] = new \phpbb\passwords\driver\md5_phpbb2($request, $this->passwords_drivers['passwords.driver.salted_md5'], $phpbb_root_path, $php_ext); $this->helper = new \phpbb\passwords\helper; // Set up passwords manager |