4 files changed, 32 insertions, 3 deletions
diff --git a/tests/template/includephp_test.php b/tests/template/includephp_test.php
index a3dc9bd5c5..ff7b890d11 100644
--- a/tests/template/includephp_test.php
+++ b/tests/template/includephp_test.php
@@ -39,7 +39,7 @@ class phpbb_template_includephp_test extends phpbb_template_template_test_case
 		$this->assertTrue(phpbb_is_absolute($path_to_php));
 		$template_text = "Path is absolute.\n<!-- INCLUDEPHP $path_to_php -->";
 
-		$cache_dir = dirname($phpbb_root_path . 'cache') . '/';
+		$cache_dir = $phpbb_root_path . 'cache/';
 		$fp = fopen($cache_dir . 'includephp_absolute.html', 'w');
 		fputs($fp, $template_text);
 		fclose($fp);
diff --git a/tests/template/template_parser_test.php b/tests/template/template_parser_test.php
new file mode 100644
index 0000000000..c200770adf
--- /dev/null
+++ b/tests/template/template_parser_test.php
@@ -0,0 +1,29 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/template_test_case.php';
+
+class phpbb_template_template_parser_test extends phpbb_template_template_test_case
+{
+	public function test_set_filenames()
+	{
+		$this->template->set_filenames(array(
+			'basic'	=> 'basic.html',
+		));
+
+		$this->assertEquals("passpasspass<!-- DUMMY var -->", str_replace(array("\n", "\r", "\t"), '', $this->template->assign_display('basic')));
+
+		$this->template->set_filenames(array(
+			'basic'	=> 'if.html',
+		));
+
+		$this->assertEquals("03!false", str_replace(array("\n", "\r", "\t"), '', $this->template->assign_display('basic')));
+	}
+}
diff --git a/tests/template/template_test.php b/tests/template/template_test.php
index fedfeba33a..802f0c19ba 100644
--- a/tests/template/template_test.php
+++ b/tests/template/template_test.php
@@ -403,7 +403,7 @@ class phpbb_template_template_test extends phpbb_template_template_test_case
 
 		$template_text = '<!-- PHP -->echo "test";<!-- ENDPHP -->';
 
-		$cache_dir = dirname($phpbb_root_path . 'cache') . '/';
+		$cache_dir = $phpbb_root_path . 'cache/';
 		$fp = fopen($cache_dir . 'php.html', 'w');
 		fputs($fp, $template_text);
 		fclose($fp);
diff --git a/tests/template/template_test_case.php b/tests/template/template_test_case.php
index 4a7bf8d168..6d87e5ebc0 100644
--- a/tests/template/template_test_case.php
+++ b/tests/template/template_test_case.php
@@ -33,7 +33,7 @@ class phpbb_template_template_test_case extends phpbb_test_case
 		}
 		catch (Exception $exception)
 		{
-			// reset output buffering even when an error occured
+			// reset output buffering even when an error occurred
 			// PHPUnit turns trigger_error into exceptions as well
 			ob_end_clean();
 			throw $exception;