aboutsummaryrefslogtreecommitdiffstats
path: root/tests/utf
diff options
context:
space:
mode:
authorIgor Wiedler <igor@wiedler.ch>2011-01-03 22:21:54 +0100
committerIgor Wiedler <igor@wiedler.ch>2011-01-04 22:54:01 +0100
commit9a52bd030189280f48a35d3b9e52f9d77071cb5e (patch)
treeca295d6b56ca1e6bcf5617ba42bf4c6f43af7c8d /tests/utf
parentc54683be8c0493a51d9a1dbf4c605e95d17940b2 (diff)
downloadforums-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/utf')
-rw-r--r--tests/utf/all_tests.php43
-rw-r--r--tests/utf/utf8_clean_string_test.php3
-rw-r--r--tests/utf/utf8_wordwrap_test.php3
3 files changed, 2 insertions, 47 deletions
diff --git a/tests/utf/all_tests.php b/tests/utf/all_tests.php
deleted file mode 100644
index 0d5d44d695..0000000000
--- a/tests/utf/all_tests.php
+++ /dev/null
@@ -1,43 +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_utf_all_tests::main');
-}
-
-require_once 'test_framework/framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
-require_once 'utf/utf8_wordwrap_test.php';
-require_once 'utf/utf8_clean_string_test.php';
-
-class phpbb_utf_all_tests
-{
- public static function main()
- {
- PHPUnit_TextUI_TestRunner::run(self::suite());
- }
-
- public static function suite()
- {
- $suite = new PHPUnit_Framework_TestSuite('phpBB Unicode Transformation Format');
-
- $suite->addTestSuite('phpbb_utf_utf8_wordwrap_test');
- $suite->addTestSuite('phpbb_utf_utf8_clean_string_test');
-
- return $suite;
- }
-}
-
-if (PHPUnit_MAIN_METHOD == 'phpbb_utf_all_tests::main')
-{
- phpbb_utf_all_tests::main();
-}
-
diff --git a/tests/utf/utf8_clean_string_test.php b/tests/utf/utf8_clean_string_test.php
index 870ad76fc4..148297ad4b 100644
--- a/tests/utf/utf8_clean_string_test.php
+++ b/tests/utf/utf8_clean_string_test.php
@@ -7,8 +7,7 @@
*
*/
-require_once 'test_framework/framework.php';
-require_once '../phpBB/includes/utf/utf_tools.php';
+require_once __DIR__ . '/../../phpBB/includes/utf/utf_tools.php';
class phpbb_utf_utf8_clean_string_test extends phpbb_test_case
{
diff --git a/tests/utf/utf8_wordwrap_test.php b/tests/utf/utf8_wordwrap_test.php
index ef1165a897..fbc947b92a 100644
--- a/tests/utf/utf8_wordwrap_test.php
+++ b/tests/utf/utf8_wordwrap_test.php
@@ -7,8 +7,7 @@
*
*/
-require_once 'test_framework/framework.php';
-require_once '../phpBB/includes/utf/utf_tools.php';
+require_once __DIR__ . '/../../phpBB/includes/utf/utf_tools.php';
class phpbb_utf_utf8_wordwrap_test extends phpbb_test_case
{