Skip to content
Permalink
Browse files

Updating test cases to use new Shell internals.

Cleaning up some mocks.
  • Loading branch information...
markstory committed Oct 6, 2010
1 parent 7921ef1 commit a3023430c8016ad20fd20d52d6d6030ba359f396
@@ -51,7 +51,7 @@ public function setUp() {
$this->Dispatcher = $this->getMock(
'ShellDispatcher',
array('getInput', 'stdout', 'stderr', '_stop', '_initEnvironment', 'dispatch', 'clear')
array('_stop', '_initEnvironment', 'dispatch')
);
$this->Task = $this->getMock(
'AclShell',
@@ -40,7 +40,7 @@ public function setUp() {
parent::setUp();
$this->Dispatcher = $this->getMock(
'ShellDispatcher',
array('getInput', 'stdout', 'stderr', '_stop', '_initEnvironment', 'dispatch', 'clear')
array('_stop', '_initEnvironment', 'dispatch')
);
$this->Shell = $this->getMock(
'ApiShell',
@@ -52,7 +52,7 @@ public function setUp() {
parent::setUp();
$this->Dispatcher = $this->getMock(
'ShellDispatcher',
array('getInput', 'stdout', 'stderr', '_stop', '_initEnvironment', 'clear')
array('_stop', '_initEnvironment')
);
$this->Shell = $this->getMock(
'BakeShell',
@@ -50,14 +50,15 @@ public function setUp() {
$this->Dispatcher = $this->getMock(
'ShellDispatcher',
array('getInput', 'stderr', '_stop', '_initEnvironment', 'dispatch', 'clear')
array('_stop', '_initEnvironment', 'dispatch')
);
$this->Dispatcher->stdout = new TestStringOutput();
$out = new TestStringOutput();
$in = $this->getMock('ConsoleInput');
$this->Shell = $this->getMock(
'CommandListShell',
array('in', '_stop'),
array(&$this->Dispatcher)
array('in', '_stop', 'clear'),
array(&$this->Dispatcher, $out, null, $in)
);
}
@@ -77,7 +78,7 @@ function tearDown() {
*/
function testMain() {
$this->Shell->main();
$output = $this->Dispatcher->stdout->output;
$output = $this->Shell->stdout->output;
$expected = "/example \[.*TestPlugin, TestPluginTwo.*\]/";
$this->assertPattern($expected, $output);
@@ -34,11 +34,11 @@ class TestSuiteShellTest extends CakeTestCase {
public function setUp() {
$this->Dispatcher = $this->getMock(
'ShellDispatcher',
array('getInput', 'stdout', 'stderr', '_stop', '_initEnvironment', 'clear')
array('_stop', '_initEnvironment')
);
$this->Shell = $this->getMock(
'TestSuiteShell',
array('in', 'out', 'hr', 'help', 'error', 'err', '_stop', 'initialize', 'run'),
array('in', 'out', 'hr', 'help', 'error', 'err', '_stop', 'initialize', 'run', 'clear'),
array(&$this->Dispatcher)
);
$this->Shell->Dispatch->shellPaths = App::path('shells');

0 comments on commit a302343

Please sign in to comment.
You can’t perform that action at this time.