diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2018-06-17 11:01:11 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2018-06-17 11:01:11 +0200 |
| commit | 9e50e52fa5c72ee668c0d4c43b15e441f31ada5c (patch) | |
| tree | 75f5a90be45a3af6e6585f25f399bc3024da5d2f | |
| parent | f75c400db44387863abbc0f6f2944df546d5a137 (diff) | |
| download | forums-9e50e52fa5c72ee668c0d4c43b15e441f31ada5c.tar forums-9e50e52fa5c72ee668c0d4c43b15e441f31ada5c.tar.gz forums-9e50e52fa5c72ee668c0d4c43b15e441f31ada5c.tar.bz2 forums-9e50e52fa5c72ee668c0d4c43b15e441f31ada5c.tar.xz forums-9e50e52fa5c72ee668c0d4c43b15e441f31ada5c.zip | |
[ticket/15693] Update tests to reflect changes to gen_rand_string()
PHPBB3-15693
| -rw-r--r-- | phpBB/includes/functions.php | 4 | ||||
| -rw-r--r-- | tests/random/gen_rand_string_test.php | 10 |
2 files changed, 12 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 3b3218a3aa..270d513a26 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -66,6 +66,8 @@ function set_var(&$result, $var, $type, $multibyte = false) /** * Generates an alphanumeric random string of given length * +* @param int $num_chars Length of random string, defaults to 8 +* * @return string */ function gen_rand_string($num_chars = 8) @@ -78,6 +80,8 @@ function gen_rand_string($num_chars = 8) * Generates a user-friendly alphanumeric random string of given length * We remove 0 and O so users cannot confuse those in passwords etc. * +* @param int $num_chars Length of random string, defaults to 8 +* * @return string */ function gen_rand_string_friendly($num_chars = 8) diff --git a/tests/random/gen_rand_string_test.php b/tests/random/gen_rand_string_test.php index a9d1ea20de..428db6ac98 100644 --- a/tests/random/gen_rand_string_test.php +++ b/tests/random/gen_rand_string_test.php @@ -40,7 +40,10 @@ class phpbb_random_gen_rand_string_test extends phpbb_test_case $random_string_length = strlen($random_string); $this->assertTrue($random_string_length >= self::MIN_STRING_LENGTH); - $this->assertTrue($random_string_length <= $num_chars); + $this->assertTrue( + $random_string_length == $num_chars, + sprintf('Failed asserting that random string length matches expected length. Expected %1$u, Actual %2$u', $num_chars, $random_string_length) + ); $this->assertRegExp('#^[A-Z0-9]+$#', $random_string); } } @@ -56,7 +59,10 @@ class phpbb_random_gen_rand_string_test extends phpbb_test_case $random_string_length = strlen($random_string); $this->assertTrue($random_string_length >= self::MIN_STRING_LENGTH); - $this->assertTrue($random_string_length <= $num_chars); + $this->assertTrue( + $random_string_length == $num_chars, + sprintf('Failed asserting that random string length matches expected length. Expected %1$u, Actual %2$u', $num_chars, $random_string_length) + ); $this->assertRegExp('#^[A-NP-Z1-9]+$#', $random_string); } } |