diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-10 16:41:45 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-10 16:43:42 +0100 |
| commit | 2ed9d7878eb53e64cba4771d8e4a7f7ce55b84a6 (patch) | |
| tree | 571928cd4420aad6d04bcc0b78ca3193f8dbaaf9 /tests/template/template.php | |
| parent | f8d134eb7070fa189d5c9aeb3f4401563188b1e0 (diff) | |
| parent | 60bd1edcb5e5992e6e693d0f68db47e678f7d54a (diff) | |
| download | forums-2ed9d7878eb53e64cba4771d8e4a7f7ce55b84a6.tar forums-2ed9d7878eb53e64cba4771d8e4a7f7ce55b84a6.tar.gz forums-2ed9d7878eb53e64cba4771d8e4a7f7ce55b84a6.tar.bz2 forums-2ed9d7878eb53e64cba4771d8e4a7f7ce55b84a6.tar.xz forums-2ed9d7878eb53e64cba4771d8e4a7f7ce55b84a6.zip | |
Merge branch 'develop-olympus' into develop
Conflicts:
tests/all_tests.php
tests/request/all_tests.php
tests/request/request_var.php
tests/security/all_tests.php
tests/security/extract_current_page.php
tests/security/redirect.php
tests/template/all_tests.php
tests/template/template.php
tests/template/templates/define.html
tests/template/templates/expressions.html
tests/template/templates/if.html
tests/template/templates/includephp.html
tests/template/templates/loop.html
tests/template/templates/loop_advanced.html
tests/template/templates/loop_vars.html
tests/test_framework/framework.php
tests/test_framework/phpbb_test_case.php
tests/text_processing/all_tests.php
tests/text_processing/make_clickable.php
tests/utf/all_tests.php
tests/utf/utf8_clean_string_test.php
tests/utf/utf8_wordwrap_test.php
Diffstat (limited to 'tests/template/template.php')
| -rw-r--r-- | tests/template/template.php | 93 |
1 files changed, 93 insertions, 0 deletions
diff --git a/tests/template/template.php b/tests/template/template.php index bde1c55e9d..e3ea532383 100644 --- a/tests/template/template.php +++ b/tests/template/template.php @@ -2,7 +2,10 @@ /** * * @package testing +<<<<<<< HEAD * @version $Id$ +======= +>>>>>>> develop-olympus * @copyright (c) 2008 phpBB Group * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @@ -18,12 +21,29 @@ class phpbb_template_template_test extends phpbb_test_case private $template_path; // Keep the contents of the cache for debugging? +<<<<<<< HEAD const PRESERVE_CACHE = false; private function display($handle) { ob_start(); $this->assertTrue($this->template->display($handle, false)); +======= + const PRESERVE_CACHE = true; + + private function display($handle) + { + // allow the templates to throw notices + $error_level = error_reporting(); + error_reporting($error_level & ~E_NOTICE); + + ob_start(); + $this->assertTrue($this->template->display($handle, false)); + + // reset error level + error_reporting($error_level); + +>>>>>>> develop-olympus return self::trim_template_result(ob_get_clean()); } @@ -112,7 +132,11 @@ class phpbb_template_template_test extends phpbb_test_case array('S_VALUE' => true), array(), array(), +<<<<<<< HEAD '1', +======= + "1\n0", +>>>>>>> develop-olympus ), array( 'if.html', @@ -154,15 +178,24 @@ class phpbb_template_template_test extends phpbb_test_case array(), array('loop' => array(array(), array()), 'loop.block' => array(array()), 'block' => array(array(), array())), array(), +<<<<<<< HEAD "loop\nloop\nloop\nloop\n\nloop#0-block#0\nloop#0-block#1\nloop#1-block#0\nloop#1-block#1", +======= + "loop\nloop\nloop\nloop\nloop#0-block#0\nloop#0-block#1\nloop#1-block#0\nloop#1-block#1", +>>>>>>> develop-olympus ), array( 'loop_vars.html', array(), array('loop' => array(array('VARIABLE' => 'x'))), array(), +<<<<<<< HEAD "first\n0\n0\n1\nx\nset\nlast", ), +======= + "first\n0\nx\nset\nlast", + ),/* no nested top level loops +>>>>>>> develop-olympus array( 'loop_vars.html', array(), @@ -176,34 +209,54 @@ class phpbb_template_template_test extends phpbb_test_case array('loop' => array(array('VARIABLE' => 'x'), array('VARIABLE' => 'y')), 'loop.inner' => array(array(), array())), array(), "first\n0\n0\n2\nx\nset\n1\n1\n2\ny\nset\nlast\n0\n\n1\nlast inner\ninner loop", +<<<<<<< HEAD ), +======= + ),*/ +>>>>>>> develop-olympus array( 'loop_advanced.html', array(), array('loop' => array(array(), array(), array(), array(), array(), array(), array())), array(), +<<<<<<< HEAD "101234561\n101234561\n101234561\n1234561\n1\n101\n234\n10\n561\n561", +======= + "101234561\nx\n101234561\nx\n101234561\nx\n1234561\nx\n1\nx\n101\nx\n234\nx\n10\nx\n561\nx\n561", +>>>>>>> develop-olympus ), array( 'define.html', array(), array('loop' => array(array(), array(), array(), array(), array(), array(), array()), 'test' => array(array()), 'test.deep' => array(array()), 'test.deep.defines' => array(array())), array(), +<<<<<<< HEAD "xyz\nabc\n\n00\n11\n22\n33\n44\n55\n66\n\n144\n144", +======= + "xyz\nabc", +>>>>>>> develop-olympus ), array( 'expressions.html', array(), array(), array(), +<<<<<<< HEAD trim(str_repeat("pass\n", 40)), +======= + trim(str_repeat("pass", 39)), +>>>>>>> develop-olympus ), array( 'php.html', array(), array(), array(), +<<<<<<< HEAD '<!-- echo "test"; -->', +======= + '', +>>>>>>> develop-olympus ), array( 'include.html', @@ -218,13 +271,18 @@ class phpbb_template_template_test extends phpbb_test_case array('loop' => array(array('VARIABLE' => 'x'), array('VARIABLE' => 'y')), 'loop.inner' => array(array(), array())), array('loop'), '', +<<<<<<< HEAD ), +======= + ),/* no top level nested loops +>>>>>>> develop-olympus array( 'loop_vars.html', array(), array('loop' => array(array('VARIABLE' => 'x'), array('VARIABLE' => 'y')), 'loop.inner' => array(array(), array())), array('loop.inner'), "first\n0\n0\n2\nx\nset\n1\n1\n2\ny\nset\nlast", +<<<<<<< HEAD ), array( 'loop_expressions.html', @@ -233,6 +291,9 @@ class phpbb_template_template_test extends phpbb_test_case array(), "on\non\non\non\noff\noff\noff\noff\non\non\non\non\n\noff\noff\noff\non\non\non\noff\noff\noff\non\non\non", ), +======= + ),*/ +>>>>>>> develop-olympus array( 'lang.html', array(), @@ -346,6 +407,10 @@ class phpbb_template_template_test extends phpbb_test_case /** * @dataProvider template_data +<<<<<<< HEAD +======= + */ +>>>>>>> develop-olympus public function test_assign_display($file, array $vars, array $block_vars, array $destroy, $expected) { $this->template->set_filenames(array( @@ -387,11 +452,20 @@ class phpbb_template_template_test extends phpbb_test_case $GLOBALS['config']['tpl_allow_php'] = false; } +<<<<<<< HEAD */ /* public function test_includephp() { phpbb::$config['tpl_allow_php'] = true; +======= + + public function test_includephp() + { + $this->markTestIncomplete('Include PHP test file paths are broken'); + + $GLOBALS['config']['tpl_allow_php'] = true; +>>>>>>> develop-olympus $cache_file = $this->template->cachepath . 'includephp.html.' . PHP_EXT; @@ -405,9 +479,15 @@ class phpbb_template_template_test extends phpbb_test_case chdir($cwd); +<<<<<<< HEAD phpbb::$config['tpl_allow_php'] = false; } */ +======= + $GLOBALS['config']['tpl_allow_php'] = false; + } + +>>>>>>> develop-olympus public static function alter_block_array_data() { return array( @@ -641,8 +721,16 @@ EOT /** * @dataProvider alter_block_array_data +<<<<<<< HEAD public function test_alter_block_array($alter_block, array $vararray, $key, $mode, $expect, $description) { +======= + */ + public function test_alter_block_array($alter_block, array $vararray, $key, $mode, $expect, $description) + { + $this->markTestIncomplete('Alter Block Test is broken'); + +>>>>>>> develop-olympus $this->template->set_filenames(array('test' => 'loop_nested.html')); // @todo Change this @@ -662,5 +750,10 @@ EOT $this->template->alter_block_array($alter_block, $vararray, $key, $mode); $this->assertEquals($expect, $this->display('test'), $description); } +<<<<<<< HEAD */ } +======= +} + +>>>>>>> develop-olympus |