2 files changed, 31 insertions, 18 deletions
diff --git a/tests/search/native_test.php b/tests/search/native_test.php
index 21cbde496a..544ab7ca17 100644
--- a/tests/search/native_test.php
+++ b/tests/search/native_test.php
@@ -7,24 +7,9 @@
 *
 */
 
-function phpbb_native_search_wrapper($class)
-{
-	$wrapped = $class . '_wrapper';
-	if (!class_exists($wrapped))
-	{
-		$code = "
-class $wrapped extends $class
-{
-	public function get_must_contain_ids() { return \$this->must_contain_ids; }
-	public function get_must_not_contain_ids() { return \$this->must_not_contain_ids; }
-}
-		";
-		eval($code);
-	}
-	return $wrapped;
-}
+require_once dirname(__FILE__) . '/../test_framework/phpbb_search_test_case.php';
 
-class phpbb_search_native_test extends phpbb_database_test_case
+class phpbb_search_native_test extends phpbb_search_test_case
 {
 	protected $db;
 	protected $search;
@@ -45,7 +30,7 @@ class phpbb_search_native_test extends phpbb_database_test_case
 
 		$this->db = $this->new_dbal();
 		$error = null;
-		$class = phpbb_native_search_wrapper('phpbb_search_fulltext_native');
+		$class = self::get_search_wrapper('phpbb_search_fulltext_native');
 		$this->search = new $class($error, $phpbb_root_path, $phpEx, null, $config, $this->db, $user);
 	}
 
diff --git a/tests/test_framework/phpbb_search_test_case.php b/tests/test_framework/phpbb_search_test_case.php
new file mode 100644
index 0000000000..8b378186df
--- /dev/null
+++ b/tests/test_framework/phpbb_search_test_case.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+abstract class phpbb_search_test_case extends phpbb_database_test_case
+{
+	static protected function get_search_wrapper($class)
+	{
+		$wrapped = $class . '_wrapper';
+		if (!class_exists($wrapped))
+		{
+			$code = "
+class $wrapped extends $class
+{
+	public function get_must_contain_ids() { return \$this->must_contain_ids; }
+	public function get_must_not_contain_ids() { return \$this->must_not_contain_ids; }
+}
+			";
+			eval($code);
+		}
+		return $wrapped;
+	}
+}