1 files changed, 39 insertions, 2 deletions
diff --git a/tests/mock/cache.php b/tests/mock/cache.php
index d3f9b8ad5a..b64c92ea89 100644
--- a/tests/mock/cache.php
+++ b/tests/mock/cache.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
@@ -31,12 +31,49 @@ class phpbb_mock_cache implements phpbb_cache_driver_interface
 		$this->data[$var_name] = $var;
 	}
 
+	/**
+	 * Obtain list of word censors. We don't need to parse them here,
+	 * that is tested elsewhere.
+	 */
+	public function obtain_word_list()
+	{
+		return array(
+			'match'		=> array(
+				'#(?<![\\p{Nd}\\p{L}_-])([\\p{Nd}\\p{L}_-]*?badword1[\\p{Nd}\\p{L}_-]*?)(?![\\p{Nd}\\p{L}_-])#iu',
+				'#(?<![\\p{Nd}\\p{L}_-])([\\p{Nd}\\p{L}_-]*?badword2)(?![\\p{Nd}\\p{L}_-])#iu',
+				'#(?<![\\p{Nd}\\p{L}_-])(badword3[\\p{Nd}\\p{L}_-]*?)(?![\\p{Nd}\\p{L}_-])#iu',
+				'#(?<![\\p{Nd}\\p{L}_-])(badword4)(?![\\p{Nd}\\p{L}_-])#iu',
+			),
+			'replace'	=> array(
+				'replacement1',
+				'replacement2',
+				'replacement3',
+				'replacement4',
+			),
+		);
+	}
+
 	public function checkVar(PHPUnit_Framework_Assert $test, $var_name, $data)
 	{
 		$test->assertTrue(isset($this->data[$var_name]));
 		$test->assertEquals($data, $this->data[$var_name]);
 	}
 
+	public function checkAssociativeVar(PHPUnit_Framework_Assert $test, $var_name, $data, $sort = true)
+	{
+		$test->assertTrue(isset($this->data[$var_name]));
+
+		if ($sort)
+		{
+			foreach ($this->data[$var_name] as &$content)
+			{
+				sort($content);
+			}
+		}
+
+		$test->assertEquals($data, $this->data[$var_name]);
+	}
+
 	public function checkVarUnset(PHPUnit_Framework_Assert $test, $var_name)
 	{
 		$test->assertFalse(isset($this->data[$var_name]));
@@ -84,7 +121,7 @@ class phpbb_mock_cache implements phpbb_cache_driver_interface
 	public function sql_load($query)
 	{
 	}
-	public function sql_save($query, &$query_result, $ttl)
+	public function sql_save($query, $query_result, $ttl)
 	{
 	}
 	public function sql_exists($query_id)