mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-09 02:06:32 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
This commit also ports all ascraeus tests to the new format.

Conflicts:
	tests/all_tests.php
	tests/network/all_tests.php
	tests/request/all_tests.php
	tests/request/request_var.php
	tests/template/templates/includephp.html
This commit is contained in:
Igor Wiedler
2011-01-07 01:39:18 +01:00
parent da4617b14b 5b752a2fed
commit 14a84cf89c
47 changed files with 128 additions and 678 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
tests/request/all_tests.php
View File

@@ -1,47 +0,0 @@
<?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_request_all_tests::main');
}
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
{
public static function main()
{
PHPUnit_TextUI_TestRunner::run(self::suite());
}
public static function suite()
{
$suite = new PHPUnit_Framework_TestSuite('phpBB Request Parameter Handling');
$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;
}
}
if (PHPUnit_MAIN_METHOD == 'phpbb_request_all_tests::main')
{
phpbb_request_all_tests::main();
}

5
tests/request/deactivated_super_global.php
View File

@@ -8,9 +8,8 @@
*
*/
require_once 'test_framework/framework.php';
require_once '../phpBB/includes/request/interface.php';
require_once '../phpBB/includes/request/deactivated_super_global.php';
require_once __DIR__ . '/../../phpBB/includes/request/interface.php';
require_once __DIR__ . '/../../phpBB/includes/request/deactivated_super_global.php';
class phpbb_deactivated_super_global_test extends phpbb_test_case
{

9
tests/request/request.php
View File

@@ -8,11 +8,10 @@
*
*/
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';
require_once __DIR__ . '/../../phpBB/includes/request/type_cast_helper_interface.php';
require_once __DIR__ . '/../../phpBB/includes/request/interface.php';
require_once __DIR__ . '/../../phpBB/includes/request/deactivated_super_global.php';
require_once __DIR__ . '/../../phpBB/includes/request/request.php';
class phpbb_request_test extends phpbb_test_case
{

13
tests/request/request_var.php
View File

@@ -7,13 +7,12 @@
*
*/
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';
require_once __DIR__ . '/../../phpBB/includes/request/type_cast_helper_interface.php';
require_once __DIR__ . '/../../phpBB/includes/request/type_cast_helper.php';
require_once __DIR__ . '/../../phpBB/includes/request/deactivated_super_global.php';
require_once __DIR__ . '/../../phpBB/includes/request/interface.php';
require_once __DIR__ . '/../../phpBB/includes/request/request.php';
require_once __DIR__ . '/../../phpBB/includes/functions.php';
class phpbb_request_var_test extends phpbb_test_case
{

7
tests/request/type_cast_helper.php
View File

@@ -8,10 +8,9 @@
*
*/
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';
require_once __DIR__ . '/../../phpBB/includes/utf/utf_tools.php';
require_once __DIR__ . '/../../phpBB/includes/request/type_cast_helper_interface.php';
require_once __DIR__ . '/../../phpBB/includes/request/type_cast_helper.php';
class phpbb_type_cast_helper_test extends phpbb_test_case
{