Removing TestManager from the group tests.

Fixing a failing case on the testsuite shell. Fixing Debugger from stealing the error handler from PHPUnit.
cakephp · Feb 13, 2011 · f6e9b5b · f6e9b5b
1 parent 1c9808f
commit f6e9b5b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/cake/tests/cases/console/shells/testsuite.test.php b/cake/tests/cases/console/shells/testsuite.test.php
@@ -100,7 +100,7 @@ public function testRunnerOptions() {
 
 		$this->Shell->expects($this->once())->method('run')
 			->with(
-				array('app' => false, 'plugin' => null, 'output' => 'text', 'case' => 'basics'),
+				array('app' => false, 'plugin' => null, 'core' => true, 'output' => 'text', 'case' => 'basics'),
 				array('--filter', 'myFilter', '--colors', '--verbose')
 			);
 		$this->Shell->main();

diff --git a/cake/tests/cases/libs/all_test_suite.test.php b/cake/tests/cases/libs/all_test_suite.test.php
@@ -34,7 +34,6 @@ class AllTestSuiteTest extends PHPUnit_Framework_TestSuite {
 	public static function suite() {
 		$suite = new PHPUnit_Framework_TestSuite('All Test Suite classes tests');
 
-		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'test_manager.test.php');
 		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'cake_test_case.test.php');
 		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'cake_test_fixture.test.php');
 		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'html_coverage_report.test.php');

diff --git a/cake/tests/lib/cake_test_suite_dispatcher.php b/cake/tests/lib/cake_test_suite_dispatcher.php
@@ -238,6 +238,7 @@ function _runTestCase() {
 			'--filter', $this->params['filter'],
 			'--output', $this->params['output']
 		);
+		restore_error_handler();
 
 		try {
 			$command = new CakeTestSuiteCommand('CakeTestLoader', $commandArgs);