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/download | |
| 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/download')
| -rw-r--r-- | tests/download/all_tests.php | 40 | ||||
| -rw-r--r-- | tests/download/http_byte_range.php | 3 |
2 files changed, 1 insertions, 42 deletions
diff --git a/tests/download/all_tests.php b/tests/download/all_tests.php deleted file mode 100644 index 21305a887c..0000000000 --- a/tests/download/all_tests.php +++ /dev/null @@ -1,40 +0,0 @@ -<?php -/** -* -* @package testing -* @copyright (c) 2010 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License -* -*/ - -if (!defined('PHPUnit_MAIN_METHOD')) -{ - define('PHPUnit_MAIN_METHOD', 'phpbb_download_all_tests::main'); -} - -require_once 'test_framework/framework.php'; -require_once 'PHPUnit/TextUI/TestRunner.php'; - -require_once 'download/http_byte_range.php'; - -class phpbb_download_all_tests -{ - public static function main() - { - PHPUnit_TextUI_TestRunner::run(self::suite()); - } - - public static function suite() - { - $suite = new PHPUnit_Framework_TestSuite('phpBB Download Tests'); - - $suite->addTestSuite('phpbb_download_http_byte_range_test'); - - return $suite; - } -} - -if (PHPUnit_MAIN_METHOD == 'phpbb_download_all_tests::main') -{ - phpbb_regex_all_tests::main(); -} diff --git a/tests/download/http_byte_range.php b/tests/download/http_byte_range.php index cc42dee353..4f14746bef 100644 --- a/tests/download/http_byte_range.php +++ b/tests/download/http_byte_range.php @@ -7,8 +7,7 @@ * */ -require_once 'test_framework/framework.php'; -require_once '../phpBB/includes/functions_download.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_download.php'; class phpbb_download_http_byte_range_test extends phpbb_test_case { |