diff options
Diffstat (limited to 'tests/network')
| -rw-r--r-- | tests/network/all_tests.php | 44 | ||||
| -rw-r--r-- | tests/network/checkdnsrr.php | 3 | ||||
| -rw-r--r-- | tests/network/inet_ntop_pton.php | 3 | ||||
| -rw-r--r-- | tests/network/ip_normalise.php | 3 |
4 files changed, 3 insertions, 50 deletions
diff --git a/tests/network/all_tests.php b/tests/network/all_tests.php deleted file mode 100644 index fd36009f4c..0000000000 --- a/tests/network/all_tests.php +++ /dev/null @@ -1,44 +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'; -require_once 'network/inet_ntop_pton.php'; -require_once 'network/ip_normalise.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'); - $suite->addTestSuite('phpbb_network_inet_ntop_pton_test'); - $suite->addTestSuite('phpbb_network_ip_normalise_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 { diff --git a/tests/network/inet_ntop_pton.php b/tests/network/inet_ntop_pton.php index 4cea6cfa3a..7d4f44aaca 100644 --- a/tests/network/inet_ntop_pton.php +++ b/tests/network/inet_ntop_pton.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_inet_ntop_pton_test extends phpbb_test_case { diff --git a/tests/network/ip_normalise.php b/tests/network/ip_normalise.php index 53d41e9371..c10ea6e088 100644 --- a/tests/network/ip_normalise.php +++ b/tests/network/ip_normalise.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_ip_normalise_test extends phpbb_test_case { |