aboutsummaryrefslogtreecommitdiffstats
path: root/tests/passwords
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2014-04-05 11:48:21 +0200
committerMarc Alexander <admin@m-a-styles.de>2014-04-05 11:51:38 +0200
commit06aa3d948a787b5b34f1969f7a72e45a0138e184 (patch)
treedf9420f3b6d9fce75fb96e956ba70f4334a149f3 /tests/passwords
parentd0aa7c6455170396fd8b6c9add7cf2a19bb17426 (diff)
downloadforums-06aa3d948a787b5b34f1969f7a72e45a0138e184.tar
forums-06aa3d948a787b5b34f1969f7a72e45a0138e184.tar.gz
forums-06aa3d948a787b5b34f1969f7a72e45a0138e184.tar.bz2
forums-06aa3d948a787b5b34f1969f7a72e45a0138e184.tar.xz
forums-06aa3d948a787b5b34f1969f7a72e45a0138e184.zip
[ticket/12354] Assert same instead of equal where necessary in passwords tests
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
Diffstat (limited to 'tests/passwords')
-rw-r--r--tests/passwords/drivers_test.php6
-rw-r--r--tests/passwords/manager_test.php2
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/passwords/drivers_test.php b/tests/passwords/drivers_test.php
index 2d26be7da5..40bb110185 100644
--- a/tests/passwords/drivers_test.php
+++ b/tests/passwords/drivers_test.php
@@ -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);
}
}
diff --git a/tests/passwords/manager_test.php b/tests/passwords/manager_test.php
index ee295ff043..008f222696 100644
--- a/tests/passwords/manager_test.php
+++ b/tests/passwords/manager_test.php
@@ -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());
}
}