4 files changed, 106 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 980a26d525..36b9e18176 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -201,7 +201,7 @@ function set_config_count($config_name, $increment, $is_dynamic = false)
 function gen_rand_string($num_chars = 8)
 {
 	// [a, z] + [0, 9] = 36
-	return strtoupper(base_convert(unique_id(), 16, 36));
+	return substr(strtoupper(base_convert(unique_id(), 16, 36)), 0, $num_chars);
 }
 
 /**
diff --git a/tests/all_tests.php b/tests/all_tests.php
index 8dc07872e8..bae7725ee7 100644
--- a/tests/all_tests.php
+++ b/tests/all_tests.php
@@ -25,6 +25,7 @@ require_once 'text_processing/all_tests.php';
 require_once 'dbal/all_tests.php';
 require_once 'regex/all_tests.php';
 require_once 'network/all_tests.php';
+require_once 'random/all_tests.php';
 
 // exclude the test directory from code coverage reports
 PHPUnit_Util_Filter::addDirectoryToFilter('./');
@@ -48,6 +49,7 @@ class phpbb_all_tests
 		$suite->addTest(phpbb_dbal_all_tests::suite());
 		$suite->addTest(phpbb_regex_all_tests::suite());
 		$suite->addTest(phpbb_network_all_tests::suite());
+		$suite->addTest(phpbb_random_all_tests::suite());
 
 		return $suite;
 	}
diff --git a/tests/random/all_tests.php b/tests/random/all_tests.php
new file mode 100644
index 0000000000..c6ffe78024
--- /dev/null
+++ b/tests/random/all_tests.php
@@ -0,0 +1,40 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2010 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+if (!defined('PHPUnit_MAIN_METHOD'))
+{
+	define('PHPUnit_MAIN_METHOD', 'phpbb_random_all_tests::main');
+}
+
+require_once 'test_framework/framework.php';
+require_once 'PHPUnit/TextUI/TestRunner.php';
+
+require_once 'random/gen_rand_string.php';
+
+class phpbb_random_all_tests
+{
+	public static function main()
+	{
+		PHPUnit_TextUI_TestRunner::run(self::suite());
+	}
+
+	public static function suite()
+	{
+		$suite = new PHPUnit_Framework_TestSuite('phpBB Random Functions');
+
+		$suite->addTestSuite('phpbb_random_gen_rand_string_test');
+
+		return $suite;
+	}
+}
+
+if (PHPUnit_MAIN_METHOD == 'phpbb_random_all_tests::main')
+{
+	phpbb_random_all_tests::main();
+}
diff --git a/tests/random/gen_rand_string.php b/tests/random/gen_rand_string.php
new file mode 100644
index 0000000000..cd58d14ed3
--- /dev/null
+++ b/tests/random/gen_rand_string.php
@@ -0,0 +1,63 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2010 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once 'test_framework/framework.php';
+require_once '../phpBB/includes/functions.php';
+
+class phpbb_random_gen_rand_string_test extends phpbb_test_case
+{
+	const TEST_COUNT = 100;
+	const MIN_STRING_LENGTH = 1;
+	const MAX_STRING_LENGTH = 15;
+
+	public function setUp()
+	{
+		global $config;
+
+		if (!is_array($config))
+		{
+			$config = array();
+		}
+
+		$config['rand_seed'] = '';
+		$config['rand_seed_last_update'] = time() + 600;
+	}
+
+	public function test_gen_rand_string()
+	{
+		for ($tests = 0; $tests <= self::TEST_COUNT; ++$tests)
+		{
+			for ($num_chars = self::MIN_STRING_LENGTH; $num_chars <= self::MAX_STRING_LENGTH; ++$num_chars)
+			{
+				$random_string = gen_rand_string($num_chars);
+				$random_string_length = strlen($random_string);
+
+				$this->assertTrue($random_string_length >= self::MIN_STRING_LENGTH);
+				$this->assertTrue($random_string_length <= $num_chars);
+				$this->assertRegExp('#^[A-Z0-9]+$#', $random_string);
+			}
+		}
+	}
+
+	public function test_gen_rand_string_friendly()
+	{
+		for ($tests = 0; $tests <= self::TEST_COUNT; ++$tests)
+		{
+			for ($num_chars = self::MIN_STRING_LENGTH; $num_chars <= self::MAX_STRING_LENGTH; ++$num_chars)
+			{
+				$random_string = gen_rand_string_friendly($num_chars);
+				$random_string_length = strlen($random_string);
+
+				$this->assertTrue($random_string_length >= self::MIN_STRING_LENGTH);
+				$this->assertTrue($random_string_length <= $num_chars);
+				$this->assertRegExp('#^[A-NP-Z1-9]+$#', $random_string);
+			}
+		}
+	}
+}