commit c1bc479f81e4c0440ed1089963334f6c659e87de Author: Alex Lehmann <alexl...@gmail.com> AuthorDate: Sat Feb 25 01:35:52 2012 +0100 Commit: Alex Lehmann <alexl...@gmail.com> CommitDate: Sat Feb 25 01:35:52 2012 +0100
JBEHAVE-725: Some unit tests fail on Windows due to cr/lf encoding convert expected as well as out, otherwise the tests fail if the files are checkout with cr/lf conversion with tortoisegit diff --git a/jbehave-core/src/test/java/org/jbehave/core/reporters/TemplateableOutputBehaviour.java b/jbehave-core/src/test/java/org/jbehave/core/reporters/TemplateableOutputBehaviour.java index 7e5eefa..379befc 100644 --- a/jbehave-core/src/test/java/org/jbehave/core/reporters/TemplateableOutputBehaviour.java +++ b/jbehave-core/src/test/java/org/jbehave/core/reporters/TemplateableOutputBehaviour.java @@ -101,7 +101,7 @@ public class TemplateableOutputBehaviour { } private void assertThatOutputIs(String out, String expected) { - assertEquals(expected, dos2unix(out)); + assertEquals(dos2unix(expected), dos2unix(out)); } private String dos2unix(String string) {