diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-01-03 22:21:54 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-01-04 22:54:01 +0100 |
| commit | 9a52bd030189280f48a35d3b9e52f9d77071cb5e (patch) | |
| tree | ca295d6b56ca1e6bcf5617ba42bf4c6f43af7c8d /tests/regex | |
| parent | c54683be8c0493a51d9a1dbf4c605e95d17940b2 (diff) | |
| download | forums-9a52bd030189280f48a35d3b9e52f9d77071cb5e.tar forums-9a52bd030189280f48a35d3b9e52f9d77071cb5e.tar.gz forums-9a52bd030189280f48a35d3b9e52f9d77071cb5e.tar.bz2 forums-9a52bd030189280f48a35d3b9e52f9d77071cb5e.tar.xz forums-9a52bd030189280f48a35d3b9e52f9d77071cb5e.zip | |
[task/phpunit-xml] Use phpunit.xml for test suite
PHPBB3-9967
Diffstat (limited to 'tests/regex')
| -rw-r--r-- | tests/regex/all_tests.php | 46 | ||||
| -rw-r--r-- | tests/regex/email.php | 3 | ||||
| -rw-r--r-- | tests/regex/ipv4.php | 3 | ||||
| -rw-r--r-- | tests/regex/ipv6.php | 3 | ||||
| -rw-r--r-- | tests/regex/url.php | 3 |
5 files changed, 4 insertions, 54 deletions
diff --git a/tests/regex/all_tests.php b/tests/regex/all_tests.php deleted file mode 100644 index 316a9d4a58..0000000000 --- a/tests/regex/all_tests.php +++ /dev/null @@ -1,46 +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_regex_all_tests::main'); -} - -require_once 'test_framework/framework.php'; -require_once 'PHPUnit/TextUI/TestRunner.php'; - -require_once 'regex/email.php'; -require_once 'regex/ipv4.php'; -require_once 'regex/ipv6.php'; -require_once 'regex/url.php'; - -class phpbb_regex_all_tests -{ - public static function main() - { - PHPUnit_TextUI_TestRunner::run(self::suite()); - } - - public static function suite() - { - $suite = new PHPUnit_Framework_TestSuite('phpBB Regular Expressions'); - - $suite->addTestSuite('phpbb_regex_email_test'); - $suite->addTestSuite('phpbb_regex_ipv4_test'); - $suite->addTestSuite('phpbb_regex_ipv6_test'); - $suite->addTestSuite('phpbb_regex_url_test'); - - return $suite; - } -} - -if (PHPUnit_MAIN_METHOD == 'phpbb_regex_all_tests::main') -{ - phpbb_regex_all_tests::main(); -} diff --git a/tests/regex/email.php b/tests/regex/email.php index 8658b8af36..5d6e207cbb 100644 --- a/tests/regex/email.php +++ b/tests/regex/email.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_regex_email_test extends phpbb_test_case { diff --git a/tests/regex/ipv4.php b/tests/regex/ipv4.php index 9d131ad0ca..735a2c4384 100644 --- a/tests/regex/ipv4.php +++ b/tests/regex/ipv4.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_regex_ipv4_test extends phpbb_test_case { diff --git a/tests/regex/ipv6.php b/tests/regex/ipv6.php index 3d7a72e492..187588f861 100644 --- a/tests/regex/ipv6.php +++ b/tests/regex/ipv6.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_regex_ipv6_test extends phpbb_test_case { diff --git a/tests/regex/url.php b/tests/regex/url.php index 678b7d108f..246cbf549c 100644 --- a/tests/regex/url.php +++ b/tests/regex/url.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_regex_url_test extends phpbb_test_case { |