mirror of
https://github.com/phpbb/phpbb.git
synced 2025-03-13 20:28:44 +01:00
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
This commit is contained in:
Nils Adermann
commit
2ed9d7878e
@ -2,7 +2,6 @@
|
||||
/**
|
||||
*
|
||||
* @package testing
|
||||
* @version $Id$
|
||||
* @copyright (c) 2008 phpBB Group
|
||||
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
|
||||
*
|
||||
@ -19,7 +18,7 @@ require_once 'PHPUnit/TextUI/TestRunner.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 'template/all_tests.php';
|
||||
#require_once 'bbcode/all_tests.php';
|
||||
require_once 'text_processing/all_tests.php';
|
||||
|
||||
@ -40,7 +39,7 @@ class phpbb_all_tests
|
||||
$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_template_all_tests::suite());
|
||||
# $suite->addTest(phpbb_bbcode_all_tests::suite());
|
||||
$suite->addTest(phpbb_text_processing_all_tests::suite());
|
||||
|
||||
@ -52,3 +51,4 @@ if (PHPUnit_MAIN_METHOD == 'phpbb_all_tests::main')
|
||||
{
|
||||
phpbb_all_tests::main();
|
||||
}
|
||||
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
/**
|
||||
*
|
||||
* @package testing
|
||||
* @version $Id$
|
||||
* @copyright (c) 2008 phpBB Group
|
||||
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
|
||||
*
|
||||
@ -39,3 +38,4 @@ if (PHPUnit_MAIN_METHOD == 'phpbb_request_all_tests::main')
|
||||
{
|
||||
phpbb_request_all_tests::main();
|
||||
}
|
||||
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
/**
|
||||
*
|
||||
* @package testing
|
||||
* @version $Id$
|
||||
* @copyright (c) 2008 phpBB Group
|
||||
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
|
||||
*
|
||||
@ -112,6 +111,7 @@ class phpbb_request_request_var_test extends phpbb_test_case
|
||||
);
|
||||
}
|
||||
*/
|
||||
|
||||
public static function request_variables()
|
||||
{
|
||||
return array(
|
||||
@ -262,3 +262,4 @@ class phpbb_request_request_var_test extends phpbb_test_case
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
/**
|
||||
*
|
||||
* @package testing
|
||||
* @version $Id$
|
||||
* @copyright (c) 2008 phpBB Group
|
||||
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
|
||||
*
|
||||
@ -85,4 +84,3 @@ if (PHPUnit_MAIN_METHOD == 'phpbb_security_all_tests::main')
|
||||
{
|
||||
phpbb_security_all_tests::main();
|
||||
}
|
||||
?>
|
||||
@ -2,7 +2,6 @@
|
||||
/**
|
||||
*
|
||||
* @package testing
|
||||
* @version $Id$
|
||||
* @copyright (c) 2008 phpBB Group
|
||||
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
|
||||
*
|
||||
@ -51,3 +50,4 @@ class phpbb_security_extract_current_page_test extends phpbb_test_case
|
||||
$this->assertEquals($expected, $result['query_string'], $label);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
/**
|
||||
*
|
||||
* @package testing
|
||||
* @version $Id$
|
||||
* @copyright (c) 2008 phpBB Group
|
||||
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
|
||||
*
|
||||
@ -56,3 +55,4 @@ class phpbb_security_redirect_test extends phpbb_test_case
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
/**
|
||||
*
|
||||
* @package testing
|
||||
* @version $Id$
|
||||
* @copyright (c) 2008 phpBB Group
|
||||
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
|
||||
*
|
||||
@ -38,4 +37,4 @@ class phpbb_template_all_tests
|
||||
if (PHPUnit_MAIN_METHOD == 'phpbb_template_all_tests::main')
|
||||
{
|
||||
phpbb_template_all_tests::main();
|
||||
}
|
||||
}
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1,41 +1,8 @@
|
||||
<!-- DEFINE $VALUE = 'xyz' -->
|
||||
|
||||
{$VALUE}
|
||||
|
||||
<!-- DEFINE $VALUE = 'abc' -->
|
||||
|
||||
{$VALUE}
|
||||
|
||||
<!-- UNDEFINE $VALUE -->
|
||||
|
||||
{$VALUE}
|
||||
|
||||
<!-- DEFINE $VALUE -->
|
||||
|
||||
<!-- BEGIN loop -->
|
||||
<!-- DEFINE loop.$VALUE = loop.S_ROW_NUM -->
|
||||
{loop.$VALUE}
|
||||
<!-- UNDEFINE $VALUE -->
|
||||
{loop.$VALUE}
|
||||
<!-- UNDEFINE loop.$VALUE -->
|
||||
{loop.$VALUE}
|
||||
|
||||
<!-- END loop -->
|
||||
|
||||
<!-- BEGIN test -->
|
||||
<!-- BEGIN deep -->
|
||||
<!-- BEGIN defines -->
|
||||
<!-- DEFINE test.deep.defines.$VALUE = 12 * 12 -->
|
||||
|
||||
{test.deep.defines.$VALUE}
|
||||
|
||||
<!-- UNDEFINE $VALUE -->
|
||||
|
||||
{test.deep.defines.$VALUE}
|
||||
|
||||
<!-- UNDEFINE test.deep.defines.$VALUE -->
|
||||
|
||||
{test.deep.defines.$VALUE}
|
||||
<!-- END defines -->
|
||||
<!-- END deep -->
|
||||
<!-- END test -->
|
||||
|
||||
@ -76,8 +76,6 @@
|
||||
|
||||
<!-- IF !false -->pass<!-- ELSE -->fail<!-- ENDIF -->
|
||||
|
||||
<!-- IF !! true -->pass<!-- ELSE -->fail<!-- ENDIF -->
|
||||
|
||||
<!-- IF not false -->pass<!-- ELSE -->fail<!-- ENDIF -->
|
||||
|
||||
<!-- IF not not not false -->pass<!-- ELSE -->fail<!-- ENDIF -->
|
||||
|
||||
@ -6,6 +6,6 @@
|
||||
0
|
||||
<!-- ENDIF -->
|
||||
|
||||
<!-- IF !!(S_VALUE > S_OTHER_VALUE) -->
|
||||
<!-- IF (S_VALUE > S_OTHER_VALUE) -->
|
||||
0
|
||||
<!-- ENDIF -->
|
||||
|
||||
@ -16,8 +16,6 @@ loop
|
||||
|
||||
<!-- BEGIN loop -->
|
||||
<!-- BEGIN !block -->
|
||||
|
||||
loop#{loop.S_ROW_NUM}-block#{block.S_ROW_NUM}
|
||||
|
||||
loop#{loop.S_ROW_COUNT}-block#{block.S_ROW_COUNT}
|
||||
<!-- END !block -->
|
||||
<!-- END loop -->
|
||||
|
||||
@ -1,59 +1,19 @@
|
||||
<!-- BEGIN loop -->
|
||||
{loop.S_FIRST_ROW}
|
||||
{loop.S_ROW_NUM}
|
||||
{loop.S_LAST_ROW}
|
||||
<!-- END loop -->
|
||||
|
||||
<!-- BEGIN loop(0) -->
|
||||
{loop.S_FIRST_ROW}
|
||||
{loop.S_ROW_NUM}
|
||||
{loop.S_LAST_ROW}
|
||||
<!-- END loop -->
|
||||
|
||||
<!-- BEGIN loop(0,-1) -->
|
||||
{loop.S_FIRST_ROW}
|
||||
{loop.S_ROW_NUM}
|
||||
{loop.S_LAST_ROW}
|
||||
<!-- END loop -->
|
||||
|
||||
<!-- BEGIN loop(1) -->
|
||||
{loop.S_FIRST_ROW}
|
||||
{loop.S_ROW_NUM}
|
||||
{loop.S_LAST_ROW}
|
||||
<!-- END loop -->
|
||||
|
||||
<!-- BEGIN loop(1,1) -->
|
||||
{loop.S_FIRST_ROW}
|
||||
{loop.S_ROW_NUM}
|
||||
{loop.S_LAST_ROW}
|
||||
<!-- END loop -->
|
||||
|
||||
<!-- BEGIN loop(0,1) -->
|
||||
{loop.S_FIRST_ROW}
|
||||
{loop.S_ROW_NUM}
|
||||
{loop.S_LAST_ROW}
|
||||
<!-- END loop -->
|
||||
|
||||
<!-- BEGIN loop(2,4) -->
|
||||
{loop.S_FIRST_ROW}
|
||||
{loop.S_ROW_NUM}
|
||||
{loop.S_LAST_ROW}
|
||||
<!-- END loop -->
|
||||
|
||||
<!-- BEGIN loop(0,-7) -->
|
||||
{loop.S_FIRST_ROW}
|
||||
{loop.S_ROW_NUM}
|
||||
{loop.S_LAST_ROW}
|
||||
<!-- END loop -->
|
||||
|
||||
<!-- BEGIN loop(-2,6) -->
|
||||
{loop.S_FIRST_ROW}
|
||||
{loop.S_ROW_NUM}
|
||||
{loop.S_LAST_ROW}
|
||||
<!-- END loop -->
|
||||
|
||||
<!-- BEGIN loop(-2,-1) -->
|
||||
{loop.S_FIRST_ROW}
|
||||
{loop.S_ROW_NUM}
|
||||
{loop.S_LAST_ROW}
|
||||
<!-- END loop -->
|
||||
<!-- BEGIN loop -->{loop.S_FIRST_ROW}{loop.S_ROW_COUNT}{loop.S_LAST_ROW}<!-- END loop -->
|
||||
x
|
||||
<!-- BEGIN loop(0) -->{loop.S_FIRST_ROW}{loop.S_ROW_COUNT}{loop.S_LAST_ROW}<!-- END loop -->
|
||||
x
|
||||
<!-- BEGIN loop(0,-1) -->{loop.S_FIRST_ROW}{loop.S_ROW_COUNT}{loop.S_LAST_ROW}<!-- END loop -->
|
||||
x
|
||||
<!-- BEGIN loop(1) -->{loop.S_FIRST_ROW}{loop.S_ROW_COUNT}{loop.S_LAST_ROW}<!-- END loop -->
|
||||
x
|
||||
<!-- BEGIN loop(1,1) -->{loop.S_FIRST_ROW}{loop.S_ROW_COUNT}{loop.S_LAST_ROW}<!-- END loop -->
|
||||
x
|
||||
<!-- BEGIN loop(0,1) -->{loop.S_FIRST_ROW}{loop.S_ROW_COUNT}{loop.S_LAST_ROW}<!-- END loop -->
|
||||
x
|
||||
<!-- BEGIN loop(2,4) -->{loop.S_FIRST_ROW}{loop.S_ROW_COUNT}{loop.S_LAST_ROW}<!-- END loop -->
|
||||
x
|
||||
<!-- BEGIN loop(0,-7) -->{loop.S_FIRST_ROW}{loop.S_ROW_COUNT}{loop.S_LAST_ROW}<!-- END loop -->
|
||||
x
|
||||
<!-- BEGIN loop(-2,6) -->{loop.S_FIRST_ROW}{loop.S_ROW_COUNT}{loop.S_LAST_ROW}<!-- END loop -->
|
||||
x
|
||||
<!-- BEGIN loop(-2,-1) -->{loop.S_FIRST_ROW}{loop.S_ROW_COUNT}{loop.S_LAST_ROW}<!-- END loop -->
|
||||
|
||||
@ -3,20 +3,18 @@
|
||||
|
||||
{loop.S_ROW_COUNT}
|
||||
|
||||
{loop.S_ROW_NUM}
|
||||
|
||||
{loop.S_NUM_ROWS}
|
||||
|
||||
{loop.VARIABLE}
|
||||
|
||||
<!-- IF loop.VARIABLE -->set<!-- ENDIF -->
|
||||
|
||||
<!-- IF loop.S_LAST_ROW -->last<!-- ENDIF -->
|
||||
<!-- IF loop.S_LAST_ROW -->
|
||||
last
|
||||
<!-- ENDIF -->
|
||||
<!-- BEGIN inner -->
|
||||
|
||||
{inner.S_ROW_NUM}
|
||||
{inner.S_ROW_COUNT}
|
||||
|
||||
<!-- IF inner.S_LAST_ROW and inner.S_ROW_NUM and inner.S_NUM_ROWS -->last inner<!-- ENDIF -->
|
||||
<!-- IF inner.S_LAST_ROW and inner.S_ROW_COUNT and inner.S_NUM_ROWS -->last inner<!-- ENDIF -->
|
||||
|
||||
<!-- END inner -->
|
||||
<!-- END loop -->
|
||||
|
||||
@ -1,4 +1,11 @@
|
||||
<?php
|
||||
/**
|
||||
*
|
||||
* @package testing
|
||||
* @copyright (c) 2008 phpBB Group
|
||||
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
|
||||
*
|
||||
*/
|
||||
|
||||
define('IN_PHPBB', true);
|
||||
$phpbb_root_path = '../phpBB/';
|
||||
@ -26,4 +33,4 @@ if (version_compare(PHPUnit_Runner_Version::id(), '3.3.0', '<'))
|
||||
}
|
||||
|
||||
require_once 'PHPUnit/Framework.php';
|
||||
require_once 'test_framework/phpbb_test_case.php';
|
||||
require_once 'test_framework/phpbb_test_case.php';
|
||||
|
||||
@ -1,4 +1,11 @@
|
||||
<?php
|
||||
/**
|
||||
*
|
||||
* @package testing
|
||||
* @copyright (c) 2008 phpBB Group
|
||||
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
|
||||
*
|
||||
*/
|
||||
|
||||
class phpbb_test_case extends PHPUnit_Framework_TestCase
|
||||
{
|
||||
@ -27,4 +34,4 @@ class phpbb_test_case extends PHPUnit_Framework_TestCase
|
||||
$this->expectedTriggerError = true;
|
||||
$this->setExpectedException($exceptionName, (string) $message, $errno);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
/**
|
||||
*
|
||||
* @package testing
|
||||
* @version $Id$
|
||||
* @copyright (c) 2008 phpBB Group
|
||||
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
|
||||
*
|
||||
@ -39,3 +38,4 @@ if (PHPUnit_MAIN_METHOD == 'phpbb_text_processing_all_tests::main')
|
||||
{
|
||||
phpbb_text_processing_all_tests::main();
|
||||
}
|
||||
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
/**
|
||||
*
|
||||
* @package testing
|
||||
* @version $Id$
|
||||
* @copyright (c) 2008 phpBB Group
|
||||
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
|
||||
*
|
||||
@ -104,3 +103,4 @@ class phpbb_text_processing_make_clickable_test extends phpbb_test_case
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
/**
|
||||
*
|
||||
* @package testing
|
||||
* @version $Id$
|
||||
* @copyright (c) 2008 phpBB Group
|
||||
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
|
||||
*
|
||||
@ -41,3 +40,4 @@ if (PHPUnit_MAIN_METHOD == 'phpbb_utf_all_tests::main')
|
||||
{
|
||||
phpbb_utf_all_tests::main();
|
||||
}
|
||||
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
/**
|
||||
*
|
||||
* @package testing
|
||||
* @version $Id$
|
||||
* @copyright (c) 2008 phpBB Group
|
||||
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
|
||||
*
|
||||
@ -30,3 +29,4 @@ class phpbb_utf_utf8_clean_string_test extends phpbb_test_case
|
||||
$this->assertEquals($output, utf8_clean_string($input), $label);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
/**
|
||||
*
|
||||
* @package testing
|
||||
* @version $Id$
|
||||
* @copyright (c) 2008 phpBB Group
|
||||
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
|
||||
*
|
||||
@ -82,3 +81,4 @@ class phpbb_utf_utf8_wordwrap_test extends phpbb_test_case
|
||||
$this->assertEquals($expected, $phpbb_utf8_wordwrap, 'Checking UTF-8 cutting long words');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user