6 files changed, 41 insertions, 20 deletions
diff --git a/tests/functional/search/mysql_test.php b/tests/functional/search/mysql_test.php
index 7af8051417..52a7b14f40 100644
--- a/tests/functional/search/mysql_test.php
+++ b/tests/functional/search/mysql_test.php
@@ -16,8 +16,4 @@ class phpbb_functional_search_mysql_test extends phpbb_functional_search_base
 {
 	protected $search_backend = '\phpbb\search\fulltext_mysql';
 
-	protected function assert_search_not_found($keywords)
-	{
-		$this->markTestIncomplete('MySQL search when fails doesn\'t show the search query');
-	}
 }
diff --git a/tests/functional/search/native_test.php b/tests/functional/search/native_test.php
index ce568df616..512c6f2830 100644
--- a/tests/functional/search/native_test.php
+++ b/tests/functional/search/native_test.php
@@ -15,9 +15,4 @@ require_once dirname(__FILE__) . '/base.php';
 class phpbb_functional_search_native_test extends phpbb_functional_search_base
 {
 	protected $search_backend = '\phpbb\search\fulltext_native';
-
-	protected function assert_search_not_found($keywords)
-	{
-		$this->markTestIncomplete('Native search when fails doesn\'t show the search query');
-	}
 }
diff --git a/tests/functional/search/postgres_test.php b/tests/functional/search/postgres_test.php
index 487b8aeebb..974b417659 100644
--- a/tests/functional/search/postgres_test.php
+++ b/tests/functional/search/postgres_test.php
@@ -16,8 +16,4 @@ class phpbb_functional_search_postgres_test extends phpbb_functional_search_base
 {
 	protected $search_backend = '\phpbb\search\fulltext_postgres';
 
-	protected function assert_search_not_found($keywords)
-	{
-		$this->markTestIncomplete('Postgres search when fails doesn\'t show the search query');
-	}
 }
diff --git a/tests/search/native_test.php b/tests/search/native_test.php
index 18c6df2445..4911160cc0 100644
--- a/tests/search/native_test.php
+++ b/tests/search/native_test.php
@@ -106,17 +106,17 @@ class phpbb_search_native_test extends phpbb_search_test_case
 			array(
 				'-foo',
 				'all',
-				false,
-				null,
-				null,
+				true,
+				array(),
+				array(1),
 				array(),
 			),
 			array(
 				'-foo -bar',
 				'all',
-				false,
-				null,
-				null,
+				true,
+				array(),
+				array(1, 2),
 				array(),
 			),
 			// all common
diff --git a/tests/security/hash_test.php b/tests/security/hash_test.php
index bc1bebd87a..32aa234316 100644
--- a/tests/security/hash_test.php
+++ b/tests/security/hash_test.php
@@ -7,7 +7,7 @@
 *
 */
 
-require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_compatibility.php';
 
 class phpbb_security_hash_test extends phpbb_test_case
 {
diff --git a/tests/template/template_test.php b/tests/template/template_test.php
index 6e9b7d3ee9..aaf55fd15c 100644
--- a/tests/template/template_test.php
+++ b/tests/template/template_test.php
@@ -562,6 +562,40 @@ EOT
 		$this->assertEquals($expect, str_replace(array("\n", "\r", "\t"), '', $this->display('test')), 'Ensuring S_NUM_ROWS is correct after modification');
 	}
 
+	public function assign_block_vars_array_data()
+	{
+		return array(
+			array(
+				array(
+					'outer' => array(
+						array('VARIABLE' => 'Test assigning block vars array loop 0:'),
+						array('VARIABLE' => 'Test assigning block vars array loop 1:'),
+					),
+					'outer.middle' => array(
+						array('VARIABLE' => '1st iteration',),
+						array('VARIABLE' => '2nd iteration',),
+						array('VARIABLE' => '3rd iteration',),
+					),
+				)
+			)
+		);
+	}
+
+	/**
+	* @dataProvider assign_block_vars_array_data
+	*/
+	public function test_assign_block_vars_array($block_data)
+	{
+		$this->template->set_filenames(array('test' => 'loop_nested.html'));
+
+		foreach ($block_data as $blockname => $block_vars_array)
+		{
+			$this->template->assign_block_vars_array($blockname, $block_vars_array);
+		}
+
+		$this->assertEquals("outer - 0 - Test assigning block vars array loop 0:outer - 1 - Test assigning block vars array loop 1:middle - 0 - 1st iterationmiddle - 1 - 2nd iterationmiddle - 2 - 3rd iteration", $this->display('test'), 'Ensuring assigning block vars array to template is working correctly');
+	}
+
 	/**
 	* @expectedException Twig_Error_Syntax
 	*/