From f6e9b5b2544f9bbcd0cf661bbe71fe69f45bab99 Mon Sep 17 00:00:00 2001 From: mark_story Date: Sun, 13 Feb 2011 13:08:43 -0500 Subject: [PATCH] Removing TestManager from the group tests. Fixing a failing case on the testsuite shell. Fixing Debugger from stealing the error handler from PHPUnit. --- cake/tests/cases/console/shells/testsuite.test.php | 2 +- cake/tests/cases/libs/all_test_suite.test.php | 1 - cake/tests/lib/cake_test_suite_dispatcher.php | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cake/tests/cases/console/shells/testsuite.test.php b/cake/tests/cases/console/shells/testsuite.test.php index c57d1573b..30ad6f8e9 100644 --- a/cake/tests/cases/console/shells/testsuite.test.php +++ b/cake/tests/cases/console/shells/testsuite.test.php @@ -100,7 +100,7 @@ class TestSuiteShellTest extends CakeTestCase { $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 index b85ea0a19..6740003b7 100644 --- 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 index 57ab21c94..978471e0b 100644 --- a/cake/tests/lib/cake_test_suite_dispatcher.php +++ b/cake/tests/lib/cake_test_suite_dispatcher.php @@ -238,6 +238,7 @@ class CakeTestSuiteDispatcher { '--filter', $this->params['filter'], '--output', $this->params['output'] ); + restore_error_handler(); try { $command = new CakeTestSuiteCommand('CakeTestLoader', $commandArgs);