Fixing tests from CommandListShell when run on windows

This commit is contained in:
Jose Lorenzo Rodriguez 2011-06-21 12:14:36 -04:30
parent d54f8dc07a
commit 552bd82b5b
2 changed files with 6 additions and 5 deletions

View file

@ -201,6 +201,7 @@ class CommandListShell extends Shell {
$shell->addAttribute('provider', $source); $shell->addAttribute('provider', $source);
$shell->addAttribute('help', $callable . ' -h'); $shell->addAttribute('help', $callable . ' -h');
} }
$this->stdout->outputAs(ConsoleOutput::RAW);
$this->out($shells->saveXml()); $this->out($shells->saveXml());
} }

View file

@ -122,16 +122,16 @@ class CommandListTest extends CakeTestCase {
$output = $this->Shell->stdout->output; $output = $this->Shell->stdout->output;
$expected = "/\[.*App.*\]\n[ ]+sample/"; $expected = "/\[.*App.*\]\\v*[ ]+sample/";
$this->assertPattern($expected, $output); $this->assertPattern($expected, $output);
$expected = "/\[.*TestPluginTwo.*\]\n[ ]+example, welcome/"; $expected = "/\[.*TestPluginTwo.*\]\\v*[ ]+example, welcome/";
$this->assertPattern($expected, $output); $this->assertPattern($expected, $output);
$expected = "/\[.*TestPlugin.*\]\n[ ]+example/"; $expected = "/\[.*TestPlugin.*\]\\v*[ ]+example/";
$this->assertPattern($expected, $output); $this->assertPattern($expected, $output);
$expected = "/\[.*Core.*\]\n[ ]+acl, api, bake, command_list, console, i18n, schema, testsuite/"; $expected = "/\[.*Core.*\]\\v*[ ]+acl, api, bake, command_list, console, i18n, schema, testsuite/";
$this->assertPattern($expected, $output); $this->assertPattern($expected, $output);
} }
@ -146,7 +146,7 @@ class CommandListTest extends CakeTestCase {
$output = $this->Shell->stdout->output; $output = $this->Shell->stdout->output;
$find = '<shell name="sample" call_as="sample" provider="app" help="sample -h"/>'; $find = '<shell name="sample" call_as="sample" provider="app" help="sample -h"/>';
$this->assertContains($find, $output); $this->assertContains($find, $output);
$find = '<shell name="bake" call_as="bake" provider="CORE" help="bake -h"/>'; $find = '<shell name="bake" call_as="bake" provider="CORE" help="bake -h"/>';