makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-12 06:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12354] Assert same instead of equal where necessary in passwords tests

Browse source 
In some tests we try to make sure that we do not get the same output in a
limited timeframe. These tests should use assertSame/NotSame instead of
assertEqual/NotEqual.

PHPBB3-12354
This commit is contained in:
Marc Alexander 2014-04-05 11:48:21 +02:00
parent d0aa7c6455
commit 06aa3d948a
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/passwords/drivers_test.php
View file

@ -38,7 +38,7 @@ class phpbb_passwords_helper_test extends PHPUnit_Framework_TestCase
public function test_helper_encode64($input, $length, $output) public function test_helper_encode64($input, $length, $output)
{ {
$return = $this->driver_helper->hash_encode64($input, $length); $return = $this->driver_helper->hash_encode64($input, $length);
$this->assertEquals($output, $return); $this->assertSame($output, $return);
} }
public function data_get_random_salt() public function data_get_random_salt()
@ -61,8 +61,8 @@ class phpbb_passwords_helper_test extends PHPUnit_Framework_TestCase
while ((microtime(true) - $start) < 1) while ((microtime(true) - $start) < 1)
{ {
$urandom_string = (empty($rand_seed)) ? $this->driver_helper->get_random_salt($length) : $this->driver_helper->get_random_salt($length, $rand_seed); $urandom_string = (empty($rand_seed)) ? $this->driver_helper->get_random_salt($length) : $this->driver_helper->get_random_salt($length, $rand_seed);
$this->assertEquals($length, strlen($urandom_string)); $this->assertSame($length, strlen($urandom_string));
$this->assertNotEquals($rand_string, $urandom_string); $this->assertNotSame($rand_string, $urandom_string);
} }
} }

2
tests/passwords/manager_test.php
View file

@ -273,7 +273,7 @@ class phpbb_passwords_manager_test extends PHPUnit_Framework_TestCase
// Limit test to 1 second // Limit test to 1 second
while ((microtime(true) - $time) < 1) while ((microtime(true) - $time) < 1)
{ {
$this->assertNotEquals($first_id, $this->driver_helper->unique_id()); $this->assertNotSame($first_id, $this->driver_helper->unique_id());
} }
} }