From 7b83b7221a0f6d36c1b7e39d1b97c0e8951b53c7 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Thu, 25 Apr 2013 13:56:40 +0200 Subject: [PATCH] [Console] Fix tests on windows --- .../Component/Console/Tests/Command/ListCommandTest.php | 2 +- .../Console/Tests/Descriptor/AbstractDescriptorTest.php | 2 +- .../Component/Console/Tests/Helper/TableHelperTest.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Component/Console/Tests/Command/ListCommandTest.php b/src/Symfony/Component/Console/Tests/Command/ListCommandTest.php index 156e21db47..aa780fee77 100644 --- a/src/Symfony/Component/Console/Tests/Command/ListCommandTest.php +++ b/src/Symfony/Component/Console/Tests/Command/ListCommandTest.php @@ -44,6 +44,6 @@ list Lists commands EOF; - $this->assertEquals(str_replace("\n", PHP_EOL, $output), $commandTester->getDisplay()); + $this->assertEquals($output, $commandTester->getDisplay(true)); } } diff --git a/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php index 703a72c451..c437a8120b 100644 --- a/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php +++ b/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php @@ -54,7 +54,7 @@ abstract class AbstractDescriptorTest extends \PHPUnit_Framework_TestCase $command->setHelp(str_replace('%command.full_name%', 'app/console %command.name%', $command->getHelp())); } - $this->assertEquals(trim($expectedDescription), trim($descriptor->describe($application))); + $this->assertEquals(trim($expectedDescription), trim(str_replace(PHP_EOL, "\n", $descriptor->describe($application)))); } public function getDescribeInputArgumentTestData() diff --git a/src/Symfony/Component/Console/Tests/Helper/TableHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/TableHelperTest.php index 9d31a869f9..b2aa82b2de 100644 --- a/src/Symfony/Component/Console/Tests/Helper/TableHelperTest.php +++ b/src/Symfony/Component/Console/Tests/Helper/TableHelperTest.php @@ -176,13 +176,13 @@ TABLE protected function getOutputStream() { - return new StreamOutput($this->stream); + return new StreamOutput($this->stream, StreamOutput::VERBOSITY_NORMAL, false); } protected function getOutputContent(StreamOutput $output) { rewind($output->getStream()); - return stream_get_contents($output->getStream()); + return str_replace(PHP_EOL, "\n", stream_get_contents($output->getStream())); } }