#370

fixed regex issue
cflint · Jul 28, 2017 · 9fd1344 · 9fd1344
1 parent c35d31e
commit 9fd1344
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/src/test/java/com/cflint/integration/TestIntegrationFolder.java b/src/test/java/com/cflint/integration/TestIntegrationFolder.java
@@ -26,8 +26,8 @@ public void testFolder() throws Exception{
         final String expected = loadFile(new File("src/test/resources/com/cflint/integration/output.expected.json"));
         final String actual = loadFile(new File("src/test/resources/com/cflint/integration/output.json"));
         assertEquals( 
-                expected.replaceAll("\\\\","/").replaceAll("/+","/").replaceAll("\r\n", "\n").replaceAll("\\s\"file\".+\n", ""),
-                actual.replaceAll("\\\\","/").replaceAll("/+","/").replaceAll("\r\n", "\n").replaceAll("\\s\"file\".+\n", ""));
+                expected.replaceAll("\\\\","/").replaceAll("/+","/").replaceAll("\\R", "\n").replaceAll("\"file\".+\\R\\s*", ""),
+                actual.replaceAll("\\\\","/").replaceAll("/+","/").replaceAll("\\R", "\n").replaceAll("\"file\".+\\R\\s*", ""));
 	}
 
 	   @Test
@@ -45,8 +45,8 @@ public void testRuleGroupFolder() throws Exception{
 	        final String expected = loadFile(new File("src/test/resources/com/cflint/integration/output.rulegroup.expected.json"));
 	        final String actual = loadFile(new File("src/test/resources/com/cflint/integration/output.rulegroup.json"));
 	        assertEquals( 
-	                expected.replaceAll("\\\\","/").replaceAll("/+","/").replaceAll("\r\n", "\n").replaceAll("\\s\"file\".+\n", ""),
-	                actual.replaceAll("\\\\","/").replaceAll("/+","/").replaceAll("\r\n", "\n").replaceAll("\\s\"file\".+\n", ""));
+                        expected.replaceAll("\\\\","/").replaceAll("/+","/").replaceAll("\\R", "\n").replaceAll("\"file\".+\\R\\s*", ""),
+                        actual.replaceAll("\\\\","/").replaceAll("/+","/").replaceAll("\\R", "\n").replaceAll("\"file\".+\\R\\s*", ""));
 	    }
 
 
@@ -68,8 +68,8 @@ public void test_194() throws Exception{
 	        final String actual = loadFile(tempFile);
 	        tempFile.delete();
 	        assertEquals( 
-	                expected.replaceAll("\\\\","/").replaceAll("/+","/").replaceAll("\r\n", "\n").replaceAll("\\s\"file\".+\n", ""),
-	                actual.replaceAll("\\\\","/").replaceAll("/+","/").replaceAll("\r\n", "\n").replaceAll("\\s\"file\".+\n", ""));
+	                expected.replaceAll("\\\\","/").replaceAll("/+","/").replaceAll("\\R", "\n").replaceAll("\"file\".+\\R\\s*", ""),
+	                actual.replaceAll("\\\\","/").replaceAll("/+","/").replaceAll("\\R", "\n").replaceAll("\"file\".+\\R\\s*", ""));
 	   }
 	   public static String loadFile(File file) throws IOException {
 	        InputStream is = new FileInputStream(file);

diff --git a/src/test/resources/com/cflint/integration/output.expected.json b/src/test/resources/com/cflint/integration/output.expected.json
@@ -6,7 +6,7 @@
     "category" : "CFLINT",
     "abbrev" : "CI",
     "locations" : [ {
-           "fileName" : "test.cfc",
+      "fileName" : "test.cfc",
       "function" : "",
       "column" : 0,
       "line" : 1,
@@ -21,7 +21,7 @@
     "category" : "CFLINT",
     "abbrev" : "FH",
     "locations" : [ {
-           "fileName" : "test.cfc",
+      "fileName" : "test.cfc",
       "function" : "getStringFromStruct",
       "column" : 16,
       "line" : 2,
@@ -36,7 +36,7 @@
     "category" : "CFLINT",
     "abbrev" : "FH",
     "locations" : [ {
-           "fileName" : "test.cfc",
+      "fileName" : "test.cfc",
       "function" : "getStringFromStruct",
       "column" : 16,
       "line" : 2,
@@ -51,7 +51,7 @@
     "category" : "CFLINT",
     "abbrev" : "FH",
     "locations" : [ {
-           "fileName" : "test.cfc",
+      "fileName" : "test.cfc",
       "function" : "getStringFromStruct",
       "column" : 16,
       "line" : 2,

diff --git a/src/test/resources/com/cflint/integration/output.rulegroup.expected.json b/src/test/resources/com/cflint/integration/output.rulegroup.expected.json
@@ -6,7 +6,7 @@
     "category" : "CFLINT",
     "abbrev" : "CI",
     "locations" : [ {
-           "fileName" : "test.cfc",
+      "fileName" : "test.cfc",
       "function" : "",
       "column" : 0,
       "line" : 1,

diff --git a/src/test/resources/com/cflint/integration/output_194.expected.json b/src/test/resources/com/cflint/integration/output_194.expected.json
@@ -6,7 +6,7 @@
     "category" : "CFLINT",
     "abbrev" : "CI",
     "locations" : [ {
-           "fileName" : "test.cfc",
+      "fileName" : "test.cfc",
       "function" : "",
       "column" : 0,
       "line" : 1,