[jbehave-scm] [scm-core][1] JBEHAVE-807: odf unit test fails due to cr/lf issue on Windows

[Alex Lehmann]

commit 39a3f6558aa90a168bfc39ec5ee4dfb5d2145aba
Author:     Alex Lehmann <alexl...@gmail.com>
AuthorDate: Mon Jul 30 22:57:57 2012 +0200
Commit:     Mauro Talevi <mauro.tal...@aquilonia.org>
CommitDate: Tue Jul 31 01:31:22 2012 +0200

    JBEHAVE-807: odf unit test fails due to cr/lf issue on Windows
    added dos2unix conversions to the test

diff --git 
a/jbehave-odf/src/test/java/org/jbehave/core/io/odf/OdtLoaderBehaviour.java 
b/jbehave-odf/src/test/java/org/jbehave/core/io/odf/OdtLoaderBehaviour.java
index 1e41b35..1aa2956 100755
--- a/jbehave-odf/src/test/java/org/jbehave/core/io/odf/OdtLoaderBehaviour.java
+++ b/jbehave-odf/src/test/java/org/jbehave/core/io/odf/OdtLoaderBehaviour.java
@@ -19,7 +19,7 @@ public class OdtLoaderBehaviour {
                 
.loadResourceAsText("org/jbehave/core/io/odf/stories/a_story.odt");
         String resourceFromTxt = new LoadFromClasspath(this.getClass())
                 
.loadResourceAsText("org/jbehave/core/io/odf/stories/a_story.txt");
-        assertEquals(resourceFromTxt.trim(), resourceFromOdtWithTable.trim());
+        assertThatOutputIs(resourceFromOdtWithTable.trim(), 
resourceFromTxt.trim());
     }
 
     @Test(expected = InvalidStoryResource.class)
@@ -35,7 +35,7 @@ public class OdtLoaderBehaviour {
                 + "org/jbehave/core/io/odf/stories/a_story.odt");
         String resourceFromTxt = new LoadFromURL().loadResourceAsText(location
                 + "org/jbehave/core/io/odf/stories/a_story.txt");
-        assertEquals(resourceFromTxt.trim(), resourceFromOdtWithTable.trim());
+        assertThatOutputIs(resourceFromOdtWithTable.trim(), 
resourceFromTxt.trim());
     }
 
     @Test(expected = InvalidStoryResource.class)
@@ -66,4 +66,13 @@ public class OdtLoaderBehaviour {
         Assert.assertNotNull(new OdfUtils());
     }
 
+    // copied from core/TemplatableOutputBehaviour
+    private void assertThatOutputIs(String out, String expected) {
+        assertEquals(dos2unix(expected), dos2unix(out));
+    }
+
+    private String dos2unix(String string) {
+        return string.replace("\r\n", "\n");
+    }
+
 }