21 files changed, 635 insertions, 29 deletions
diff --git a/tests/all_tests.php b/tests/all_tests.php
index d1d711c4d7..4c2fa891a2 100644
--- a/tests/all_tests.php
+++ b/tests/all_tests.php
@@ -7,8 +7,6 @@
 *
 */
 
-error_reporting(E_ALL);
-
 if (!defined('PHPUnit_MAIN_METHOD'))
 {
 	define('PHPUnit_MAIN_METHOD', 'phpbb_all_tests::main');
@@ -17,15 +15,18 @@ if (!defined('PHPUnit_MAIN_METHOD'))
 require_once 'test_framework/framework.php';
 require_once 'PHPUnit/TextUI/TestRunner.php';
 
+require_once 'class_loader/all_tests.php';
 require_once 'utf/all_tests.php';
 require_once 'request/all_tests.php';
 require_once 'security/all_tests.php';
 require_once 'template/all_tests.php';
+#require_once 'bbcode/all_tests.php';
 require_once 'text_processing/all_tests.php';
 require_once 'dbal/all_tests.php';
 require_once 'regex/all_tests.php';
 require_once 'network/all_tests.php';
 require_once 'random/all_tests.php';
+require_once 'download/all_tests.php';
 
 // exclude the test directory from code coverage reports
 if (version_compare(PHPUnit_Runner_Version::id(), '3.5.0') >= 0)
@@ -48,15 +49,18 @@ class phpbb_all_tests
 	{
 		$suite = new PHPUnit_Framework_TestSuite('phpBB');
 
+		$suite->addTest(phpbb_class_loader_all_tests::suite());
 		$suite->addTest(phpbb_utf_all_tests::suite());
 		$suite->addTest(phpbb_request_all_tests::suite());
 		$suite->addTest(phpbb_security_all_tests::suite());
 		$suite->addTest(phpbb_template_all_tests::suite());
+#		$suite->addTest(phpbb_bbcode_all_tests::suite());
 		$suite->addTest(phpbb_text_processing_all_tests::suite());
 		$suite->addTest(phpbb_dbal_all_tests::suite());
 		$suite->addTest(phpbb_regex_all_tests::suite());
 		$suite->addTest(phpbb_network_all_tests::suite());
 		$suite->addTest(phpbb_random_all_tests::suite());
+		$suite->addTest(phpbb_download_all_tests::suite());
 
 		return $suite;
 	}
diff --git a/tests/bbcode/all_tests.php b/tests/bbcode/all_tests.php
new file mode 100644
index 0000000000..f4200fd0a9
--- /dev/null
+++ b/tests/bbcode/all_tests.php
@@ -0,0 +1,44 @@
+<?php
+/**
+*
+* @package testing
+* @version $Id$
+* @copyright (c) 2008 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+define('IN_PHPBB', true);
+
+if (!defined('PHPUnit_MAIN_METHOD'))
+{
+	define('PHPUnit_MAIN_METHOD', 'phpbb_bbcode_all_tests::main');
+}
+
+require_once 'test_framework/framework.php';
+require_once 'PHPUnit/TextUI/TestRunner.php';
+
+require_once 'bbcode/parser_test.php';
+
+class phpbb_bbcode_all_tests
+{
+	public static function main()
+	{
+		PHPUnit_TextUI_TestRunner::run(self::suite());
+	}
+
+	public static function suite()
+	{
+		$suite = new PHPUnit_Framework_TestSuite('phpBB Formatted Text / BBCode');
+
+		$suite->addTestSuite('phpbb_bbcode_parser_test');
+
+		return $suite;
+	}
+}
+
+if (PHPUnit_MAIN_METHOD == 'phpbb_bbcode_all_tests::main')
+{
+	phpbb_bbcode_all_tests::main();
+}
+?>
+\ No newline at end of file
diff --git a/tests/bbcode/parser_test.php b/tests/bbcode/parser_test.php
new file mode 100644
index 0000000000..729fe93fc2
--- /dev/null
+++ b/tests/bbcode/parser_test.php
@@ -0,0 +1,31 @@
+<?php
+/**
+*
+* @package testing
+* @version $Id$
+* @copyright (c) 2008 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+define('IN_PHPBB', true);
+
+require_once 'test_framework/framework.php';
+require_once '../phpBB/includes/bbcode/bbcode_parser_base.php';
+require_once '../phpBB/includes/bbcode/bbcode_parser.php';
+
+class phpbb_bbcode_parser_test extends PHPUnit_Framework_TestCase
+{
+	public function test_both_passes()
+	{
+		$parser = new phpbb_bbcode_parser();
+
+		$result = $parser->first_pass('[i]Italic [u]underlined text[/u][/i]');
+		$result = $parser->second_pass($result);
+
+		$expected = '<span style="font-style: italic">Italic <span style="text-decoration: underline">underlined text</span></span>';
+
+		$this->assertEquals($expected, $result, 'Simple nested BBCode first+second pass');
+	}
+}
+?>
+\ No newline at end of file
diff --git a/tests/class_loader/all_tests.php b/tests/class_loader/all_tests.php
new file mode 100644
index 0000000000..451a1b02c2
--- /dev/null
+++ b/tests/class_loader/all_tests.php
@@ -0,0 +1,41 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2008 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+if (!defined('PHPUnit_MAIN_METHOD'))
+{
+	define('PHPUnit_MAIN_METHOD', 'phpbb_class_loader_all_tests::main');
+}
+
+require_once 'test_framework/framework.php';
+require_once 'PHPUnit/TextUI/TestRunner.php';
+
+require_once 'class_loader/class_loader_test.php';
+
+class phpbb_class_loader_all_tests
+{
+	public static function main()
+	{
+		PHPUnit_TextUI_TestRunner::run(self::suite());
+	}
+
+	public static function suite()
+	{
+		$suite = new PHPUnit_Framework_TestSuite('phpBB Class Loader');
+
+		$suite->addTestSuite('phpbb_class_loader_test');
+
+		return $suite;
+	}
+}
+
+if (PHPUnit_MAIN_METHOD == 'phpbb_class_loader_all_tests::main')
+{
+	phpbb_class_loader_all_tests::main();
+}
+
diff --git a/tests/class_loader/cache_mock.php b/tests/class_loader/cache_mock.php
new file mode 100644
index 0000000000..c8069fa9cc
--- /dev/null
+++ b/tests/class_loader/cache_mock.php
@@ -0,0 +1,29 @@
+<?php
+/**
+*
+* @package testing
+* @version $Id$
+* @copyright (c) 2008 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+class phpbb_cache_mock
+{
+	private $variables = array();
+
+	function get($var_name)
+	{
+		if (isset($this->variables[$var_name]))
+		{
+			return $this->variables[$var_name];
+		}
+
+		return false;
+	}
+
+	function put($var_name, $value)
+	{
+		$this->variables[$var_name] = $value;
+	}
+}
+\ No newline at end of file
diff --git a/tests/class_loader/class_loader_test.php b/tests/class_loader/class_loader_test.php
new file mode 100644
index 0000000000..ecfac8080d
--- /dev/null
+++ b/tests/class_loader/class_loader_test.php
@@ -0,0 +1,76 @@
+<?php
+/**
+*
+* @package testing
+* @version $Id$
+* @copyright (c) 2008 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once 'test_framework/framework.php';
+require_once 'class_loader/cache_mock.php';
+
+require_once '../phpBB/includes/class_loader.php';
+
+
+class phpbb_class_loader_test extends PHPUnit_Framework_TestCase
+{
+	public function test_resolve_path()
+	{
+		$prefix = 'class_loader/';
+		$class_loader = new phpbb_class_loader($prefix);
+
+		$prefix .= 'includes/';
+
+		$this->assertEquals(
+			'',
+			$class_loader->resolve_path('phpbb_dir'),
+			'Class with same name as a directory is unloadable'
+		);
+
+		$this->assertEquals(
+			$prefix . 'class_name.php',
+			$class_loader->resolve_path('phpbb_class_name'),
+			'Top level class'
+		);
+		$this->assertEquals(
+			$prefix . 'dir/class_name.php',
+			$class_loader->resolve_path('phpbb_dir_class_name'),
+			'Class in a directory'
+		);
+		$this->assertEquals(
+			$prefix . 'dir/subdir/class_name.php',
+			$class_loader->resolve_path('phpbb_dir_subdir_class_name'),
+			'Class in a sub-directory'
+		);
+		$this->assertEquals(
+			$prefix . 'dir2/dir2.php',
+			$class_loader->resolve_path('phpbb_dir2'),
+			'Class with name of dir within dir (short class name)'
+		);
+	}
+
+	public function test_resolve_cached()
+	{
+		$cache = new phpbb_cache_mock;
+		$cache->put('class_loader', array('phpbb_a_cached_name' => 'a/cached_name'));
+
+		$prefix = 'class_loader/';
+		$class_loader = new phpbb_class_loader($prefix, '.php', $cache);
+
+		$prefix .= 'includes/';
+
+		$this->assertEquals(
+			$prefix . 'dir/class_name.php',
+			$class_loader->resolve_path('phpbb_dir_class_name'),
+			'Class in a directory'
+		);
+
+		$this->assertEquals(
+			$prefix . 'a/cached_name.php',
+			$class_loader->resolve_path('phpbb_a_cached_name'),
+			'Class in a directory'
+		);
+	}
+}
diff --git a/tests/class_loader/includes/class_name.php b/tests/class_loader/includes/class_name.php
new file mode 100644
index 0000000000..e941173cdd
--- /dev/null
+++ b/tests/class_loader/includes/class_name.php
@@ -0,0 +1,6 @@
+<?php
+
+class phpbb_class_name
+{
+}
+
diff --git a/tests/class_loader/includes/dir.php b/tests/class_loader/includes/dir.php
new file mode 100644
index 0000000000..1c8930d8e7
--- /dev/null
+++ b/tests/class_loader/includes/dir.php
@@ -0,0 +1,6 @@
+<?php
+
+class phpbb_dir
+{
+}
+
diff --git a/tests/class_loader/includes/dir/class_name.php b/tests/class_loader/includes/dir/class_name.php
new file mode 100644
index 0000000000..0675aa8fc5
--- /dev/null
+++ b/tests/class_loader/includes/dir/class_name.php
@@ -0,0 +1,6 @@
+<?php
+
+class phpbb_dir_class_name
+{
+}
+
diff --git a/tests/class_loader/includes/dir/subdir/class_name.php b/tests/class_loader/includes/dir/subdir/class_name.php
new file mode 100644
index 0000000000..7321a609cc
--- /dev/null
+++ b/tests/class_loader/includes/dir/subdir/class_name.php
@@ -0,0 +1,6 @@
+<?php
+
+class phpbb_dir_subdir_class_name
+{
+}
+
diff --git a/tests/class_loader/includes/dir2/dir2.php b/tests/class_loader/includes/dir2/dir2.php
new file mode 100644
index 0000000000..01cf4086ff
--- /dev/null
+++ b/tests/class_loader/includes/dir2/dir2.php
@@ -0,0 +1,6 @@
+<?php
+
+class phpbb_dir2
+{
+}
+
diff --git a/tests/download/all_tests.php b/tests/download/all_tests.php
new file mode 100644
index 0000000000..21305a887c
--- /dev/null
+++ b/tests/download/all_tests.php
@@ -0,0 +1,40 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2010 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+if (!defined('PHPUnit_MAIN_METHOD'))
+{
+	define('PHPUnit_MAIN_METHOD', 'phpbb_download_all_tests::main');
+}
+
+require_once 'test_framework/framework.php';
+require_once 'PHPUnit/TextUI/TestRunner.php';
+
+require_once 'download/http_byte_range.php';
+
+class phpbb_download_all_tests
+{
+	public static function main()
+	{
+		PHPUnit_TextUI_TestRunner::run(self::suite());
+	}
+
+	public static function suite()
+	{
+		$suite = new PHPUnit_Framework_TestSuite('phpBB Download Tests');
+
+		$suite->addTestSuite('phpbb_download_http_byte_range_test');
+
+		return $suite;
+	}
+}
+
+if (PHPUnit_MAIN_METHOD == 'phpbb_download_all_tests::main')
+{
+	phpbb_regex_all_tests::main();
+}
diff --git a/tests/download/http_byte_range.php b/tests/download/http_byte_range.php
new file mode 100644
index 0000000000..cc42dee353
--- /dev/null
+++ b/tests/download/http_byte_range.php
@@ -0,0 +1,62 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2010 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once 'test_framework/framework.php';
+require_once '../phpBB/includes/functions_download.php';
+
+class phpbb_download_http_byte_range_test extends phpbb_test_case
+{
+	public function test_find_range_request()
+	{
+		// Missing 'bytes=' prefix
+		$_SERVER['HTTP_RANGE'] = 'bztes=';
+		$this->assertEquals(false, phpbb_find_range_request());
+		unset($_SERVER['HTTP_RANGE']);
+
+		$_ENV['HTTP_RANGE'] = 'bztes=';
+		$this->assertEquals(false, phpbb_find_range_request());
+		unset($_ENV['HTTP_RANGE']);
+
+		$_SERVER['HTTP_RANGE'] = 'bytes=0-0,123-125';
+		$this->assertEquals(array('0-0', '123-125'), phpbb_find_range_request());
+		unset($_SERVER['HTTP_RANGE']);
+	}
+
+	/**
+	* @dataProvider parse_range_request_data()
+	*/
+	public function test_parse_range_request($request_array, $filesize, $expected)
+	{
+		$this->assertEquals($expected, phpbb_parse_range_request($request_array, $filesize));
+	}
+
+	public function parse_range_request_data()
+	{
+		return array(
+			// Does not read until the end of file.
+			array(
+				array('3-4'),
+				10,
+				false,
+			),
+
+			// Valid request, handle second range.
+			array(
+				array('0-0', '120-125'),
+				125,
+				array(
+					'byte_pos_start'	=> 120,
+					'byte_pos_end'		=> 124,
+					'bytes_requested'	=> 5,
+					'bytes_total'		=> 125,
+				)
+			),
+		);
+	}
+}
diff --git a/tests/request/all_tests.php b/tests/request/all_tests.php
index 1ee3029b36..f1633309fd 100644
--- a/tests/request/all_tests.php
+++ b/tests/request/all_tests.php
@@ -15,6 +15,9 @@ if (!defined('PHPUnit_MAIN_METHOD'))
 require_once 'test_framework/framework.php';
 require_once 'PHPUnit/TextUI/TestRunner.php';
 
+require_once 'request/type_cast_helper.php';
+require_once 'request/deactivated_super_global.php';
+require_once 'request/request.php';
 require_once 'request/request_var.php';
 
 class phpbb_request_all_tests
@@ -28,7 +31,10 @@ class phpbb_request_all_tests
 	{
 		$suite = new PHPUnit_Framework_TestSuite('phpBB Request Parameter Handling');
 
-		$suite->addTestSuite('phpbb_request_request_var_test');
+		$suite->addTestSuite('phpbb_type_cast_helper_test');
+		$suite->addTestSuite('phpbb_deactivated_super_global_test');
+		$suite->addTestSuite('phpbb_request_test');
+		$suite->addTestSuite('phpbb_request_var_test');
 
 		return $suite;
 	}
diff --git a/tests/request/deactivated_super_global.php b/tests/request/deactivated_super_global.php
new file mode 100644
index 0000000000..3c7a638e38
--- /dev/null
+++ b/tests/request/deactivated_super_global.php
@@ -0,0 +1,26 @@
+<?php
+/**
+*
+* @package testing
+* @version $Id$
+* @copyright (c) 2009 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once 'test_framework/framework.php';
+require_once '../phpBB/includes/request/interface.php';
+require_once '../phpBB/includes/request/deactivated_super_global.php';
+
+class phpbb_deactivated_super_global_test extends phpbb_test_case
+{
+	/**
+	* Checks that on write access the correct error is thrown
+	*/
+	public function test_write_triggers_error()
+	{
+		$this->setExpectedTriggerError(E_USER_ERROR);
+		$obj = new phpbb_request_deactivated_super_global($this->getMock('phpbb_request_interface'), 'obj', phpbb_request_interface::POST);
+		$obj->offsetSet(0, 0);
+	}
+}
diff --git a/tests/request/request.php b/tests/request/request.php
new file mode 100644
index 0000000000..cf275e763c
--- /dev/null
+++ b/tests/request/request.php
@@ -0,0 +1,83 @@
+<?php
+/**
+*
+* @package testing
+* @version $Id$
+* @copyright (c) 2009 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once 'test_framework/framework.php';
+require_once '../phpBB/includes/request/type_cast_helper_interface.php';
+require_once '../phpBB/includes/request/interface.php';
+require_once '../phpBB/includes/request/deactivated_super_global.php';
+require_once '../phpBB/includes/request/request.php';
+
+class phpbb_request_test extends phpbb_test_case
+{
+	private $type_cast_helper;
+	private $request;
+
+	protected function setUp()
+	{
+		// populate super globals
+		$_POST['test'] = 1;
+		$_GET['test'] = 2;
+		$_COOKIE['test'] = 3;
+		$_REQUEST['test'] = 3;
+		$_GET['unset'] = '';
+
+		$this->type_cast_helper = $this->getMock('phpbb_request_type_cast_helper_interface');
+
+		$this->request = new phpbb_request($this->type_cast_helper);
+	}
+
+	public function test_toggle_super_globals()
+	{
+		$this->assertTrue($this->request->super_globals_disabled(), 'Superglobals were not disabled');
+
+		$this->request->enable_super_globals();
+
+		$this->assertFalse($this->request->super_globals_disabled(), 'Superglobals were not enabled');
+
+		$this->assertEquals(1, $_POST['test'], 'Checking $_POST after enable_super_globals');
+		$this->assertEquals(2, $_GET['test'], 'Checking $_GET after enable_super_globals');
+		$this->assertEquals(3, $_COOKIE['test'], 'Checking $_COOKIE after enable_super_globals');
+		$this->assertEquals(3, $_REQUEST['test'], 'Checking $_REQUEST after enable_super_globals');
+
+		$_POST['x'] = 2;
+		$this->assertEquals($_POST, $GLOBALS['_POST'], 'Checking whether $_POST can still be accessed via $GLOBALS[\'_POST\']');
+	}
+
+	/**
+	* Checks that directly accessing $_POST will trigger
+	* an error.
+	*/
+	public function test_disable_post_super_global()
+	{
+		$this->setExpectedTriggerError(E_USER_ERROR);
+		$_POST['test'] = 3;
+	}
+
+	public function test_is_set_post()
+	{
+		$this->assertTrue($this->request->is_set_post('test'));
+		$this->assertFalse($this->request->is_set_post('unset'));
+	}
+
+	public function test_variable_names()
+	{
+		$expected = array('test', 'unset');
+		$result = $this->request->variable_names();
+		$this->assertEquals($expected, $result);
+	}
+
+	/**
+	* Makes sure super globals work properly after these tests
+	*/
+	protected function tearDown()
+	{
+		$this->request->enable_super_globals();
+	}
+}
diff --git a/tests/request/request_var.php b/tests/request/request_var.php
index b1dacef3fd..1c360d45d0 100644
--- a/tests/request/request_var.php
+++ b/tests/request/request_var.php
@@ -8,9 +8,14 @@
 */
 
 require_once 'test_framework/framework.php';
+require_once '../phpBB/includes/request/type_cast_helper_interface.php';
+require_once '../phpBB/includes/request/type_cast_helper.php';
+require_once '../phpBB/includes/request/deactivated_super_global.php';
+require_once '../phpBB/includes/request/interface.php';
+require_once '../phpBB/includes/request/request.php';
 require_once '../phpBB/includes/functions.php';
 
-class phpbb_request_request_var_test extends phpbb_test_case
+class phpbb_request_var_test extends phpbb_test_case
 {
 	/**
 	* @dataProvider request_variables
@@ -73,6 +78,47 @@ class phpbb_request_request_var_test extends phpbb_test_case
 		unset($_GET[$var], $_POST[$var], $_REQUEST[$var], $_COOKIE[$var]);
 	}
 
+	/**
+	* @dataProvider deep_access
+	* Only possible with 3.1.x (later)
+	*/
+	public function test_deep_multi_dim_array_access($path, $default, $expected)
+	{
+		$this->unset_variables('var');
+
+		// cannot set $_REQUEST directly because in phpbb_request implementation
+		// $_REQUEST = $_GET + $_POST
+		$_POST['var'] = array(
+			0 => array(
+				'b' => array(
+					true => array(
+						5 => 'c',
+						6 => 'd',
+					),
+				),
+			),
+			2 => array(
+				3 => array(
+					false => 5,
+				),
+			),
+		);
+
+		$result = request_var($path, $default);
+		$this->assertEquals($expected, $result, 'Testing deep access to multidimensional input arrays: ' . $path);
+	}
+
+	public static function deep_access()
+	{
+		return array(
+			// array(path, default, expected result)
+			array(array('var', 0, 'b', true, 5), '', 'c'),
+			array(array('var', 0, 'b', true, 6), '', 'd'),
+			array(array('var', 2, 3, false), 0, 5),
+			array(array('var', 0, 'b', true), array(0 => ''), array(5 => 'c', 6 => 'd')),
+		);
+	}
+
 	public static function request_variables()
 	{
 		return array(
@@ -173,6 +219,50 @@ class phpbb_request_request_var_test extends phpbb_test_case
 					'abc' => array()
 				)
 			),
+			array(
+				// input:
+				array(
+					0 => array(0 => array(3, '4', 'ab'), 1 => array()),
+					1 => array(array(3, 4)),
+				),
+				// default:
+				array(0 => array(0 => array(0))),
+				false,
+				// expected:
+				array(
+					0 => array(0 => array(3, 4, 0), 1 => array()),
+					1 => array(array(3, 4))
+				)
+			),
+			array(
+				// input:
+				array(
+					'ü' => array(array('c' => 'd')),
+					'ä' => array(4 => array('a' => 2, 'ö' => 3)),
+				),
+				// default:
+				array('' => array(0 => array('' => 0))),
+				false,
+				// expected:
+				array(
+					'??' => array(4 => array('a' => 2, '??' => 3)),
+				)
+			),
+			array(
+				// input:
+				array(
+					'ü' => array(array('c' => 'd')),
+					'ä' => array(4 => array('a' => 2, 'ö' => 3)),
+				),
+				// default:
+				array('' => array(0 => array('' => 0))),
+				true,
+				// expected:
+				array(
+					'ü' => array(array('c' => 0)),
+					'ä' => array(4 => array('a' => 2, 'ö' => 3)),
+				)
+			),
 		);
 	}
 
diff --git a/tests/request/type_cast_helper.php b/tests/request/type_cast_helper.php
new file mode 100644
index 0000000000..291b414fd3
--- /dev/null
+++ b/tests/request/type_cast_helper.php
@@ -0,0 +1,54 @@
+<?php
+/**
+*
+* @package testing
+* @version $Id$
+* @copyright (c) 2009 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once 'test_framework/framework.php';
+require_once '../phpBB/includes/utf/utf_tools.php';
+require_once '../phpBB/includes/request/type_cast_helper_interface.php';
+require_once '../phpBB/includes/request/type_cast_helper.php';
+
+class phpbb_type_cast_helper_test extends phpbb_test_case
+{
+	private $type_cast_helper;
+
+	protected function setUp()
+	{
+		$this->type_cast_helper = new phpbb_request_type_cast_helper();
+	}
+
+	public function test_addslashes_recursively()
+	{
+		$data = array('some"string' => array('that"' => 'really"', 'needs"' => '"escaping'));
+		$expected = array('some\\"string' => array('that\\"' => 'really\\"', 'needs\\"' => '\\"escaping'));
+
+		$this->type_cast_helper->addslashes_recursively($data);
+
+		$this->assertEquals($expected, $data);
+	}
+
+	public function test_simple_recursive_set_var()
+	{
+		$data = 'eviL<3';
+		$expected = 'eviL&lt;3';
+
+		$this->type_cast_helper->recursive_set_var($data, '', true);
+
+		$this->assertEquals($expected, $data);
+	}
+
+	public function test_nested_recursive_set_var()
+	{
+		$data = array('eviL<3');
+		$expected = array('eviL&lt;3');
+
+		$this->type_cast_helper->recursive_set_var($data, array(0 => ''), true);
+
+		$this->assertEquals($expected, $data);
+	}
+}
diff --git a/tests/template/template.php b/tests/template/template.php
index 0c2ca8a032..0a685bfd61 100644
--- a/tests/template/template.php
+++ b/tests/template/template.php
@@ -17,34 +17,13 @@ class phpbb_template_template_test extends phpbb_test_case
 	private $template_path;
 
 	// Keep the contents of the cache for debugging?
-	const PRESERVE_CACHE = true;
+	const PRESERVE_CACHE = false;
 
 	private function display($handle)
 	{
-		// allow the templates to throw notices
-		$error_level = error_reporting();
-		error_reporting($error_level & ~E_NOTICE);
-
 		ob_start();
-
-		try
-		{
-			$this->assertTrue($this->template->display($handle, false));
-		}
-		catch (Exception $exception)
-		{
-			// reset the error level even when an error occured
-			// PHPUnit turns trigger_error into exceptions as well
-			error_reporting($error_level);
-			ob_end_clean();
-			throw $exception;
-		}
-
-		$result = self::trim_template_result(ob_get_clean());
-
-		// reset error level
-		error_reporting($error_level);
-		return $result;
+		$this->assertTrue($this->template->display($handle, false));
+		return self::trim_template_result(ob_get_clean());
 	}
 
 	private static function trim_template_result($result)
diff --git a/tests/template/templates/includephp.html b/tests/template/templates/includephp.html
index 3e13fa33fa..42c78b9377 100644
--- a/tests/template/templates/includephp.html
+++ b/tests/template/templates/includephp.html
@@ -1 +1 @@
-<!-- INCLUDEPHP ../templates/_dummy_include.php -->
+<!-- INCLUDEPHP _dummy_include.php -->
diff --git a/tests/template/templates/loop_expressions.html b/tests/template/templates/loop_expressions.html
new file mode 100644
index 0000000000..6bff53f388
--- /dev/null
+++ b/tests/template/templates/loop_expressions.html
@@ -0,0 +1,11 @@
+<!-- BEGIN loop -->
+
+<!-- IF loop.S_ROW_NUM is even by 4 -->on<!-- ELSE -->off<!-- ENDIF -->
+
+<!-- END loop -->
+
+<!-- BEGIN loop -->
+
+<!-- IF loop.S_ROW_NUM is odd by 3 -->on<!-- ELSE -->off<!-- ENDIF -->
+
+<!-- END loop -->