diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-01-07 01:39:18 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-01-07 01:39:59 +0100 |
| commit | 14a84cf89cd41da36545f5f04348c49d4eadfb45 (patch) | |
| tree | b04a5988c982b8b367697f03bde3f20ace7d022c /tests/request | |
| parent | da4617b14b11ade6f664b8c1ab94e3aeb5b7428d (diff) | |
| parent | 5b752a2fed82f27cb1e383583dc4ccb87f7e12e5 (diff) | |
| download | forums-14a84cf89cd41da36545f5f04348c49d4eadfb45.tar forums-14a84cf89cd41da36545f5f04348c49d4eadfb45.tar.gz forums-14a84cf89cd41da36545f5f04348c49d4eadfb45.tar.bz2 forums-14a84cf89cd41da36545f5f04348c49d4eadfb45.tar.xz forums-14a84cf89cd41da36545f5f04348c49d4eadfb45.zip | |
Merge branch 'develop-olympus' into develop
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
Diffstat (limited to 'tests/request')
| -rw-r--r-- | tests/request/all_tests.php | 47 | ||||
| -rw-r--r-- | tests/request/deactivated_super_global.php | 5 | ||||
| -rw-r--r-- | tests/request/request.php | 9 | ||||
| -rw-r--r-- | tests/request/request_var.php | 13 | ||||
| -rw-r--r-- | tests/request/type_cast_helper.php | 7 |
5 files changed, 15 insertions, 66 deletions
diff --git a/tests/request/all_tests.php b/tests/request/all_tests.php deleted file mode 100644 index f1633309fd..0000000000 --- a/tests/request/all_tests.php +++ /dev/null @@ -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(); -} - diff --git a/tests/request/deactivated_super_global.php b/tests/request/deactivated_super_global.php index 3c7a638e38..ea385831c9 100644 --- a/tests/request/deactivated_super_global.php +++ b/tests/request/deactivated_super_global.php @@ -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 { diff --git a/tests/request/request.php b/tests/request/request.php index cf275e763c..7cec70b0d4 100644 --- a/tests/request/request.php +++ b/tests/request/request.php @@ -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 { diff --git a/tests/request/request_var.php b/tests/request/request_var.php index 53a4d8097b..64cdd9bc75 100644 --- a/tests/request/request_var.php +++ b/tests/request/request_var.php @@ -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 { diff --git a/tests/request/type_cast_helper.php b/tests/request/type_cast_helper.php index 291b414fd3..3f27269acb 100644 --- a/tests/request/type_cast_helper.php +++ b/tests/request/type_cast_helper.php @@ -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 { |