3 files changed, 42 insertions, 0 deletions
diff --git a/tests/regex/censor.php b/tests/regex/censor.php
new file mode 100644
index 0000000000..ae2d86e07e
--- /dev/null
+++ b/tests/regex/censor.php
@@ -0,0 +1,40 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2010 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once __DIR__ . '/../../phpBB/includes/functions.php';
+
+class phpbb_regex_censor_test extends phpbb_test_case
+{
+	public function censor_test_data()
+	{
+		return array(
+			array('bad*word', 'bad word'),
+			array('bad***word', 'bad word'),
+			array('bad**word', 'bad word'),
+			array('*bad*word*', 'bad word'),
+			array('b*d', 'bad'),
+			array('*bad*', 'bad'),
+			array('*b*d*', 'bad'),
+			array('*b*d*', 'b d'),
+			array('b*d*word', 'bad word'),
+			array('**b**d**word**', 'bad word'),
+			array('**b**d**word**', 'the bad word catched'),
+		);
+	}
+
+	/**
+	* @dataProvider censor_test_data
+	*/
+	public function test_censor($pattern, $subject)
+	{
+		$regex = get_censor_preg_expression($pattern);
+
+		$this->assertRegExp($regex, $subject);
+	}
+}
+\ No newline at end of file
diff --git a/tests/request/request_var.php b/tests/request/request_var.php
index b224c1936b..8848e388bf 100644
--- a/tests/request/request_var.php
+++ b/tests/request/request_var.php
@@ -8,6 +8,7 @@
 */
 
 require_once __DIR__ . '/../../phpBB/includes/functions.php';
+require_once __DIR__ . '/../../phpBB/includes/utf/utf_tools.php';
 
 class phpbb_request_var_test extends phpbb_test_case
 {
diff --git a/tests/template/template.php b/tests/template/template.php
index a58a0a4e0f..14a5a3c752 100644
--- a/tests/template/template.php
+++ b/tests/template/template.php
@@ -7,6 +7,7 @@
 *
 */
 
+require_once __DIR__ . '/../../phpBB/includes/functions.php';
 require_once __DIR__ . '/../../phpBB/includes/template.php';
 
 class phpbb_template_template_test extends phpbb_test_case