aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/template/template.php24
-rw-r--r--tests/template/templates/loop.html4
-rw-r--r--tests/template/templates/loop_vars.html2
3 files changed, 26 insertions, 4 deletions
diff --git a/tests/template/template.php b/tests/template/template.php
index e2d9429511..0639e263bb 100644
--- a/tests/template/template.php
+++ b/tests/template/template.php
@@ -44,9 +44,25 @@ class phpbb_template_template_test extends PHPUnit_Framework_TestCase
protected function setUp()
{
+ // Test the engine can be used
+ $this->setup_engine();
+
+ if (!is_writable(dirname($this->template->cachepath)))
+ {
+ $this->markTestSkipped("Template cache directory is not writable.");
+ }
+ $this->error_reporting = error_reporting(error_reporting() & ~E_NOTICE);
}
+ protected function tearDown()
+ {
+ error_reporting($this->error_reporting);
+ }
+
+ /**
+ * @todo put test data into templates/xyz.test
+ */
public static function template_data()
{
return array(
@@ -92,19 +108,19 @@ class phpbb_template_template_test extends PHPUnit_Framework_TestCase
'loop.html',
array(),
array('loop' => array(array(), array())),
- "loop\nloop\nloop",
+ "loop\nloop\nloop\nloop",
),
array(
'loop_vars.html',
array(),
array('loop' => array(array('VARIABLE' => 'x'))),
- "first\n0\nx\nlast",
+ "first\n0\n0\nx\nlast",
),
array(
'loop_vars.html',
array(),
array('loop' => array(array('VARIABLE' => 'x'), array('VARIABLE' => 'y'))),
- "first\n0\nx\n1\ny\nlast",
+ "first\n0\n0\nx\n1\n1\ny\nlast",
),
array(
'define.html',
@@ -138,7 +154,7 @@ class phpbb_template_template_test extends PHPUnit_Framework_TestCase
}
}
- $this->assertEquals($expected, $this->display('test'), "Testing $file.html");
+ $this->assertEquals($expected, $this->display('test'), "Testing $file");
}
}
?> \ No newline at end of file
diff --git a/tests/template/templates/loop.html b/tests/template/templates/loop.html
index ae921fc929..3912635e9d 100644
--- a/tests/template/templates/loop.html
+++ b/tests/template/templates/loop.html
@@ -9,3 +9,7 @@ loop
<!-- ELSE -->
noloop
<!-- ENDIF -->
+
+<!-- IF .loop == 2 -->
+loop
+<!-- ENDIF -->
diff --git a/tests/template/templates/loop_vars.html b/tests/template/templates/loop_vars.html
index 0da0af4758..c2924ae18f 100644
--- a/tests/template/templates/loop_vars.html
+++ b/tests/template/templates/loop_vars.html
@@ -3,6 +3,8 @@
{loop.S_ROW_COUNT}
+{loop.S_ROW_NUM}
+
{loop.VARIABLE}
<!-- IF loop.S_LAST_ROW -->last<!-- ENDIF -->