mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-12 02:25:18 +02:00
Code Issues Releases Wiki Activity

Merge branch 'ticket/naderman/9855' into develop-olympus

Browse Source 
* ticket/naderman/9855:
  [ticket/9855] Do not include the PHPUnit Framework manually on 3.5+.
  [ticket/9855] Make tests run under PHPUnit 3.5.
This commit is contained in:
Igor Wiedler 2010-10-17 23:36:09 +02:00
commit 6eb061ef0c
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/all_tests.php
View File

@ -28,7 +28,14 @@ require_once 'network/all_tests.php';
require_once 'random/all_tests.php'; require_once 'random/all_tests.php';
// exclude the test directory from code coverage reports // 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('./'); PHPUnit_Util_Filter::addDirectoryToFilter('./');
}
class phpbb_all_tests class phpbb_all_tests
{ {

4
tests/test_framework/framework.php
View File

@ -32,8 +32,12 @@ if (version_compare(PHPUnit_Runner_Version::id(), '3.3.0', '<'))
trigger_error('PHPUnit >= 3.3.0 required'); 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/Framework.php';
require_once 'PHPUnit/Extensions/Database/TestCase.php'; require_once 'PHPUnit/Extensions/Database/TestCase.php';
}
require_once 'test_framework/phpbb_test_case_helpers.php'; require_once 'test_framework/phpbb_test_case_helpers.php';
require_once 'test_framework/phpbb_test_case.php'; require_once 'test_framework/phpbb_test_case.php';
require_once 'test_framework/phpbb_database_test_case.php'; require_once 'test_framework/phpbb_database_test_case.php';