Some tests are fixed on Win (CRLF issue).

Change-Id: I057bae0fd4068c6b877abdb9546ebf1490339d86

diff --git a/theme-compiler/tests/src/com/vaadin/sass/AbstractTestBase.java b/theme-compiler/tests/src/com/vaadin/sass/AbstractTestBase.java
index d867e6ccd0df931a99d28b9d61de40382bf65359..01187b450231f5fbc5b4f9e8b52f8c44a9ac98e0 100644 (file)
--- a/theme-compiler/tests/src/com/vaadin/sass/AbstractTestBase.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/AbstractTestBase.java
@@ -30,6 +30,8 @@ import com.vaadin.sass.internal.ScssStylesheet;
 
 public abstract class AbstractTestBase {
 
+    public static final String CR = "\r";
+
     protected ScssStylesheet stylesheet;
     protected String originalScss;
     protected String parsedScss;
@@ -69,17 +71,21 @@ public abstract class AbstractTestBase {
     public void testParser(String file) throws CSSException, IOException,
             URISyntaxException {
         originalScss = getFileContent(file);
+        originalScss = originalScss.replaceAll(CR, "");
         ScssStylesheet sheet = getStyleSheet(file);
         parsedScss = sheet.toString();
+        parsedScss = parsedScss.replace(CR, "");
         Assert.assertEquals("Original CSS and parsed CSS do not match",
                 originalScss, parsedScss);
     }
 
     public void testCompiler(String scss, String css) throws Exception {
         comparisonCss = getFileContent(css);
+        comparisonCss = comparisonCss.replaceAll(CR, "");
         ScssStylesheet sheet = getStyleSheet(scss);
         sheet.compile();
         parsedScss = sheet.toString();
+        parsedScss = parsedScss.replaceAll(CR, "");
         Assert.assertEquals("Original CSS and parsed CSS do not match",
                 comparisonCss, parsedScss);
     }

diff --git a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/CompassImports.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/CompassImports.java
index 1e3eb09f0c1c466131dcd4a461b2b7bbbd6c1acb..4e87eb21974de2aee3970996a594cd8fce0fad43 100644 (file)
--- a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/CompassImports.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/CompassImports.java
@@ -68,12 +68,14 @@ public class CompassImports extends AbstractTestBase {
     public void testCompiler(String scss, String css, String additionalPath)
             throws Exception {
         comparisonCss = getFileContent(css);
+        comparisonCss = comparisonCss.replaceAll(CR, "");
         ScssStylesheet sheet = getStyleSheet(scss);
         Assert.assertNotNull(sheet);
         sheet.addResolver(new FilesystemResolver(additionalPath));
 
         sheet.compile();
         parsedScss = sheet.toString();
+        parsedScss = parsedScss.replaceAll(CR, "");
         Assert.assertEquals("Original CSS and parsed CSS do not match",
                 comparisonCss, parsedScss);
     }