Fixing bake task tests and adding ConsoleErrorHandler to the AllShells suite.

This commit is contained in:
mark_story 2010-09-07 23:51:39 -04:00
parent f94fcfb749
commit f677c4ab44
4 changed files with 8 additions and 8 deletions

View file

@ -39,7 +39,7 @@ class AllShellsTest extends PHPUnit_Framework_TestSuite {
$path = CORE_TEST_CASES . DS . 'console' . DS . 'libs' . DS; $path = CORE_TEST_CASES . DS . 'console' . DS . 'libs' . DS;
$suite->addTestFile(CORE_TEST_CASES . DS . 'console' . DS . 'cake.test.php'); $suite->addTestFile(CORE_TEST_CASES . DS . 'console' . DS . 'cake.test.php');
$suite->addTestFile(CORE_TEST_CASES . DS . 'console' . DS . 'error_console_handler.test.php'); $suite->addTestFile(CORE_TEST_CASES . DS . 'console' . DS . 'console_error_handler.test.php');
$tasks = array('acl', 'api', 'bake', 'schema', 'shell'); $tasks = array('acl', 'api', 'bake', 'schema', 'shell');
foreach ($tasks as $task) { foreach ($tasks as $task) {
$suite->addTestFile($path . $task . '.test.php'); $suite->addTestFile($path . $task . '.test.php');

View file

@ -91,10 +91,10 @@ class BakeShellTest extends CakeTestCase {
if ($this->skipIf($userExists, 'User class exists, cannot test `bake all [param]`. %s')) { if ($this->skipIf($userExists, 'User class exists, cannot test `bake all [param]`. %s')) {
return; return;
} }
$this->Shell->Model = $this->getMock('ModelTask', array(), array(&$this->Dispatch)); $this->Shell->Model = $this->getMock('ModelTask', array(), array(&$this->Dispatcher));
$this->Shell->Controller = $this->getMock('ControllerTask', array(), array(&$this->Dispatch)); $this->Shell->Controller = $this->getMock('ControllerTask', array(), array(&$this->Dispatcher));
$this->Shell->View = $this->getMock('ModelTask', array(), array(&$this->Dispatch)); $this->Shell->View = $this->getMock('ModelTask', array(), array(&$this->Dispatcher));
$this->Shell->DbConfig = $this->getMock('DbConfigTask', array(), array(&$this->Dispatch)); $this->Shell->DbConfig = $this->getMock('DbConfigTask', array(), array(&$this->Dispatcher));
$this->Shell->DbConfig->expects($this->once())->method('getConfig')->will($this->returnValue('test_suite')); $this->Shell->DbConfig->expects($this->once())->method('getConfig')->will($this->returnValue('test_suite'));

View file

@ -87,8 +87,8 @@ class FixtureTaskTest extends CakeTestCase {
* @return void * @return void
*/ */
public function testConstruct() { public function testConstruct() {
$this->Dispatch->params['working'] = DS . 'my' . DS . 'path'; $this->Dispatcher->params['working'] = DS . 'my' . DS . 'path';
$Task = new FixtureTask($this->Dispatch); $Task = new FixtureTask($this->Dispatcher);
$expected = DS . 'my' . DS . 'path' . DS . 'tests' . DS . 'fixtures' . DS; $expected = DS . 'my' . DS . 'path' . DS . 'tests' . DS . 'fixtures' . DS;
$this->assertEqual($Task->path, $expected); $this->assertEqual($Task->path, $expected);

View file

@ -368,7 +368,7 @@ class TestTaskTest extends CakeTestCase {
) )
)); ));
$keys = ClassRegistry::keys(); $keys = ClassRegistry::keys();
$this->assertTrue(in_array('random', $keys)); $this->assertTrue(in_array('test_task_comment', $keys));
$object =& $this->Task->buildTestSubject('Model', 'TestTaskComment'); $object =& $this->Task->buildTestSubject('Model', 'TestTaskComment');
$keys = ClassRegistry::keys(); $keys = ClassRegistry::keys();