mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-19 07:08:09 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'Marc/ticket/12354' into develop-ascraeus

Browse Source 
* Marc/ticket/12354:
  [ticket/12354] Assert same instead of equal where necessary in passwords tests
This commit is contained in:
Joas Schilling 2014-04-06 22:18:34 +02:00
commit 6f122d6886
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)
{
$return = $this->driver_helper->hash_encode64($input, $length);
$this->assertEquals($output, $return);
$this->assertSame($output, $return);
}
public function data_get_random_salt()
@ -61,8 +61,8 @@ class phpbb_passwords_helper_test extends PHPUnit_Framework_TestCase
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);
$this->assertEquals($length, strlen($urandom_string));
$this->assertNotEquals($rand_string, $urandom_string);
$this->assertSame($length, strlen($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
while ((microtime(true) - $time) < 1)
{
$this->assertNotEquals($first_id, $this->driver_helper->unique_id());
$this->assertNotSame($first_id, $this->driver_helper->unique_id());
}
}