diff options
author | Maat <maat-pub@mageia.biz> | 2012-06-03 21:23:14 +0200 |
---|---|---|
committer | Maat <maat-pub@mageia.biz> | 2012-06-03 21:23:14 +0200 |
commit | a06a38ae692551dc1c0416b835ce9924b3d9f7f5 (patch) | |
tree | 1bb2c2b3d8d56668585513890afc1d641cead0b1 /tests/test_framework/phpbb_test_case.php | |
parent | 2db884ac2e5122be1db0582b76bf7204783a0c0d (diff) | |
parent | 19a47dfbbc4265e33c14d6679b5693d80120db4b (diff) | |
download | forums-a06a38ae692551dc1c0416b835ce9924b3d9f7f5.tar forums-a06a38ae692551dc1c0416b835ce9924b3d9f7f5.tar.gz forums-a06a38ae692551dc1c0416b835ce9924b3d9f7f5.tar.bz2 forums-a06a38ae692551dc1c0416b835ce9924b3d9f7f5.tar.xz forums-a06a38ae692551dc1c0416b835ce9924b3d9f7f5.zip |
Merging with upstream 3.0.11
Diffstat (limited to 'tests/test_framework/phpbb_test_case.php')
-rw-r--r-- | tests/test_framework/phpbb_test_case.php | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/tests/test_framework/phpbb_test_case.php b/tests/test_framework/phpbb_test_case.php index fe90d321dc..8b16f02638 100644 --- a/tests/test_framework/phpbb_test_case.php +++ b/tests/test_framework/phpbb_test_case.php @@ -3,7 +3,7 @@ * * @package testing * @copyright (c) 2008 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 * */ @@ -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) |