Initial steps towards migrating to phpunit 3.5

cakephp · Sep 28, 2010 · ba168d1 · ba168d1
1 parent f63b093
commit ba168d1
Show file tree

Hide file tree

Showing 16 changed files with 18 additions and 18 deletions.
diff --git a/cake/tests/cases/libs/model/model.test.php b/cake/tests/cases/libs/model/model.test.php
@@ -20,7 +20,7 @@
 App::import('Core', array('AppModel', 'Model'));
 require_once dirname(__FILE__) . DS . 'models.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'DEFAULT');
+PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT');
 
 /**
  * ModelBaseTest

diff --git a/cake/tests/cases/libs/model/models.php b/cake/tests/cases/libs/model/models.php
@@ -23,7 +23,7 @@
 	define('CAKEPHP_UNIT_TEST_EXECUTION', 1);
 }
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'DEFAULT');
+PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT');
 
 /**
  * Test class

diff --git a/cake/tests/fixtures/assert_tags_test_case.php b/cake/tests/fixtures/assert_tags_test_case.php
@@ -1,6 +1,6 @@
 <?php
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'DEFAULT');
+PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT');
 
 /**
  * This class helpes in indirectly testing the functionaliteies of CakeTestCase::assertTags

diff --git a/cake/tests/fixtures/fixturized_test_case.php b/cake/tests/fixtures/fixturized_test_case.php
@@ -1,6 +1,6 @@
 <?php
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'DEFAULT');
+PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT');
 
 /**
  * This class helps in testing the life-cycle of fixtures inside a CakeTestCase

diff --git a/cake/tests/lib/cake_fixture_manager.php b/cake/tests/lib/cake_fixture_manager.php
@@ -17,7 +17,7 @@
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'DEFAULT');
+PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT');
 
 class CakeFixtureManager {
 

diff --git a/cake/tests/lib/cake_test_case.php b/cake/tests/lib/cake_test_case.php
@@ -18,7 +18,7 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'DEFAULT');
+PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT');
 
 require_once CAKE_TESTS_LIB . 'cake_fixture_manager.php';
 require_once CAKE_TESTS_LIB . 'cake_test_model.php';

diff --git a/cake/tests/lib/cake_test_fixture.php b/cake/tests/lib/cake_test_fixture.php
@@ -18,7 +18,7 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'DEFAULT');
+PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT');
 
 /**
  * Short description for class.

diff --git a/cake/tests/lib/cake_test_suite_dispatcher.php b/cake/tests/lib/cake_test_suite_dispatcher.php
@@ -145,7 +145,7 @@ protected function _checkPHPUnit() {
 	public function loadTestFramework() {
 		$found = $path = null;
 
-		if (@include 'PHPUnit' . DS . 'Framework.php') {
+		if (@include 'PHPUnit' . DS . 'Autoload.php') {
 			$found = true;
 		}
 
@@ -157,11 +157,11 @@ public function loadTestFramework() {
 			}
 
 			if ($path && ini_set('include_path', $path . PATH_SEPARATOR . ini_get('include_path'))) {
-				$found = include 'PHPUnit' . DS . 'Framework.php';
+				$found = include 'PHPUnit' . DS . 'Autoload.php';
 			}
 		}
 		if ($found) {
-			PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'DEFAULT');
+			PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT');
 		}
 		return $found;
 	}

diff --git a/cake/tests/lib/coverage/base_coverage_report.php b/cake/tests/lib/coverage/base_coverage_report.php
@@ -19,7 +19,7 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'DEFAULT');
+PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT');
 
 abstract class BaseCoverageReport {
 

diff --git a/cake/tests/lib/coverage/html_coverage_report.php b/cake/tests/lib/coverage/html_coverage_report.php
@@ -19,7 +19,7 @@
  */
 require_once dirname(__FILE__) . '/base_coverage_report.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'DEFAULT');
+PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT');
 
 class HtmlCoverageReport extends BaseCoverageReport {
 

diff --git a/cake/tests/lib/coverage/text_coverage_report.php b/cake/tests/lib/coverage/text_coverage_report.php
@@ -19,7 +19,7 @@
  */
 require_once dirname(__FILE__) . '/base_coverage_report.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'DEFAULT');
+PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT');
 
 class TextCoverageReport extends BaseCoverageReport {
 

diff --git a/cake/tests/lib/reporter/cake_base_reporter.php b/cake/tests/lib/reporter/cake_base_reporter.php
@@ -18,7 +18,7 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'DEFAULT');
+PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT');
 
 /**
  * CakeBaseReporter contains common reporting features used in the CakePHP Test suite

diff --git a/cake/tests/lib/reporter/cake_html_reporter.php b/cake/tests/lib/reporter/cake_html_reporter.php
@@ -19,7 +19,7 @@
  */
 include_once dirname(__FILE__) . DS . 'cake_base_reporter.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'DEFAULT');
+PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT');
 
 /**
  * CakeHtmlReporter Reports Results of TestSuites and Test Cases

diff --git a/cake/tests/lib/reporter/cake_text_reporter.php b/cake/tests/lib/reporter/cake_text_reporter.php
@@ -20,7 +20,7 @@
 
 include_once dirname(__FILE__) . DS . 'cake_base_reporter.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'DEFAULT');
+PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT');
 
 /**
  * CakeTextReporter contains reporting features used for plain text based output

diff --git a/cake/tests/lib/test_manager.php b/cake/tests/lib/test_manager.php
@@ -22,7 +22,7 @@
 define('APP_TEST_CASES', TESTS . 'cases');
 define('APP_TEST_GROUPS', TESTS . 'groups');
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'DEFAULT');
+PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT');
 require_once CAKE_TESTS_LIB . 'cake_test_suite.php';
 
 /**

diff --git a/cake/tests/lib/test_runner.php b/cake/tests/lib/test_runner.php
@@ -22,7 +22,7 @@
 require 'PHPUnit/TextUI/Command.php';
 require_once 'test_manager.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'DEFAULT');
+PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT');
 
 /**
  * Class to customize loading of test suites from CLI