diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-01-07 01:15:06 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-01-07 01:15:06 +0100 |
| commit | 5b752a2fed82f27cb1e383583dc4ccb87f7e12e5 (patch) | |
| tree | 03b5121cc6e5066ba69a92a2af3b18b4509644fa /tests/network | |
| parent | d968d35271229671d1285d6c53a1c6aa110307fb (diff) | |
| parent | b48b90977382e936a4d98981e55b02c8e574e07b (diff) | |
| download | forums-5b752a2fed82f27cb1e383583dc4ccb87f7e12e5.tar forums-5b752a2fed82f27cb1e383583dc4ccb87f7e12e5.tar.gz forums-5b752a2fed82f27cb1e383583dc4ccb87f7e12e5.tar.bz2 forums-5b752a2fed82f27cb1e383583dc4ccb87f7e12e5.tar.xz forums-5b752a2fed82f27cb1e383583dc4ccb87f7e12e5.zip | |
Merge branch 'task/phpunit-xml' into develop-olympus
Diffstat (limited to 'tests/network')
| -rw-r--r-- | tests/network/all_tests.php | 40 | ||||
| -rw-r--r-- | tests/network/checkdnsrr.php | 3 |
2 files changed, 1 insertions, 42 deletions
diff --git a/tests/network/all_tests.php b/tests/network/all_tests.php deleted file mode 100644 index b500647f81..0000000000 --- a/tests/network/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_network_all_tests::main'); -} - -require_once 'test_framework/framework.php'; -require_once 'PHPUnit/TextUI/TestRunner.php'; - -require_once 'network/checkdnsrr.php'; - -class phpbb_network_all_tests -{ - public static function main() - { - PHPUnit_TextUI_TestRunner::run(self::suite()); - } - - public static function suite() - { - $suite = new PHPUnit_Framework_TestSuite('phpBB Network Functions'); - - $suite->addTestSuite('phpbb_network_checkdnsrr_test'); - - return $suite; - } -} - -if (PHPUnit_MAIN_METHOD == 'phpbb_network_all_tests::main') -{ - phpbb_network_all_tests::main(); -} diff --git a/tests/network/checkdnsrr.php b/tests/network/checkdnsrr.php index 57fe2761cc..427132e508 100644 --- a/tests/network/checkdnsrr.php +++ b/tests/network/checkdnsrr.php @@ -7,8 +7,7 @@ * */ -require_once 'test_framework/framework.php'; -require_once '../phpBB/includes/functions.php'; +require_once __DIR__ . '/../../phpBB/includes/functions.php'; class phpbb_network_checkdnsrr_test extends phpbb_test_case { |