3 files changed, 150 insertions, 0 deletions
diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php
index bbc2236b3c..bc4ac4bbe0 100644
--- a/phpBB/includes/search/fulltext_native.php
+++ b/phpBB/includes/search/fulltext_native.php
@@ -59,6 +59,10 @@ class phpbb_search_fulltext_native extends phpbb_search_base
 		{
 			include($this->phpbb_root_path . 'includes/utf/utf_normalizer.' . $this->php_ext);
 		}
+		if (!function_exists('utf8_decode_ncr'))
+		{
+			include($this->phpbb_root_path . 'includes/utf/utf_tools.' . $this->php_ext);
+		}
 
 		$error = false;
 	}
diff --git a/tests/search/fixtures/posts.xml b/tests/search/fixtures/posts.xml
new file mode 100644
index 0000000000..875af55599
--- /dev/null
+++ b/tests/search/fixtures/posts.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_posts">
+		<column>post_username</column>
+		<column>post_subject</column>
+		<column>post_text</column>
+		<row>
+			<value>foo</value>
+			<value>foo</value>
+			<value>foo</value>
+		</row>
+		<row>
+			<value>bar</value>
+			<value>bar</value>
+			<value>bar</value>
+		</row>
+	</table>
+	<table name="phpbb_search_wordlist">
+		<column>word_id</column>
+		<column>word_text</column>
+		<column>word_common</column>
+		<row>
+			<value>1</value>
+			<value>foo</value>
+			<value>0</value>
+		</row>
+		<row>
+			<value>2</value>
+			<value>bar</value>
+			<value>0</value>
+		</row>
+	</table>
+</dataset>
diff --git a/tests/search/native_test.php b/tests/search/native_test.php
new file mode 100644
index 0000000000..bcde11faf1
--- /dev/null
+++ b/tests/search/native_test.php
@@ -0,0 +1,113 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+function phpbb_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;
+}
+
+class phpbb_search_native_test extends phpbb_database_test_case
+{
+	protected $db;
+	protected $search;
+
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/posts.xml');
+	}
+
+	protected function setUp()
+	{
+		global $phpbb_root_path, $phpEx, $config, $user, $cache;
+
+		parent::setUp();
+
+		// dbal uses cache
+		$cache = new phpbb_cache_driver_null;
+
+		$this->db = $this->new_dbal();
+		$error = null;
+		$class = phpbb_search_wrapper('phpbb_search_fulltext_native');
+		$this->search = new $class($error, $phpbb_root_path, $phpEx, null, $config, $this->db, $user);
+	}
+
+	protected function tearDown()
+	{
+		parent::tearDown();
+	}
+
+	public function keywords()
+	{
+		return array(
+			// keywords
+			// terms
+			// ok
+			// must contain ids
+			// must not contain ids
+			array(
+				'foo',
+				'all',
+				true,
+				array(1),
+				array(),
+			),
+			array(
+				'foo bar',
+				'all',
+				true,
+				array(1, 2),
+				array(),
+			),
+			array(
+				'foo -bar',
+				'all',
+				true,
+				array(1),
+				array(2),
+			),
+			array(
+				'-foo',
+				'all',
+				false,
+				array(),
+				array(),
+			),
+			array(
+				'-foo -bar',
+				'all',
+				false,
+				array(),
+				array(),
+			),
+		);
+	}
+
+	/**
+	* @dataProvider keywords
+	*/
+	public function test_split_keywords($keywords, $terms, $ok, $must_contain, $must_not_contain)
+	{
+		$rv = $this->search->split_keywords($keywords, $terms);
+		$this->assertEquals($ok, $rv);
+		$this->assertEmpty(array_diff($must_contain, $this->search->get_must_contain_ids()));
+		$this->assertEmpty(array_diff($must_not_contain, $this->search->get_must_not_contain_ids()));
+	}
+}