Merge branch 'develop-olympus' into develop

This commit also ports all ascraeus tests to the new format. Conflicts: tests/all_tests.php tests/network/all_tests.php tests/request/all_tests.php tests/request/request_var.php tests/template/templates/includephp.html
author: Igor Wiedler <igor@wiedler.ch> 2011-01-07 01:39:18 +0100
committer: Igor Wiedler <igor@wiedler.ch> 2011-01-07 01:39:59 +0100
commit: 14a84cf89cd41da36545f5f04348c49d4eadfb45 (patch)
tree: b04a5988c982b8b367697f03bde3f20ace7d022c
parent: da4617b14b11ade6f664b8c1ab94e3aeb5b7428d (diff)
parent: 5b752a2fed82f27cb1e383583dc4ccb87f7e12e5 (diff)
download: forums-14a84cf89cd41da36545f5f04348c49d4eadfb45.tar
forums-14a84cf89cd41da36545f5f04348c49d4eadfb45.tar.gz
forums-14a84cf89cd41da36545f5f04348c49d4eadfb45.tar.bz2
forums-14a84cf89cd41da36545f5f04348c49d4eadfb45.tar.xz
forums-14a84cf89cd41da36545f5f04348c49d4eadfb45.zip
47 files changed, 128 insertions, 678 deletions
diff --git a/.gitignore b/.gitignore
index 871d17b386..39b9e0a7f4 100644
--- 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
index 8d2afcb00c..8321edf374 100644
--- 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/phpBB/docs/nginx.conf.sample b/phpBB/docs/nginx.sample.conf
index a22a126ff4..a22a126ff4 100644
--- a/phpBB/docs/nginx.conf.sample
+++ b/phpBB/docs/nginx.sample.conf
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
new file mode 100644
index 0000000000..d1d8adbdd5
--- /dev/null
+++ b/phpunit.xml.dist
@@ -0,0 +1,25 @@
+<?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>
+        </blacklist>
+    </filter>
+</phpunit>
diff --git a/tests/RUNNING_TESTS.txt b/tests/RUNNING_TESTS.txt
index 74a0635c1a..ac07978d3e 100644
--- 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
deleted file mode 100644
index 4c2fa891a2..0000000000
--- a/tests/all_tests.php
+++ /dev/null
@@ -1,73 +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_all_tests::main');
-}
-
-require_once 'test_framework/framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
-require_once 'class_loader/all_tests.php';
-require_once 'utf/all_tests.php';
-require_once 'request/all_tests.php';
-require_once 'security/all_tests.php';
-require_once 'template/all_tests.php';
-#require_once 'bbcode/all_tests.php';
-require_once 'text_processing/all_tests.php';
-require_once 'dbal/all_tests.php';
-require_once 'regex/all_tests.php';
-require_once 'network/all_tests.php';
-require_once 'random/all_tests.php';
-require_once 'download/all_tests.php';
-
-// exclude the test directory from code coverage reports
-if (version_compare(PHPUnit_Runner_Version::id(), '3.5.0') >= 0)
-{
-	PHP_CodeCoverage_Filter::getInstance()->addDirectoryToBlacklist('./');
-}
-else
-{
-	PHPUnit_Util_Filter::addDirectoryToFilter('./');
-}
-
-class phpbb_all_tests
-{
-	public static function main()
-	{
-		PHPUnit_TextUI_TestRunner::run(self::suite());
-	}
-
-	public static function suite()
-	{
-		$suite = new PHPUnit_Framework_TestSuite('phpBB');
-
-		$suite->addTest(phpbb_class_loader_all_tests::suite());
-		$suite->addTest(phpbb_utf_all_tests::suite());
-		$suite->addTest(phpbb_request_all_tests::suite());
-		$suite->addTest(phpbb_security_all_tests::suite());
-		$suite->addTest(phpbb_template_all_tests::suite());
-#		$suite->addTest(phpbb_bbcode_all_tests::suite());
-		$suite->addTest(phpbb_text_processing_all_tests::suite());
-		$suite->addTest(phpbb_dbal_all_tests::suite());
-		$suite->addTest(phpbb_regex_all_tests::suite());
-		$suite->addTest(phpbb_network_all_tests::suite());
-		$suite->addTest(phpbb_random_all_tests::suite());
-		$suite->addTest(phpbb_download_all_tests::suite());
-
-		return $suite;
-	}
-}
-
-if (PHPUnit_MAIN_METHOD == 'phpbb_all_tests::main')
-{
-	phpbb_all_tests::main();
-}
-
diff --git a/tests/bbcode/all_tests.php b/tests/bbcode/all_tests.php
deleted file mode 100644
index 925971f504..0000000000
--- a/tests/bbcode/all_tests.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @version $Id$
-* @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-define('IN_PHPBB', true);
-
-if (!defined('PHPUnit_MAIN_METHOD'))
-{
-	define('PHPUnit_MAIN_METHOD', 'phpbb_bbcode_all_tests::main');
-}
-
-require_once 'test_framework/framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
-require_once 'bbcode/parser_test.php';
-
-class phpbb_bbcode_all_tests
-{
-	public static function main()
-	{
-		PHPUnit_TextUI_TestRunner::run(self::suite());
-	}
-
-	public static function suite()
-	{
-		$suite = new PHPUnit_Framework_TestSuite('phpBB Formatted Text / BBCode');
-
-		$suite->addTestSuite('phpbb_bbcode_parser_test');
-
-		return $suite;
-	}
-}
-
-if (PHPUnit_MAIN_METHOD == 'phpbb_bbcode_all_tests::main')
-{
-	phpbb_bbcode_all_tests::main();
-}
diff --git a/tests/bbcode/parser_test.php b/tests/bbcode/parser_test.php
index 7c7aca6230..4a11f47680 100644
--- a/tests/bbcode/parser_test.php
+++ b/tests/bbcode/parser_test.php
@@ -8,16 +8,15 @@
 *
 */
 
-define('IN_PHPBB', true);
-
-require_once 'test_framework/framework.php';
-require_once '../phpBB/includes/bbcode/bbcode_parser_base.php';
-require_once '../phpBB/includes/bbcode/bbcode_parser.php';
+// require_once __DIR__ . '/../../phpBB/includes/bbcode/bbcode_parser_base.php';
+// require_once __DIR__ . '/../../phpBB/includes/bbcode/bbcode_parser.php';
 
 class phpbb_bbcode_parser_test extends PHPUnit_Framework_TestCase
 {
 	public function test_both_passes()
 	{
+	    $this->markTestIncomplete('New bbcode parser has not been backported from feature/ascraeus-experiment yet.');
+	    
 		$parser = new phpbb_bbcode_parser();
 
 		$result = $parser->first_pass('[i]Italic [u]underlined text[/u][/i]');
diff --git a/tests/test_framework/framework.php b/tests/bootstrap.php
index 3a11cc6df9..99f145e427 100644
--- a/tests/test_framework/framework.php
+++ b/tests/bootstrap.php
@@ -8,10 +8,12 @@
 */
 
 define('IN_PHPBB', true);
-$phpbb_root_path = '../phpBB/';
+$phpbb_root_path = 'phpBB/';
 $phpEx = 'php';
 $table_prefix = '';
 
+error_reporting(E_ALL & ~E_DEPRECATED);
+
 // If we are on PHP >= 6.0.0 we do not need some code
 if (version_compare(PHP_VERSION, '6.0.0-dev', '>='))
 {
@@ -25,19 +27,6 @@ else
 
 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/class_loader/all_tests.php b/tests/class_loader/all_tests.php
deleted file mode 100644
index 451a1b02c2..0000000000
--- a/tests/class_loader/all_tests.php
+++ /dev/null
@@ -1,41 +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_class_loader_all_tests::main');
-}
-
-require_once 'test_framework/framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
-require_once 'class_loader/class_loader_test.php';
-
-class phpbb_class_loader_all_tests
-{
-	public static function main()
-	{
-		PHPUnit_TextUI_TestRunner::run(self::suite());
-	}
-
-	public static function suite()
-	{
-		$suite = new PHPUnit_Framework_TestSuite('phpBB Class Loader');
-
-		$suite->addTestSuite('phpbb_class_loader_test');
-
-		return $suite;
-	}
-}
-
-if (PHPUnit_MAIN_METHOD == 'phpbb_class_loader_all_tests::main')
-{
-	phpbb_class_loader_all_tests::main();
-}
-
diff --git a/tests/class_loader/class_loader_test.php b/tests/class_loader/class_loader_test.php
index ecfac8080d..aef4f1de07 100644
--- a/tests/class_loader/class_loader_test.php
+++ b/tests/class_loader/class_loader_test.php
@@ -8,17 +8,15 @@
 *
 */
 
-require_once 'test_framework/framework.php';
-require_once 'class_loader/cache_mock.php';
-
-require_once '../phpBB/includes/class_loader.php';
+require_once __DIR__ . '/cache_mock.php';
 
+require_once __DIR__ . '/../../phpBB/includes/class_loader.php';
 
 class phpbb_class_loader_test extends PHPUnit_Framework_TestCase
 {
 	public function test_resolve_path()
 	{
-		$prefix = 'class_loader/';
+		$prefix = __DIR__ . '/';
 		$class_loader = new phpbb_class_loader($prefix);
 
 		$prefix .= 'includes/';
@@ -56,7 +54,7 @@ class phpbb_class_loader_test extends PHPUnit_Framework_TestCase
 		$cache = new phpbb_cache_mock;
 		$cache->put('class_loader', array('phpbb_a_cached_name' => 'a/cached_name'));
 
-		$prefix = 'class_loader/';
+		$prefix = __DIR__ . '/';
 		$class_loader = new phpbb_class_loader($prefix, '.php', $cache);
 
 		$prefix .= 'includes/';
diff --git a/tests/dbal/all_tests.php b/tests/dbal/all_tests.php
deleted file mode 100644
index cfa8176246..0000000000
--- a/tests/dbal/all_tests.php
+++ /dev/null
@@ -1,42 +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_dbal_all_tests::main');
-}
-
-require_once 'test_framework/framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
-require_once 'dbal/select.php';
-require_once 'dbal/write.php';
-
-class phpbb_dbal_all_tests
-{
-	public static function main()
-	{
-		PHPUnit_TextUI_TestRunner::run(self::suite());
-	}
-
-	public static function suite()
-	{
-		$suite = new PHPUnit_Framework_TestSuite('phpBB Database Abstraction Layer');
-
-		$suite->addTestSuite('phpbb_dbal_select_test');
-		$suite->addTestSuite('phpbb_dbal_write_test');
-
-		return $suite;
-	}
-}
-
-if (PHPUnit_MAIN_METHOD == 'phpbb_dbal_all_tests::main')
-{
-	phpbb_dbal_all_tests::main();
-}
diff --git a/tests/dbal/select.php b/tests/dbal/select.php
index 70f27549d2..987de5cbff 100644
--- 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
index 01deacda69..a24b6efcc4 100644
--- 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/download/all_tests.php b/tests/download/all_tests.php
deleted file mode 100644
index 21305a887c..0000000000
--- a/tests/download/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_download_all_tests::main');
-}
-
-require_once 'test_framework/framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
-require_once 'download/http_byte_range.php';
-
-class phpbb_download_all_tests
-{
-	public static function main()
-	{
-		PHPUnit_TextUI_TestRunner::run(self::suite());
-	}
-
-	public static function suite()
-	{
-		$suite = new PHPUnit_Framework_TestSuite('phpBB Download Tests');
-
-		$suite->addTestSuite('phpbb_download_http_byte_range_test');
-
-		return $suite;
-	}
-}
-
-if (PHPUnit_MAIN_METHOD == 'phpbb_download_all_tests::main')
-{
-	phpbb_regex_all_tests::main();
-}
diff --git a/tests/download/http_byte_range.php b/tests/download/http_byte_range.php
index cc42dee353..4f14746bef 100644
--- a/tests/download/http_byte_range.php
+++ b/tests/download/http_byte_range.php
@@ -7,8 +7,7 @@
 *
 */
 
-require_once 'test_framework/framework.php';
-require_once '../phpBB/includes/functions_download.php';
+require_once __DIR__ . '/../../phpBB/includes/functions_download.php';
 
 class phpbb_download_http_byte_range_test extends phpbb_test_case
 {
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
 {
diff --git a/tests/random/all_tests.php b/tests/random/all_tests.php
deleted file mode 100644
index c6ffe78024..0000000000
--- a/tests/random/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_random_all_tests::main');
-}
-
-require_once 'test_framework/framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
-require_once 'random/gen_rand_string.php';
-
-class phpbb_random_all_tests
-{
-	public static function main()
-	{
-		PHPUnit_TextUI_TestRunner::run(self::suite());
-	}
-
-	public static function suite()
-	{
-		$suite = new PHPUnit_Framework_TestSuite('phpBB Random Functions');
-
-		$suite->addTestSuite('phpbb_random_gen_rand_string_test');
-
-		return $suite;
-	}
-}
-
-if (PHPUnit_MAIN_METHOD == 'phpbb_random_all_tests::main')
-{
-	phpbb_random_all_tests::main();
-}
diff --git a/tests/random/gen_rand_string.php b/tests/random/gen_rand_string.php
index cd58d14ed3..fa519f134c 100644
--- 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
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
 {
diff --git a/tests/request/all_tests.php b/tests/request/all_tests.php
deleted file mode 100644
index f1633309fd..0000000000
--- a/tests/request/all_tests.php
+++ /dev/null
@@ -1,47 +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_request_all_tests::main');
-}
-
-require_once 'test_framework/framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
-require_once 'request/type_cast_helper.php';
-require_once 'request/deactivated_super_global.php';
-require_once 'request/request.php';
-require_once 'request/request_var.php';
-
-class phpbb_request_all_tests
-{
-	public static function main()
-	{
-		PHPUnit_TextUI_TestRunner::run(self::suite());
-	}
-
-	public static function suite()
-	{
-		$suite = new PHPUnit_Framework_TestSuite('phpBB Request Parameter Handling');
-
-		$suite->addTestSuite('phpbb_type_cast_helper_test');
-		$suite->addTestSuite('phpbb_deactivated_super_global_test');
-		$suite->addTestSuite('phpbb_request_test');
-		$suite->addTestSuite('phpbb_request_var_test');
-
-		return $suite;
-	}
-}
-
-if (PHPUnit_MAIN_METHOD == 'phpbb_request_all_tests::main')
-{
-	phpbb_request_all_tests::main();
-}
-
diff --git a/tests/request/deactivated_super_global.php b/tests/request/deactivated_super_global.php
index 3c7a638e38..ea385831c9 100644
--- a/tests/request/deactivated_super_global.php
+++ b/tests/request/deactivated_super_global.php
@@ -8,9 +8,8 @@
 *
 */
 
-require_once 'test_framework/framework.php';
-require_once '../phpBB/includes/request/interface.php';
-require_once '../phpBB/includes/request/deactivated_super_global.php';
+require_once __DIR__ . '/../../phpBB/includes/request/interface.php';
+require_once __DIR__ . '/../../phpBB/includes/request/deactivated_super_global.php';
 
 class phpbb_deactivated_super_global_test extends phpbb_test_case
 {
diff --git a/tests/request/request.php b/tests/request/request.php
index cf275e763c..7cec70b0d4 100644
--- a/tests/request/request.php
+++ b/tests/request/request.php
@@ -8,11 +8,10 @@
 *
 */
 
-require_once 'test_framework/framework.php';
-require_once '../phpBB/includes/request/type_cast_helper_interface.php';
-require_once '../phpBB/includes/request/interface.php';
-require_once '../phpBB/includes/request/deactivated_super_global.php';
-require_once '../phpBB/includes/request/request.php';
+require_once __DIR__ . '/../../phpBB/includes/request/type_cast_helper_interface.php';
+require_once __DIR__ . '/../../phpBB/includes/request/interface.php';
+require_once __DIR__ . '/../../phpBB/includes/request/deactivated_super_global.php';
+require_once __DIR__ . '/../../phpBB/includes/request/request.php';
 
 class phpbb_request_test extends phpbb_test_case
 {
diff --git a/tests/request/request_var.php b/tests/request/request_var.php
index 53a4d8097b..64cdd9bc75 100644
--- a/tests/request/request_var.php
+++ b/tests/request/request_var.php
@@ -7,13 +7,12 @@
 *
 */
 
-require_once 'test_framework/framework.php';
-require_once '../phpBB/includes/request/type_cast_helper_interface.php';
-require_once '../phpBB/includes/request/type_cast_helper.php';
-require_once '../phpBB/includes/request/deactivated_super_global.php';
-require_once '../phpBB/includes/request/interface.php';
-require_once '../phpBB/includes/request/request.php';
-require_once '../phpBB/includes/functions.php';
+require_once __DIR__ . '/../../phpBB/includes/request/type_cast_helper_interface.php';
+require_once __DIR__ . '/../../phpBB/includes/request/type_cast_helper.php';
+require_once __DIR__ . '/../../phpBB/includes/request/deactivated_super_global.php';
+require_once __DIR__ . '/../../phpBB/includes/request/interface.php';
+require_once __DIR__ . '/../../phpBB/includes/request/request.php';
+require_once __DIR__ . '/../../phpBB/includes/functions.php';
 
 class phpbb_request_var_test extends phpbb_test_case
 {
diff --git a/tests/request/type_cast_helper.php b/tests/request/type_cast_helper.php
index 291b414fd3..3f27269acb 100644
--- a/tests/request/type_cast_helper.php
+++ b/tests/request/type_cast_helper.php
@@ -8,10 +8,9 @@
 *
 */
 
-require_once 'test_framework/framework.php';
-require_once '../phpBB/includes/utf/utf_tools.php';
-require_once '../phpBB/includes/request/type_cast_helper_interface.php';
-require_once '../phpBB/includes/request/type_cast_helper.php';
+require_once __DIR__ . '/../../phpBB/includes/utf/utf_tools.php';
+require_once __DIR__ . '/../../phpBB/includes/request/type_cast_helper_interface.php';
+require_once __DIR__ . '/../../phpBB/includes/request/type_cast_helper.php';
 
 class phpbb_type_cast_helper_test extends phpbb_test_case
 {
diff --git a/tests/security/all_tests.php b/tests/security/base.php
index 8e3916733f..db9c884cf4 100644
--- a/tests/security/all_tests.php
+++ b/tests/security/base.php
@@ -7,18 +7,7 @@
 *
 */
 
-if (!defined('PHPUnit_MAIN_METHOD'))
-{
-	define('PHPUnit_MAIN_METHOD', 'phpbb_security_all_tests::main');
-}
-
-require_once 'test_framework/framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
-require_once 'security/extract_current_page.php';
-require_once 'security/redirect.php';
-
-class phpbb_security_all_tests extends PHPUnit_Framework_TestSuite
+abstract class phpbb_security_test_base extends phpbb_test_case
 {
 	/**
 	* Set up the required user object and server variables for the suites
@@ -62,25 +51,4 @@ class phpbb_security_all_tests extends PHPUnit_Framework_TestSuite
 		global $user;
 		$user = NULL;
 	}
-
-	public static function main()
-	{
-		PHPUnit_TextUI_TestRunner::run(self::suite());
-	}
-
-	public static function suite()
-	{
-		// I bet there is a better method calling this... :)
-		$suite = new phpbb_security_all_tests('phpBB Security Fixes');
-
-		$suite->addTestSuite('phpbb_security_extract_current_page_test');
-		$suite->addTestSuite('phpbb_security_redirect_test');
-
-		return $suite;
-	}
-}
-
-if (PHPUnit_MAIN_METHOD == 'phpbb_security_all_tests::main')
-{
-	phpbb_security_all_tests::main();
 }
diff --git a/tests/security/extract_current_page.php b/tests/security/extract_current_page.php
index 8c72fe1440..ff0ab4d1bb 100644
--- a/tests/security/extract_current_page.php
+++ b/tests/security/extract_current_page.php
@@ -7,12 +7,12 @@
 *
 */
 
-require_once 'test_framework/framework.php';
+require_once __DIR__ . '/base.php';
 
-require_once '../phpBB/includes/functions.php';
-require_once '../phpBB/includes/session.php';
+require_once __DIR__ . '/../../phpBB/includes/functions.php';
+require_once __DIR__ . '/../../phpBB/includes/session.php';
 
-class phpbb_security_extract_current_page_test extends phpbb_test_case
+class phpbb_security_extract_current_page_test extends phpbb_security_test_base
 {
 	public static function security_variables()
 	{
diff --git a/tests/security/redirect.php b/tests/security/redirect.php
index 37b0a5bb41..c53414e7df 100644
--- a/tests/security/redirect.php
+++ b/tests/security/redirect.php
@@ -7,12 +7,12 @@
 *
 */
 
-require_once 'test_framework/framework.php';
+require_once __DIR__ . '/base.php';
 
-require_once '../phpBB/includes/functions.php';
-require_once '../phpBB/includes/session.php';
+require_once __DIR__ . '/../../phpBB/includes/functions.php';
+require_once __DIR__ . '/../../phpBB/includes/session.php';
 
-class phpbb_security_redirect_test extends phpbb_test_case
+class phpbb_security_redirect_test extends phpbb_security_test_base
 {
 	public static function provider()
 	{
@@ -22,13 +22,15 @@ class phpbb_security_redirect_test extends phpbb_test_case
 			array('bad://localhost/phpBB/index.php', 'Tried to redirect to potentially insecure url.', false),
 			array('http://www.otherdomain.com/somescript.php', false, 'http://localhost/phpBB'),
 			array("http://localhost/phpBB/memberlist.php\n\rConnection: close", 'Tried to redirect to potentially insecure url.', false),
-			array('javascript:test', false, 'http://localhost/phpBB/../tests/javascript:test'),
+			array('javascript:test', false, 'http://localhost/phpBB/../javascript:test'),
 			array('http://localhost/phpBB/index.php;url=', 'Tried to redirect to potentially insecure url.', false),
 		);
 	}
 
 	protected function setUp()
 	{
+		parent::setUp();
+		
 		$GLOBALS['config'] = array(
 			'force_server_vars'	=> '0',
 		);
diff --git a/tests/template/all_tests.php b/tests/template/all_tests.php
deleted file mode 100644
index ea258c1680..0000000000
--- a/tests/template/all_tests.php
+++ /dev/null
@@ -1,40 +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_template_all_tests::main');
-}
-
-require_once 'test_framework/framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
-require_once 'template/template.php';
-
-class phpbb_template_all_tests
-{
-	public static function main()
-	{
-		PHPUnit_TextUI_TestRunner::run(self::suite());
-	}
-
-	public static function suite()
-	{
-		$suite = new PHPUnit_Framework_TestSuite('phpBB Template Engine');
-
-		$suite->addTestSuite('phpbb_template_template_test');
-
-		return $suite;
-	}
-}
-
-if (PHPUnit_MAIN_METHOD == 'phpbb_template_all_tests::main')
-{
-	phpbb_template_all_tests::main();
-}
diff --git a/tests/template/template.php b/tests/template/template.php
index 0a685bfd61..a58a0a4e0f 100644
--- a/tests/template/template.php
+++ b/tests/template/template.php
@@ -7,9 +7,7 @@
 *
 */
 
-require_once 'test_framework/framework.php';
-
-require_once '../phpBB/includes/template.php';
+require_once __DIR__ . '/../../phpBB/includes/template.php';
 
 class phpbb_template_template_test extends phpbb_test_case
 {
diff --git a/tests/template/templates/_dummy_include.php b/tests/template/templates/_dummy_include.php
deleted file mode 100644
index 1de5dddf59..0000000000
--- a/tests/template/templates/_dummy_include.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-echo "testing included php";
diff --git a/tests/template/templates/_dummy_include.php.inc b/tests/template/templates/_dummy_include.php.inc
new file mode 100644
index 0000000000..aacb6b2045
--- /dev/null
+++ b/tests/template/templates/_dummy_include.php.inc
@@ -0,0 +1,3 @@
+<?php
+// extension is .php.inc so PHPUnit ignores it
+echo "testing included php";
diff --git a/tests/template/templates/includephp.html b/tests/template/templates/includephp.html
index 42c78b9377..117d4273f0 100644
--- a/tests/template/templates/includephp.html
+++ b/tests/template/templates/includephp.html
@@ -1 +1 @@
-<!-- INCLUDEPHP _dummy_include.php -->
+<!-- INCLUDEPHP ../templates/_dummy_include.php.inc -->
diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php
index a64bae8c57..9752ec2fe6 100644
--- a/tests/test_framework/phpbb_database_test_case.php
+++ b/tests/test_framework/phpbb_database_test_case.php
@@ -13,6 +13,21 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 
 	protected $test_case_helpers;
 
+	public function __construct($name = NULL, array $data = array(), $dataName = '')
+	{
+		parent::__construct($name, $data, $dataName);
+		$this->backupStaticAttributesBlacklist += array(
+			'PHP_CodeCoverage' => array('instance'),
+			'PHP_CodeCoverage_Filter' => array('instance'),
+			'PHP_CodeCoverage_Util' => array('ignoredLines', 'templateMethods'),
+			'PHP_Timer' => array('startTimes',),
+			'PHP_Token_Stream' => array('customTokens'),
+			'PHP_Token_Stream_CachingFactory' => array('cache'),
+
+			'phpbb_database_test_case' => array('already_connected'),
+		);
+	}
+
 	public function get_test_case_helpers()
 	{
 		if (!$this->test_case_helpers)
@@ -96,9 +111,9 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 				'dbpasswd'	=> isset($_SERVER['PHPBB_TEST_DBPASSWD']) ? $_SERVER['PHPBB_TEST_DBPASSWD'] : '',
 			);
 		}
-		else if (file_exists('test_config.php'))
+		else if (file_exists(__DIR__ . '/../test_config.php'))
 		{
-			include('test_config.php');
+			include(__DIR__ . '/../test_config.php');
 
 			return array(
 				'dbms'		=> $dbms,
@@ -114,7 +129,7 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 			// Silently use sqlite
 			return array(
 				'dbms'		=> 'sqlite',
-				'dbhost'	=> 'phpbb_unit_tests.sqlite2', // filename
+				'dbhost'	=> __DIR__ . '/../phpbb_unit_tests.sqlite2', // filename
 				'dbport'	=> '',
 				'dbname'	=> '',
 				'dbuser'	=> '',
@@ -325,7 +340,7 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 			}
 		}
 
-		$sql = $this->split_sql_file(file_get_contents("../phpBB/install/schemas/{$dbms['SCHEMA']}_schema.sql"), $config['dbms']);
+		$sql = $this->split_sql_file(file_get_contents(__DIR__ . "/../../phpBB/install/schemas/{$dbms['SCHEMA']}_schema.sql"), $config['dbms']);
 
 		foreach ($sql as $query)
 		{
@@ -361,7 +376,7 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 
 		$config = $this->get_database_config();
 
-		require_once '../phpBB/includes/db/' . $config['dbms'] . '.php';
+		require_once __DIR__ . '/../../phpBB/includes/db/' . $config['dbms'] . '.php';
 		$dbal = 'dbal_' . $config['dbms'];
 		$db = new $dbal();
 		$db->sql_connect($config['dbhost'], $config['dbuser'], $config['dbpasswd'], $config['dbname'], $config['dbport']);
diff --git a/tests/test_framework/phpbb_test_case.php b/tests/test_framework/phpbb_test_case.php
index fe90d321dc..f189da3671 100644
--- a/tests/test_framework/phpbb_test_case.php
+++ b/tests/test_framework/phpbb_test_case.php
@@ -11,6 +11,21 @@ class phpbb_test_case extends PHPUnit_Framework_TestCase
 {
 	protected $test_case_helpers;
 
+	public function __construct($name = NULL, array $data = array(), $dataName = '')
+	{
+		parent::__construct($name, $data, $dataName);
+		$this->backupStaticAttributesBlacklist += array(
+			'PHP_CodeCoverage' => array('instance'),
+			'PHP_CodeCoverage_Filter' => array('instance'),
+			'PHP_CodeCoverage_Util' => array('ignoredLines', 'templateMethods'),
+			'PHP_Timer' => array('startTimes',),
+			'PHP_Token_Stream' => array('customTokens'),
+			'PHP_Token_Stream_CachingFactory' => array('cache'),
+
+			'phpbb_database_test_case' => array('already_connected'),
+		);
+	}
+
 	public function get_test_case_helpers()
 	{
 		if (!$this->test_case_helpers)
diff --git a/tests/text_processing/all_tests.php b/tests/text_processing/all_tests.php
deleted file mode 100644
index 5e759c72ee..0000000000
--- a/tests/text_processing/all_tests.php
+++ /dev/null
@@ -1,41 +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_text_processing_all_tests::main');
-}
-
-require_once 'test_framework/framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
-require_once 'text_processing/make_clickable.php';
-
-class phpbb_text_processing_all_tests
-{
-	public static function main()
-	{
-		PHPUnit_TextUI_TestRunner::run(self::suite());
-	}
-
-	public static function suite()
-	{
-		$suite = new PHPUnit_Framework_TestSuite('phpBB Text Processing Tools');
-
-		$suite->addTestSuite('phpbb_text_processing_make_clickable_test');
-
-		return $suite;
-	}
-}
-
-if (PHPUnit_MAIN_METHOD == 'phpbb_text_processing_all_tests::main')
-{
-	phpbb_text_processing_all_tests::main();
-}
-
diff --git a/tests/text_processing/make_clickable.php b/tests/text_processing/make_clickable.php
index a667dd705e..75a35daf82 100644
--- a/tests/text_processing/make_clickable.php
+++ b/tests/text_processing/make_clickable.php
@@ -7,10 +7,8 @@
 *
 */
 
-require_once 'test_framework/framework.php';
-
-require_once '../phpBB/includes/functions.php';
-require_once '../phpBB/includes/functions_content.php';
+require_once __DIR__ . '/../../phpBB/includes/functions.php';
+require_once __DIR__ . '/../../phpBB/includes/functions_content.php';
 
 class phpbb_text_processing_make_clickable_test extends phpbb_test_case
 {
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
 {
author	Igor Wiedler <igor@wiedler.ch>	2011-01-07 01:39:18 +0100
committer	Igor Wiedler <igor@wiedler.ch>	2011-01-07 01:39:59 +0100
commit	14a84cf89cd41da36545f5f04348c49d4eadfb45 (patch)
tree	b04a5988c982b8b367697f03bde3f20ace7d022c
parent	da4617b14b11ade6f664b8c1ab94e3aeb5b7428d (diff)
parent	5b752a2fed82f27cb1e383583dc4ccb87f7e12e5 (diff)
download	forums-14a84cf89cd41da36545f5f04348c49d4eadfb45.tar forums-14a84cf89cd41da36545f5f04348c49d4eadfb45.tar.gz forums-14a84cf89cd41da36545f5f04348c49d4eadfb45.tar.bz2 forums-14a84cf89cd41da36545f5f04348c49d4eadfb45.tar.xz forums-14a84cf89cd41da36545f5f04348c49d4eadfb45.zip