Fixed tests for real

javiereguiluz · javiereguiluz · commit b60d937cbde0 · 2015-10-01T15:47:36.000+02:00
diff --git a/src/Symfony/Bridge/Twig/Tests/Command/LintCommandTest.php b/src/Symfony/Bridge/Twig/Tests/Command/LintCommandTest.php
@@ -31,7 +31,7 @@ public function testLintCorrectFile()
         $ret = $tester->execute(array('filename' => array($filename)), array('verbosity' => OutputInterface::VERBOSITY_VERBOSE, 'decorated' => false));
 
         $this->assertEquals(0, $ret, 'Returns 0 in case of success');
-        $this->assertRegExp('/^ \/\/ OK in /', $tester->getDisplay());
+        $this->assertRegExp('/^\/\/ OK in /', trim($tester->getDisplay()));
     }
 
     public function testLintIncorrectFile()
@@ -42,7 +42,7 @@ public function testLintIncorrectFile()
         $ret = $tester->execute(array('filename' => array($filename)), array('decorated' => false));
 
         $this->assertEquals(1, $ret, 'Returns 1 in case of error');
-        $this->assertRegExp('/^  ERROR  in /', $tester->getDisplay());
+        $this->assertRegExp('/^ERROR  in /', trim($tester->getDisplay()));
     }
 
     /**
@@ -65,7 +65,7 @@ public function testLintFileCompileTimeException()
         $ret = $tester->execute(array('filename' => array($filename)), array('decorated' => false));
 
         $this->assertEquals(1, $ret, 'Returns 1 in case of error');
-        $this->assertRegExp('/^  ERROR  in /', $tester->getDisplay());
+        $this->assertRegExp('/^ERROR  in /', trim($tester->getDisplay()));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function testLintCorrectFile()`
`31`	`31`	`$ret = $tester->execute(array('filename' => array($filename)), array('verbosity' => OutputInterface::VERBOSITY_VERBOSE, 'decorated' => false));`
`32`	`32`
`33`	`33`	`$this->assertEquals(0, $ret, 'Returns 0 in case of success');`
`34`		`- $this->assertRegExp('/^ \/\/ OK in /', $tester->getDisplay());`
	`34`	`+ $this->assertRegExp('/^\/\/ OK in /', trim($tester->getDisplay()));`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`public function testLintIncorrectFile()`
`@@ -42,7 +42,7 @@ public function testLintIncorrectFile()`
`42`	`42`	`$ret = $tester->execute(array('filename' => array($filename)), array('decorated' => false));`
`43`	`43`
`44`	`44`	`$this->assertEquals(1, $ret, 'Returns 1 in case of error');`
`45`		`- $this->assertRegExp('/^ ERROR in /', $tester->getDisplay());`
	`45`	`+ $this->assertRegExp('/^ERROR in /', trim($tester->getDisplay()));`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`/**`
`@@ -65,7 +65,7 @@ public function testLintFileCompileTimeException()`
`65`	`65`	`$ret = $tester->execute(array('filename' => array($filename)), array('decorated' => false));`
`66`	`66`
`67`	`67`	`$this->assertEquals(1, $ret, 'Returns 1 in case of error');`
`68`		`- $this->assertRegExp('/^ ERROR in /', $tester->getDisplay());`
	`68`	`+ $this->assertRegExp('/^ERROR in /', trim($tester->getDisplay()));`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`/**`