[task/phpunit-xml] Use phpunit.xml for test suite

PHPBB3-9967
kakiac · Jan 4, 2011 · 9a52bd0 · 9a52bd0
1 parent c54683b
commit 9a52bd0
Show file tree

Hide file tree

Showing 34 changed files with 80 additions and 506 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 *~
+phpunit.xml
 phpBB/cache/*.php
 phpBB/config.php
 phpBB/files/*

diff --git a/build/build.xml b/build/build.xml
@@ -42,12 +42,11 @@
 		<delete dir="build/save" />
 	</target>
 
-	<target name="test">
-		<exec dir="tests"
-			command="phpunit --log-junit ../build/logs/phpunit.xml
-			--coverage-clover ../build/logs/clover.xml
-			--coverage-html ../build/coverage
-			phpbb_all_tests all_tests.php"
+	<target name="test" depends="clean,prepare">
+		<exec dir="."
+			command="phpunit --log-junit build/logs/phpunit.xml
+			--coverage-clover build/logs/clover.xml
+			--coverage-html build/coverage"
 			passthru="true" />
 
 

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit backupGlobals="true"
+         backupStaticAttributes="true"
+         colors="false"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="false"
+         bootstrap="tests/bootstrap.php"
+>
+    <testsuites>
+        <testsuite name="phpBB Test Suite">
+            <directory suffix=".php">./tests/</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <blacklist>
+            <directory>./tests/</directory>
+            <directory>./phpBB/</directory>
+        </blacklist>
+        <whitelist>
+            <directory>./phpBB/includes/db/</directory>
+            <file>./phpBB/includes/utf/utf_tools.php</file>
+            <file>./phpBB/includes/functions.php</file>
+            <file>./phpBB/includes/functions_content.php</file>
+            <file>./phpBB/includes/session.php</file>
+            <file>./phpBB/includes/template.php</file>
+        </whitelist>
+    </filter>
+</phpunit>
diff --git a/tests/RUNNING_TESTS.txt b/tests/RUNNING_TESTS.txt
@@ -7,7 +7,7 @@ Prerequisites
 PHPUnit
 -------
 
-phpBB unit tests use PHPUnit framework. Version 3.3 or better is required
+phpBB unit tests use PHPUnit framework. Version 3.5 or better is required
 to run the tests. PHPUnit prefers to be installed via PEAR; refer to
 http://www.phpunit.de/ for more information.
 
@@ -41,14 +41,14 @@ will run phpunit with the same parameters as in the shown test_config.php file:
 
     $ PHPBB_TEST_DBMS='mysqli' PHPBB_TEST_DBHOST='localhost' \
       PHPBB_TEST_DBNAME='database' PHPBB_TEST_DBUSER='user' \
-      PHPBB_TEST_DBPASSWD='password' phpunit all_tests.php
+      PHPBB_TEST_DBPASSWD='password' phpunit
 
 Running
 =======
 
-Once the prerequisites are installed, run the tests from tests directory:
+Once the prerequisites are installed, run the tests from the project root directory (above phpBB):
 
-    $ phpunit all_tests.php
+    $ phpunit
 
 More Information
 ================

diff --git a/tests/all_tests.php b/tests/all_tests.php
diff --git a/tests/test_framework/framework.php → tests/bootstrap.php b/tests/test_framework/framework.php → tests/bootstrap.php
@@ -8,7 +8,7 @@
 */
 
 define('IN_PHPBB', true);
-$phpbb_root_path = '../phpBB/';
+$phpbb_root_path = 'phpBB/';
 $phpEx = 'php';
 $table_prefix = '';
 
@@ -25,19 +25,6 @@
 
 require_once $phpbb_root_path . 'includes/constants.php';
 
-// require at least PHPUnit 3.3.0
-require_once 'PHPUnit/Runner/Version.php';
-if (version_compare(PHPUnit_Runner_Version::id(), '3.3.0', '<'))
-{
-	trigger_error('PHPUnit >= 3.3.0 required');
-}
-
-if (version_compare(PHPUnit_Runner_Version::id(), '3.5.0', '<'))
-{
-	require_once 'PHPUnit/Framework.php';
-	require_once 'PHPUnit/Extensions/Database/TestCase.php';
-}
-
 require_once 'test_framework/phpbb_test_case_helpers.php';
 require_once 'test_framework/phpbb_test_case.php';
 require_once 'test_framework/phpbb_database_test_case.php';
diff --git a/tests/dbal/all_tests.php b/tests/dbal/all_tests.php
diff --git a/tests/dbal/select.php b/tests/dbal/select.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_dbal_select_test extends phpbb_database_test_case
 {

diff --git a/tests/dbal/write.php b/tests/dbal/write.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_dbal_write_test extends phpbb_database_test_case
 {

diff --git a/tests/network/all_tests.php b/tests/network/all_tests.php
diff --git 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/random/all_tests.php b/tests/random/all_tests.php
diff --git a/tests/random/gen_rand_string.php b/tests/random/gen_rand_string.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_random_gen_rand_string_test extends phpbb_test_case
 {

diff --git a/tests/regex/all_tests.php b/tests/regex/all_tests.php