diff --git a/README.md b/README.md index 67d781fa5..bff3493b7 100644 --- a/README.md +++ b/README.md @@ -214,7 +214,7 @@ Example of CFLint XML: ... - + @@ -236,51 +236,39 @@ JSON output can be created with Example of CFLint JSON: - [ { - "severity" : "WARNING", - "id" : "CFQUERYPARAM_REQ", - "message" : "CFQUERYPARAM_REQ", - "category" : "CFLINT", - "abbrev" : "CR", - "locations" : [ { - "file" : "/Users/kai/Documents/Code/paypal.cfc", - "fileName" : "qrySearch.cfm", - "function" : "", - "column" : 0, - "line" : 79, - "message" : " should use for variable 'arguments.something'.", - "variable" : "arguments.something", - "expression" : "\r\n...some Details..." - } ] - }, { - "severity" : "WARNING", - "id" : "CFQUERYPARAM_REQ", - "message" : "CFQUERYPARAM_REQ", - "category" : "CFLINT", - "abbrev" : "CR", - "locations" : [ { - "file" : "/Users/kai/Documents/Code/paypal.cfc", - "fileName" : "qrySearch.cfm", - "function" : "", - "column" : 0, - "line" : 145, - "message" : " should use for variable 'arguments.something'.", - "variable" : "arguments.something", - "expression" : "\r\n...some Details..." - } ] - }, - ... - , { - "totalfiles" : 108 - }, { - "totalsize" : 55690 - }, { - "code" : "CFQUERYPARAM_REQ", - "count" : 4 - }, { - "severity" : "WARNING", - "count" : 4 - } ] + { + "version" : "", + "timestamp" : "1501202128", + "issues" : [ { + "severity" : "ERROR", + "id" : "MISSING_VAR", + "message" : "MISSING_VAR", + "category" : "CFLINT", + "abbrev" : "MV", + "locations" : [ { + "file" : "src/test/resources/com/cflint/tests/Ignores/ignoreCFMLAny2.cfc", + "fileName" : "ignoreCFMLAny2.cfc", + "function" : "testFunction", + "column" : 6, + "line" : 14, + "message" : "Variable someVar is not declared with a var statement.", + "variable" : "someVar", + "expression" : "someVar" + } ] + } ], + "counts" : { + "totalFiles" : 7, + "totalLines" : 49, + "countByCode" : [ { + "code" : "MISSING_VAR", + "count" : 1 + } ], + "countBySeverity" : [ { + "severity" : "ERROR", + "count" : 1 + } ] + } + } ### Text @@ -313,7 +301,7 @@ Example of plain text output: Total files:108 - Total size 55690 + Total lines:55690 Issue counts:1 CFQUERYPARAM_REQ:4 diff --git a/src/main/java/com/cflint/CFLintStats.java b/src/main/java/com/cflint/CFLintStats.java index a54e772d2..975303d5d 100644 --- a/src/main/java/com/cflint/CFLintStats.java +++ b/src/main/java/com/cflint/CFLintStats.java @@ -9,7 +9,7 @@ public class CFLintStats { // Number of files private long fileCount; // Number of lines - private BigInteger totalSize = BigInteger.ZERO; + private BigInteger totalLines = BigInteger.ZERO; // Bug counts for current execution private BugCounts counts = new BugCounts(); @@ -17,32 +17,32 @@ public CFLintStats() { super(); } - public CFLintStats(long timestamp, long fileCount, BigInteger totalSize) { + public CFLintStats(long timestamp, long fileCount, BigInteger totalLines) { super(); this.timestamp = timestamp; this.fileCount = fileCount; - this.totalSize = totalSize; + this.totalLines = totalLines; } - public CFLintStats(long timestamp, long fileCount, BigInteger totalSize, BugCounts counts) { + public CFLintStats(long timestamp, long fileCount, BigInteger totalLines, BugCounts counts) { super(); this.timestamp = timestamp; this.fileCount = fileCount; - this.totalSize = totalSize; + this.totalLines = totalLines; this.counts = counts; } public void addFile(long numberOfLines){ fileCount++; - totalSize = totalSize.add(BigInteger.valueOf(numberOfLines)); + totalLines = totalLines.add(BigInteger.valueOf(numberOfLines)); } public long getTimestamp() { return timestamp; } public long getFileCount() { return fileCount; } - public BigInteger getTotalSize() { - return totalSize; + public BigInteger getTotalLines() { + return totalLines; } public BugCounts getCounts() { return counts; } diff --git a/src/main/java/com/cflint/JSONOutput.java b/src/main/java/com/cflint/JSONOutput.java index bc56ece3d..3748af82a 100644 --- a/src/main/java/com/cflint/JSONOutput.java +++ b/src/main/java/com/cflint/JSONOutput.java @@ -36,6 +36,10 @@ public void output(final BugList bugList, final Writer writer, CFLintStats stats // start global object jg.writeStartObject(); + // timestamp and version + jg.writeStringField("version",Version.getVersion()); + jg.writeStringField("timestamp",Long.toString(stats.getTimestamp())); + // start issues array jg.writeFieldName("issues"); jg.writeStartArray(); @@ -83,12 +87,13 @@ public void output(final BugList bugList, final Writer writer, CFLintStats stats // end issues array jg.writeEndArray(); - // start summary object - jg.writeFieldName("summary"); + // start counts object + jg.writeFieldName("counts"); jg.writeStartObject(); - jg.writeNumberField("totalfiles", stats.getFileCount()); - jg.writeFieldName("totalsize"); - jg.writeNumber(stats.getTotalSize()); + jg.writeNumberField("totalFiles", stats.getFileCount()); + // totalLines has to be separated into writing the field name and the number - .writeNumberField() can't deal with BigInt + jg.writeFieldName("totalLines"); + jg.writeNumber(stats.getTotalLines()); // start countByCode array jg.writeFieldName("countByCode"); jg.writeStartArray(); @@ -113,7 +118,7 @@ public void output(final BugList bugList, final Writer writer, CFLintStats stats } // end countBySeverity array jg.writeEndArray(); - // end summary object + // end counts object jg.writeEndObject(); // end global object diff --git a/src/main/java/com/cflint/TextOutput.java b/src/main/java/com/cflint/TextOutput.java index 0e9fa2e3c..a49b88ccd 100644 --- a/src/main/java/com/cflint/TextOutput.java +++ b/src/main/java/com/cflint/TextOutput.java @@ -32,7 +32,7 @@ public void output(final BugList bugList, final Writer sb, CFLintStats stats) th } sb.append(newLine).append(newLine).append("Total files:" + stats.getFileCount()); - sb.append(newLine).append("Total size " + stats.getTotalSize()); + sb.append(newLine).append("Total lines:" + stats.getTotalLines()); sb.append(newLine).append(newLine).append("Issue counts:" + counts.noBugTypes()); diff --git a/src/main/java/com/cflint/XMLOutput.java b/src/main/java/com/cflint/XMLOutput.java index 645c09b7b..ee58ed7db 100644 --- a/src/main/java/com/cflint/XMLOutput.java +++ b/src/main/java/com/cflint/XMLOutput.java @@ -65,7 +65,7 @@ public void output(final BugList bugList, final Writer writer, final CFLintStats writer.append("").append(System.getProperty(LINE_SEPARATOR)); + writer.append(" totallines=\"").append(stats.getTotalLines().toString()).append("\">").append(System.getProperty(LINE_SEPARATOR)); for (final String code : counts.bugTypes()) { writer.append(" - + diff --git a/src/test/java/com/cflint/TestJSONOutput.java b/src/test/java/com/cflint/TestJSONOutput.java index 9f2388b0e..e5b4e14e9 100644 --- a/src/test/java/com/cflint/TestJSONOutput.java +++ b/src/test/java/com/cflint/TestJSONOutput.java @@ -30,7 +30,7 @@ public void testOutput() throws IOException { bugList.add(bugInfo); CFLintStats stats = new CFLintStats(123456L,1,new BigInteger("545454")); outputer.output(bugList, writer, stats); - String expectedText = "{\"issues\":[{\"severity\":\"\",\"id\":\"PARSE_ERROR\",\"message\":\"PARSE_ERROR\",\"category\":\"CFLINT\",\"abbrev\":\"PE\",\"locations\":[{\"file\":\"c:\\\\temp\\\\test.cfc\",\"fileName\":\"test.cfc\",\"function\":\"testf\",\"column\":1,\"line\":1,\"message\":\"\",\"variable\":\"\",\"expression\":\"\"}]}],\"summary\":{\"totalfiles\":1,\"totalsize\":545454,\"countByCode\":[],\"countBySeverity\":[]}}"; + String expectedText = "{\"version\":\"\",\"timestamp\":\"123456\",\"issues\":[{\"severity\":\"\",\"id\":\"PARSE_ERROR\",\"message\":\"PARSE_ERROR\",\"category\":\"CFLINT\",\"abbrev\":\"PE\",\"locations\":[{\"file\":\"c:\\\\temp\\\\test.cfc\",\"fileName\":\"test.cfc\",\"function\":\"testf\",\"column\":1,\"line\":1,\"message\":\"\",\"variable\":\"\",\"expression\":\"\"}]}],\"counts\":{\"totalFiles\":1,\"totalLines\":545454,\"countByCode\":[],\"countBySeverity\":[]}}"; assertEquals(expectedText,writer.toString()); } @@ -43,7 +43,7 @@ public void testStats() throws IOException { counts.add("PARSE_ERROR", null); CFLintStats stats = new CFLintStats(123456L,1,new BigInteger("545454"),counts); outputer.output(bugList, writer, stats); - String expectedText = "{\"issues\":[{\"severity\":\"\",\"id\":\"PARSE_ERROR\",\"message\":\"PARSE_ERROR\",\"category\":\"CFLINT\",\"abbrev\":\"PE\",\"locations\":[{\"file\":\"c:\\\\temp\\\\test.cfc\",\"fileName\":\"test.cfc\",\"function\":\"testf\",\"column\":1,\"line\":1,\"message\":\"\",\"variable\":\"\",\"expression\":\"\"}]}],\"summary\":{\"totalfiles\":1,\"totalsize\":545454,\"countByCode\":[{\"code\":\"PARSE_ERROR\",\"count\":1}],\"countBySeverity\":[]}}"; + String expectedText = "{\"version\":\"\",\"timestamp\":\"123456\",\"issues\":[{\"severity\":\"\",\"id\":\"PARSE_ERROR\",\"message\":\"PARSE_ERROR\",\"category\":\"CFLINT\",\"abbrev\":\"PE\",\"locations\":[{\"file\":\"c:\\\\temp\\\\test.cfc\",\"fileName\":\"test.cfc\",\"function\":\"testf\",\"column\":1,\"line\":1,\"message\":\"\",\"variable\":\"\",\"expression\":\"\"}]}],\"counts\":{\"totalFiles\":1,\"totalLines\":545454,\"countByCode\":[{\"code\":\"PARSE_ERROR\",\"count\":1}],\"countBySeverity\":[]}}"; assertEquals(expectedText,writer.toString()); } @@ -56,7 +56,7 @@ public void testStatsWithSeverity() throws IOException { counts.add("PARSE_ERROR", "ERROR"); CFLintStats stats = new CFLintStats(123456L,1,new BigInteger("545454"),counts); outputer.output(bugList, writer, stats); - String expectedText = "{\"issues\":[{\"severity\":\"ERROR\",\"id\":\"PARSE_ERROR\",\"message\":\"PARSE_ERROR\",\"category\":\"CFLINT\",\"abbrev\":\"PE\",\"locations\":[{\"file\":\"c:\\\\temp\\\\test.cfc\",\"fileName\":\"test.cfc\",\"function\":\"testf\",\"column\":1,\"line\":1,\"message\":\"\",\"variable\":\"\",\"expression\":\"\"}]}],\"summary\":{\"totalfiles\":1,\"totalsize\":545454,\"countByCode\":[{\"code\":\"PARSE_ERROR\",\"count\":1}],\"countBySeverity\":[{\"severity\":\"ERROR\",\"count\":1}]}}"; + String expectedText = "{\"version\":\"\",\"timestamp\":\"123456\",\"issues\":[{\"severity\":\"ERROR\",\"id\":\"PARSE_ERROR\",\"message\":\"PARSE_ERROR\",\"category\":\"CFLINT\",\"abbrev\":\"PE\",\"locations\":[{\"file\":\"c:\\\\temp\\\\test.cfc\",\"fileName\":\"test.cfc\",\"function\":\"testf\",\"column\":1,\"line\":1,\"message\":\"\",\"variable\":\"\",\"expression\":\"\"}]}],\"counts\":{\"totalFiles\":1,\"totalLines\":545454,\"countByCode\":[{\"code\":\"PARSE_ERROR\",\"count\":1}],\"countBySeverity\":[{\"severity\":\"ERROR\",\"count\":1}]}}"; assertEquals(expectedText,writer.toString()); } diff --git a/src/test/java/com/cflint/TestXMLOutput.java b/src/test/java/com/cflint/TestXMLOutput.java index 2d9216a5d..c5192d129 100644 --- a/src/test/java/com/cflint/TestXMLOutput.java +++ b/src/test/java/com/cflint/TestXMLOutput.java @@ -32,7 +32,7 @@ public void testOutput() throws IOException { String expectedText = "\n" + "\n" + "\n" + - "\n" + + "\n" + "" + ""; //remove the version @@ -51,7 +51,7 @@ public void testStats() throws IOException { String expectedText = "\n" + "\n" + "\n" + - "\n" + + "\n" + "\n" + "" + ""; @@ -70,7 +70,7 @@ public void testStatsAndSeverity() throws IOException { String expectedText = "\n" + "\n" + "\n" + - "\n" + + "\n" + "\n" + "" + "" + diff --git a/src/test/java/com/cflint/integration/TestFiles.java b/src/test/java/com/cflint/integration/TestFiles.java index 77e26fd68..b4fb49490 100644 --- a/src/test/java/com/cflint/integration/TestFiles.java +++ b/src/test/java/com/cflint/integration/TestFiles.java @@ -113,8 +113,8 @@ public void exceptionOccurred(Throwable exception, String messageCode, String fi writeExpectFile(expectedFile, actualTree); } assertEquals( - expectedText.replaceAll("\\\\","/").replaceAll("/+","/").replaceAll("\r\n", "\n"), - actualTree.replaceAll("\\\\","/").replaceAll("/+","/").replaceAll("\r\n", "\n")); + expectedText.replaceAll("\\\\","/").replaceAll("/+","/").replaceAll("\r\n", "\n").replaceAll("\"timestamp\" : \"\\d+\"", "\"timestamp\" : \"0\""), + actualTree.replaceAll("\\\\","/").replaceAll("/+","/").replaceAll("\r\n", "\n").replaceAll("\"timestamp\" : \"\\d+\"", "\"timestamp\" : \"0\"")); } } diff --git a/src/test/java/com/cflint/integration/TestIntegrationFolder.java b/src/test/java/com/cflint/integration/TestIntegrationFolder.java index bf65a2aab..7c4716cb4 100644 --- a/src/test/java/com/cflint/integration/TestIntegrationFolder.java +++ b/src/test/java/com/cflint/integration/TestIntegrationFolder.java @@ -25,57 +25,54 @@ 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").replaceAll("\"file\".+\\R\\s*", ""), - actual.replaceAll("\\\\","/").replaceAll("/+","/").replaceAll("\\R", "\n").replaceAll("\"file\".+\\R\\s*", "")); + assertEquals(expected.replaceAll("\\\\","/").replaceAll("/+","/").replaceAll("\\R", "\n").replaceAll("\"file\".+\\R\\s*", "").replaceAll("\"timestamp\" : \"\\d+\"", "\"timestamp\" : \"0\""), + actual.replaceAll("\\\\","/").replaceAll("/+","/").replaceAll("\\R", "\n").replaceAll("\"file\".+\\R\\s*", "").replaceAll("\"timestamp\" : \"\\d+\"", "\"timestamp\" : \"0\"")); } - @Test - public void testRuleGroupFolder() throws Exception{ - CFLintMain.main( - new String[]{ - "--folder", - "src/test/resources/com/cflint/integration", - "--json", - "--jsonfile", - "src/test/resources/com/cflint/integration/output.rulegroup.json", - "--rulegroups", - "Naming" - }); - 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").replaceAll("\"file\".+\\R\\s*", ""), - actual.replaceAll("\\\\","/").replaceAll("/+","/").replaceAll("\\R", "\n").replaceAll("\"file\".+\\R\\s*", "")); - } + @Test + public void testRuleGroupFolder() throws Exception{ + CFLintMain.main( + new String[]{ + "--folder", + "src/test/resources/com/cflint/integration", + "--json", + "--jsonfile", + "src/test/resources/com/cflint/integration/output.rulegroup.json", + "--rulegroups", + "Naming" + }); + 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").replaceAll("\"file\".+\\R\\s*", "").replaceAll("\"timestamp\" : \"\\d+\"", "\"timestamp\" : \"0\""), + actual.replaceAll("\\\\","/").replaceAll("/+","/").replaceAll("\\R", "\n").replaceAll("\"file\".+\\R\\s*", "").replaceAll("\"timestamp\" : \"\\d+\"", "\"timestamp\" : \"0\"")); + } - @Test - public void test_194() throws Exception{ - File tempFile = File.createTempFile("test_194_", "json"); - tempFile.deleteOnExit(); - CFLintMain.main( - new String[]{ - "--folder", - "src/test/resources/com/cflint/integration", - "-includeRule", - "COMPONENT_INVALID_NAME", - "--json", - "--jsonfile", - tempFile.getAbsolutePath() - }); - final String expected = loadFile(new File("src/test/resources/com/cflint/integration/output_194.expected.json")); - final String actual = loadFile(tempFile); - tempFile.delete(); - assertEquals( - 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); - byte[] b = new byte[is.available()]; - is.read(b); - is.close(); - return new String(b); - } + @Test + public void test_194() throws Exception{ + File tempFile = File.createTempFile("test_194_", "json"); + tempFile.deleteOnExit(); + CFLintMain.main( + new String[]{ + "--folder", + "src/test/resources/com/cflint/integration", + "-includeRule", + "COMPONENT_INVALID_NAME", + "--json", + "--jsonfile", + tempFile.getAbsolutePath() + }); + final String expected = loadFile(new File("src/test/resources/com/cflint/integration/output_194.expected.json")); + final String actual = loadFile(tempFile); + tempFile.delete(); + assertEquals(expected.replaceAll("\\\\","/").replaceAll("/+","/").replaceAll("\\R", "\n").replaceAll("\"file\".+\\R\\s*", "").replaceAll("\"timestamp\" : \"\\d+\"", "\"timestamp\" : \"0\""), + actual.replaceAll("\\\\","/").replaceAll("/+","/").replaceAll("\\R", "\n").replaceAll("\"file\".+\\R\\s*", "").replaceAll("\"timestamp\" : \"\\d+\"", "\"timestamp\" : \"0\"")); + } + public static String loadFile(File file) throws IOException { + InputStream is = new FileInputStream(file); + byte[] b = new byte[is.available()]; + is.read(b); + is.close(); + return new String(b); + } } diff --git a/src/test/resources/com/cflint/integration/output.expected.json b/src/test/resources/com/cflint/integration/output.expected.json index c184a3bc1..5abdabf53 100644 --- a/src/test/resources/com/cflint/integration/output.expected.json +++ b/src/test/resources/com/cflint/integration/output.expected.json @@ -1,4 +1,6 @@ { + "version" : "", + "timestamp" : "0", "issues" : [ { "severity" : "INFO", "id" : "COMPONENT_INVALID_NAME", @@ -60,9 +62,9 @@ "expression" : "public string function getStringFromStruct(interestingVar) {/n return interestingVar;/n/n }" } ] } ], - "summary" : { - "totalfiles" : 3, - "totalsize" : 18, + "counts" : { + "totalFiles" : 3, + "totalLines" : 18, "countByCode" : [ { "code" : "FUNCTION_HINT_MISSING", "count" : 3 diff --git a/src/test/resources/com/cflint/integration/output.rulegroup.expected.json b/src/test/resources/com/cflint/integration/output.rulegroup.expected.json index 1027ca043..da7564888 100644 --- a/src/test/resources/com/cflint/integration/output.rulegroup.expected.json +++ b/src/test/resources/com/cflint/integration/output.rulegroup.expected.json @@ -1,4 +1,6 @@ { + "version" : "", + "timestamp" : "0", "issues" : [ { "severity" : "INFO", "id" : "COMPONENT_INVALID_NAME", @@ -15,9 +17,9 @@ "expression" : "component {/n public string function getStringFromStruct(interestingVar) {/n return interestingVar;/n/n }/n}" } ] } ], - "summary" : { - "totalfiles" : 3, - "totalsize" : 18, + "counts" : { + "totalFiles" : 3, + "totalLines" : 18, "countByCode" : [ { "code" : "COMPONENT_INVALID_NAME", "count" : 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 index 1027ca043..da7564888 100644 --- a/src/test/resources/com/cflint/integration/output_194.expected.json +++ b/src/test/resources/com/cflint/integration/output_194.expected.json @@ -1,4 +1,6 @@ { + "version" : "", + "timestamp" : "0", "issues" : [ { "severity" : "INFO", "id" : "COMPONENT_INVALID_NAME", @@ -15,9 +17,9 @@ "expression" : "component {/n public string function getStringFromStruct(interestingVar) {/n return interestingVar;/n/n }/n}" } ] } ], - "summary" : { - "totalfiles" : 3, - "totalsize" : 18, + "counts" : { + "totalFiles" : 3, + "totalLines" : 18, "countByCode" : [ { "code" : "COMPONENT_INVALID_NAME", "count" : 1 diff --git a/src/test/resources/com/cflint/tests/ArgVarConflict/mixedScopeExample.expected.txt b/src/test/resources/com/cflint/tests/ArgVarConflict/mixedScopeExample.expected.txt index e190a2757..54ac751ba 100644 --- a/src/test/resources/com/cflint/tests/ArgVarConflict/mixedScopeExample.expected.txt +++ b/src/test/resources/com/cflint/tests/ArgVarConflict/mixedScopeExample.expected.txt @@ -1,8 +1,10 @@ { + "version" : "", + "timestamp" : "1501202121", "issues" : [ ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ ], "countBySeverity" : [ ] } diff --git a/src/test/resources/com/cflint/tests/BuiltInFunctionChecker/isDate1.expected.txt b/src/test/resources/com/cflint/tests/BuiltInFunctionChecker/isDate1.expected.txt index 98cb876bb..79533d732 100644 --- a/src/test/resources/com/cflint/tests/BuiltInFunctionChecker/isDate1.expected.txt +++ b/src/test/resources/com/cflint/tests/BuiltInFunctionChecker/isDate1.expected.txt @@ -1,4 +1,6 @@ { + "version" : "", + "timestamp" : "1501202123", "issues" : [ { "severity" : "WARNING", "id" : "AVOID_USING_ISDATE", @@ -16,9 +18,9 @@ "expression" : "isDate(1.5)" } ] } ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ { "code" : "AVOID_USING_ISDATE", "count" : 1 diff --git a/src/test/resources/com/cflint/tests/BuiltInFunctionChecker/isDate2.expected.txt b/src/test/resources/com/cflint/tests/BuiltInFunctionChecker/isDate2.expected.txt index eca7d51bd..57e4abe2d 100644 --- a/src/test/resources/com/cflint/tests/BuiltInFunctionChecker/isDate2.expected.txt +++ b/src/test/resources/com/cflint/tests/BuiltInFunctionChecker/isDate2.expected.txt @@ -1,4 +1,6 @@ { + "version" : "", + "timestamp" : "1501202124", "issues" : [ { "severity" : "WARNING", "id" : "AVOID_USING_ISDATE", @@ -16,9 +18,9 @@ "expression" : "isDate(1.5)" } ] } ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ { "code" : "AVOID_USING_ISDATE", "count" : 1 diff --git a/src/test/resources/com/cflint/tests/CFIncludeChecker/cfinclude1.expected.txt b/src/test/resources/com/cflint/tests/CFIncludeChecker/cfinclude1.expected.txt index c09b394f1..8566882d8 100644 --- a/src/test/resources/com/cflint/tests/CFIncludeChecker/cfinclude1.expected.txt +++ b/src/test/resources/com/cflint/tests/CFIncludeChecker/cfinclude1.expected.txt @@ -1,4 +1,6 @@ { + "version" : "", + "timestamp" : "1501202125", "issues" : [ { "severity" : "WARNING", "id" : "AVOID_USING_CFINCLUDE_TAG", @@ -16,9 +18,9 @@ "expression" : "" } ] } ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ { "code" : "AVOID_USING_CFINCLUDE_TAG", "count" : 1 diff --git a/src/test/resources/com/cflint/tests/CFIncludeChecker/lonelyCfinclude.expected.txt b/src/test/resources/com/cflint/tests/CFIncludeChecker/lonelyCfinclude.expected.txt index d239769d7..9464dabe4 100644 --- a/src/test/resources/com/cflint/tests/CFIncludeChecker/lonelyCfinclude.expected.txt +++ b/src/test/resources/com/cflint/tests/CFIncludeChecker/lonelyCfinclude.expected.txt @@ -1,4 +1,6 @@ { + "version" : "", + "timestamp" : "1501202125", "issues" : [ { "severity" : "WARNING", "id" : "AVOID_USING_CFINCLUDE_TAG", @@ -16,9 +18,9 @@ "expression" : "" } ] } ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ { "code" : "AVOID_USING_CFINCLUDE_TAG", "count" : 1 diff --git a/src/test/resources/com/cflint/tests/CompareInsteadOfAssign/Compare1.expected.txt b/src/test/resources/com/cflint/tests/CompareInsteadOfAssign/Compare1.expected.txt index 111beb731..0b75c728a 100644 --- a/src/test/resources/com/cflint/tests/CompareInsteadOfAssign/Compare1.expected.txt +++ b/src/test/resources/com/cflint/tests/CompareInsteadOfAssign/Compare1.expected.txt @@ -1,4 +1,6 @@ { + "version" : "", + "timestamp" : "1501202125", "issues" : [ { "severity" : "WARNING", "id" : "COMPARE_INSTEAD_OF_ASSIGN", @@ -32,9 +34,9 @@ "expression" : "x.x EQ 6" } ] } ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ { "code" : "COMPARE_INSTEAD_OF_ASSIGN", "count" : 2 diff --git a/src/test/resources/com/cflint/tests/CompareInsteadOfAssign/Compare2.expected.txt b/src/test/resources/com/cflint/tests/CompareInsteadOfAssign/Compare2.expected.txt index e190a2757..467c02092 100644 --- a/src/test/resources/com/cflint/tests/CompareInsteadOfAssign/Compare2.expected.txt +++ b/src/test/resources/com/cflint/tests/CompareInsteadOfAssign/Compare2.expected.txt @@ -1,8 +1,10 @@ { + "version" : "", + "timestamp" : "1501202125", "issues" : [ ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ ], "countBySeverity" : [ ] } diff --git a/src/test/resources/com/cflint/tests/Complexity/ifelse.expected.txt b/src/test/resources/com/cflint/tests/Complexity/ifelse.expected.txt index e190a2757..467c02092 100644 --- a/src/test/resources/com/cflint/tests/Complexity/ifelse.expected.txt +++ b/src/test/resources/com/cflint/tests/Complexity/ifelse.expected.txt @@ -1,8 +1,10 @@ { + "version" : "", + "timestamp" : "1501202125", "issues" : [ ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ ], "countBySeverity" : [ ] } diff --git a/src/test/resources/com/cflint/tests/Complexity/ifelseComplex.expected.txt b/src/test/resources/com/cflint/tests/Complexity/ifelseComplex.expected.txt index b518fd7dd..04c74290b 100644 --- a/src/test/resources/com/cflint/tests/Complexity/ifelseComplex.expected.txt +++ b/src/test/resources/com/cflint/tests/Complexity/ifelseComplex.expected.txt @@ -1,4 +1,6 @@ { + "version" : "", + "timestamp" : "1501202126", "issues" : [ { "severity" : "WARNING", "id" : "FUNCTION_TOO_COMPLEX", @@ -16,9 +18,9 @@ "expression" : "if(something ) {\ndoSomethingElse();\n\n }" } ] } ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ { "code" : "FUNCTION_TOO_COMPLEX", "count" : 1 diff --git a/src/test/resources/com/cflint/tests/ComponentNameChecker/foo.expected.txt b/src/test/resources/com/cflint/tests/ComponentNameChecker/foo.expected.txt index 83ea7a2df..e5bbaabb9 100644 --- a/src/test/resources/com/cflint/tests/ComponentNameChecker/foo.expected.txt +++ b/src/test/resources/com/cflint/tests/ComponentNameChecker/foo.expected.txt @@ -1,4 +1,6 @@ { + "version" : "", + "timestamp" : "1501202126", "issues" : [ { "severity" : "INFO", "id" : "COMPONENT_INVALID_NAME", @@ -16,9 +18,9 @@ "expression" : "component {\n}" } ] } ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ { "code" : "COMPONENT_INVALID_NAME", "count" : 1 diff --git a/src/test/resources/com/cflint/tests/ComponentNameChecker/foofoo.expected.txt b/src/test/resources/com/cflint/tests/ComponentNameChecker/foofoo.expected.txt index 6f97c5f36..f8ea5f80b 100644 --- a/src/test/resources/com/cflint/tests/ComponentNameChecker/foofoo.expected.txt +++ b/src/test/resources/com/cflint/tests/ComponentNameChecker/foofoo.expected.txt @@ -1,4 +1,6 @@ { + "version" : "", + "timestamp" : "1501202126", "issues" : [ { "severity" : "INFO", "id" : "COMPONENT_INVALID_NAME", @@ -16,9 +18,9 @@ "expression" : "component name='foo2' {\n}" } ] } ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ { "code" : "COMPONENT_INVALID_NAME", "count" : 1 diff --git a/src/test/resources/com/cflint/tests/EmptyFile/foo.expected.txt b/src/test/resources/com/cflint/tests/EmptyFile/foo.expected.txt index c40f77638..582364b63 100644 --- a/src/test/resources/com/cflint/tests/EmptyFile/foo.expected.txt +++ b/src/test/resources/com/cflint/tests/EmptyFile/foo.expected.txt @@ -1,4 +1,6 @@ { + "version" : "", + "timestamp" : "1501202126", "issues" : [ { "severity" : "WARNING", "id" : "AVOID_EMPTY_FILES", @@ -16,9 +18,9 @@ "expression" : "" } ] } ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ { "code" : "AVOID_EMPTY_FILES", "count" : 1 diff --git a/src/test/resources/com/cflint/tests/EmptyFile/fooWS.expected.txt b/src/test/resources/com/cflint/tests/EmptyFile/fooWS.expected.txt index 45b84b1a3..cb88457c8 100644 --- a/src/test/resources/com/cflint/tests/EmptyFile/fooWS.expected.txt +++ b/src/test/resources/com/cflint/tests/EmptyFile/fooWS.expected.txt @@ -1,4 +1,6 @@ { + "version" : "", + "timestamp" : "1501202126", "issues" : [ { "severity" : "WARNING", "id" : "AVOID_EMPTY_FILES", @@ -16,9 +18,9 @@ "expression" : "" } ] } ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ { "code" : "AVOID_EMPTY_FILES", "count" : 1 diff --git a/src/test/resources/com/cflint/tests/ExcludesAll/someErrors.expected.txt b/src/test/resources/com/cflint/tests/ExcludesAll/someErrors.expected.txt index e190a2757..5fdd01c9c 100644 --- a/src/test/resources/com/cflint/tests/ExcludesAll/someErrors.expected.txt +++ b/src/test/resources/com/cflint/tests/ExcludesAll/someErrors.expected.txt @@ -1,8 +1,10 @@ { + "version" : "", + "timestamp" : "1501202126", "issues" : [ ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ ], "countBySeverity" : [ ] } diff --git a/src/test/resources/com/cflint/tests/FunctionType/Any/functionany1.expected.txt b/src/test/resources/com/cflint/tests/FunctionType/Any/functionany1.expected.txt index df77b038e..b44c211d9 100644 --- a/src/test/resources/com/cflint/tests/FunctionType/Any/functionany1.expected.txt +++ b/src/test/resources/com/cflint/tests/FunctionType/Any/functionany1.expected.txt @@ -1,4 +1,6 @@ { + "version" : "", + "timestamp" : "1501202127", "issues" : [ { "severity" : "INFO", "id" : "FUNCTION_TYPE_ANY", @@ -16,9 +18,9 @@ "expression" : "public any function x() {\nx = 123;\n\n }" } ] } ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ { "code" : "FUNCTION_TYPE_ANY", "count" : 1 diff --git a/src/test/resources/com/cflint/tests/FunctionType/Any/functionmissing1.expected.txt b/src/test/resources/com/cflint/tests/FunctionType/Any/functionmissing1.expected.txt index e190a2757..b70d642d0 100644 --- a/src/test/resources/com/cflint/tests/FunctionType/Any/functionmissing1.expected.txt +++ b/src/test/resources/com/cflint/tests/FunctionType/Any/functionmissing1.expected.txt @@ -1,8 +1,10 @@ { + "version" : "", + "timestamp" : "1501202127", "issues" : [ ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ ], "countBySeverity" : [ ] } diff --git a/src/test/resources/com/cflint/tests/GlobalVarChecker/cfcatch_tag.expected.txt b/src/test/resources/com/cflint/tests/GlobalVarChecker/cfcatch_tag.expected.txt index e190a2757..b70d642d0 100644 --- a/src/test/resources/com/cflint/tests/GlobalVarChecker/cfcatch_tag.expected.txt +++ b/src/test/resources/com/cflint/tests/GlobalVarChecker/cfcatch_tag.expected.txt @@ -1,8 +1,10 @@ { + "version" : "", + "timestamp" : "1501202127", "issues" : [ ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ ], "countBySeverity" : [ ] } diff --git a/src/test/resources/com/cflint/tests/Hints/arg_hints_missing.expected.txt b/src/test/resources/com/cflint/tests/Hints/arg_hints_missing.expected.txt index e190a2757..b70d642d0 100644 --- a/src/test/resources/com/cflint/tests/Hints/arg_hints_missing.expected.txt +++ b/src/test/resources/com/cflint/tests/Hints/arg_hints_missing.expected.txt @@ -1,8 +1,10 @@ { + "version" : "", + "timestamp" : "1501202127", "issues" : [ ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ ], "countBySeverity" : [ ] } diff --git a/src/test/resources/com/cflint/tests/Hints/hints1.expected.txt b/src/test/resources/com/cflint/tests/Hints/hints1.expected.txt index d255987ab..2738f4961 100644 --- a/src/test/resources/com/cflint/tests/Hints/hints1.expected.txt +++ b/src/test/resources/com/cflint/tests/Hints/hints1.expected.txt @@ -1,4 +1,6 @@ { + "version" : "", + "timestamp" : "1501202127", "issues" : [ { "severity" : "WARNING", "id" : "COMPONENT_HINT_MISSING", @@ -16,9 +18,9 @@ "expression" : "component {\n public void function function1(arg1, arg2) hint='test hint attribute' {\nsomeVar = '';\n\n }\n}" } ] } ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ { "code" : "COMPONENT_HINT_MISSING", "count" : 1 diff --git a/src/test/resources/com/cflint/tests/Hints/hints2_hintattribute.expected.txt b/src/test/resources/com/cflint/tests/Hints/hints2_hintattribute.expected.txt index e190a2757..b70d642d0 100644 --- a/src/test/resources/com/cflint/tests/Hints/hints2_hintattribute.expected.txt +++ b/src/test/resources/com/cflint/tests/Hints/hints2_hintattribute.expected.txt @@ -1,8 +1,10 @@ { + "version" : "", + "timestamp" : "1501202127", "issues" : [ ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ ], "countBySeverity" : [ ] } diff --git a/src/test/resources/com/cflint/tests/Hints/hints3_hintannotation.expected.txt b/src/test/resources/com/cflint/tests/Hints/hints3_hintannotation.expected.txt index e190a2757..b70d642d0 100644 --- a/src/test/resources/com/cflint/tests/Hints/hints3_hintannotation.expected.txt +++ b/src/test/resources/com/cflint/tests/Hints/hints3_hintannotation.expected.txt @@ -1,8 +1,10 @@ { + "version" : "", + "timestamp" : "1501202127", "issues" : [ ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ ], "countBySeverity" : [ ] } diff --git a/src/test/resources/com/cflint/tests/Hints/hints4_emptycomment.expected.txt b/src/test/resources/com/cflint/tests/Hints/hints4_emptycomment.expected.txt index 8de8c9c42..7d35448a2 100644 --- a/src/test/resources/com/cflint/tests/Hints/hints4_emptycomment.expected.txt +++ b/src/test/resources/com/cflint/tests/Hints/hints4_emptycomment.expected.txt @@ -1,4 +1,6 @@ { + "version" : "", + "timestamp" : "1501202128", "issues" : [ { "severity" : "WARNING", "id" : "COMPONENT_HINT_MISSING", @@ -32,9 +34,9 @@ "expression" : "public void function function1() {\nsomeVar = '';\n\n }" } ] } ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ { "code" : "COMPONENT_HINT_MISSING", "count" : 1 diff --git a/src/test/resources/com/cflint/tests/Hints/hints5_comment.expected.txt b/src/test/resources/com/cflint/tests/Hints/hints5_comment.expected.txt index e190a2757..4d20c602a 100644 --- a/src/test/resources/com/cflint/tests/Hints/hints5_comment.expected.txt +++ b/src/test/resources/com/cflint/tests/Hints/hints5_comment.expected.txt @@ -1,8 +1,10 @@ { + "version" : "", + "timestamp" : "1501202128", "issues" : [ ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ ], "countBySeverity" : [ ] } diff --git a/src/test/resources/com/cflint/tests/Ignores/ignoreCFMLAny1.expected.txt b/src/test/resources/com/cflint/tests/Ignores/ignoreCFMLAny1.expected.txt index e190a2757..4d20c602a 100644 --- a/src/test/resources/com/cflint/tests/Ignores/ignoreCFMLAny1.expected.txt +++ b/src/test/resources/com/cflint/tests/Ignores/ignoreCFMLAny1.expected.txt @@ -1,8 +1,10 @@ { + "version" : "", + "timestamp" : "1501202128", "issues" : [ ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ ], "countBySeverity" : [ ] } diff --git a/src/test/resources/com/cflint/tests/Ignores/ignoreCFMLAny2.expected.txt b/src/test/resources/com/cflint/tests/Ignores/ignoreCFMLAny2.expected.txt index ba6f17355..c1812dcd9 100644 --- a/src/test/resources/com/cflint/tests/Ignores/ignoreCFMLAny2.expected.txt +++ b/src/test/resources/com/cflint/tests/Ignores/ignoreCFMLAny2.expected.txt @@ -1,4 +1,6 @@ { + "version" : "", + "timestamp" : "1501202128", "issues" : [ { "severity" : "ERROR", "id" : "MISSING_VAR", @@ -16,9 +18,9 @@ "expression" : "someVar" } ] } ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ { "code" : "MISSING_VAR", "count" : 1 diff --git a/src/test/resources/com/cflint/tests/Ignores/ignoreCFMLAny3_Nested.expected.txt b/src/test/resources/com/cflint/tests/Ignores/ignoreCFMLAny3_Nested.expected.txt index e190a2757..4d20c602a 100644 --- a/src/test/resources/com/cflint/tests/Ignores/ignoreCFMLAny3_Nested.expected.txt +++ b/src/test/resources/com/cflint/tests/Ignores/ignoreCFMLAny3_Nested.expected.txt @@ -1,8 +1,10 @@ { + "version" : "", + "timestamp" : "1501202128", "issues" : [ ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ ], "countBySeverity" : [ ] } diff --git a/src/test/resources/com/cflint/tests/Ignores/ignoreCFMLAny4.expected.txt b/src/test/resources/com/cflint/tests/Ignores/ignoreCFMLAny4.expected.txt index e190a2757..4d20c602a 100644 --- a/src/test/resources/com/cflint/tests/Ignores/ignoreCFMLAny4.expected.txt +++ b/src/test/resources/com/cflint/tests/Ignores/ignoreCFMLAny4.expected.txt @@ -1,8 +1,10 @@ { + "version" : "", + "timestamp" : "1501202128", "issues" : [ ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ ], "countBySeverity" : [ ] } diff --git a/src/test/resources/com/cflint/tests/Ignores/ignoreCFMLAny5.expected.txt b/src/test/resources/com/cflint/tests/Ignores/ignoreCFMLAny5.expected.txt index e190a2757..4d20c602a 100644 --- a/src/test/resources/com/cflint/tests/Ignores/ignoreCFMLAny5.expected.txt +++ b/src/test/resources/com/cflint/tests/Ignores/ignoreCFMLAny5.expected.txt @@ -1,8 +1,10 @@ { + "version" : "", + "timestamp" : "1501202128", "issues" : [ ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ ], "countBySeverity" : [ ] } diff --git a/src/test/resources/com/cflint/tests/Ignores/ignoreCFMLComponent.expected.txt b/src/test/resources/com/cflint/tests/Ignores/ignoreCFMLComponent.expected.txt index 6618e9003..1cc5c43ed 100644 --- a/src/test/resources/com/cflint/tests/Ignores/ignoreCFMLComponent.expected.txt +++ b/src/test/resources/com/cflint/tests/Ignores/ignoreCFMLComponent.expected.txt @@ -1,4 +1,6 @@ { + "version" : "", + "timestamp" : "1501202129", "issues" : [ { "severity" : "ERROR", "id" : "MISSING_VAR", @@ -16,9 +18,9 @@ "expression" : "someVar" } ] } ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ { "code" : "MISSING_VAR", "count" : 1 diff --git a/src/test/resources/com/cflint/tests/Ignores/ignoreCFMLComponent2.expected.txt b/src/test/resources/com/cflint/tests/Ignores/ignoreCFMLComponent2.expected.txt index e190a2757..7607703df 100644 --- a/src/test/resources/com/cflint/tests/Ignores/ignoreCFMLComponent2.expected.txt +++ b/src/test/resources/com/cflint/tests/Ignores/ignoreCFMLComponent2.expected.txt @@ -1,8 +1,10 @@ { + "version" : "", + "timestamp" : "1501202129", "issues" : [ ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ ], "countBySeverity" : [ ] } diff --git a/src/test/resources/com/cflint/tests/Ignores/ignoreCFMLFunction.expected.txt b/src/test/resources/com/cflint/tests/Ignores/ignoreCFMLFunction.expected.txt index e190a2757..7607703df 100644 --- a/src/test/resources/com/cflint/tests/Ignores/ignoreCFMLFunction.expected.txt +++ b/src/test/resources/com/cflint/tests/Ignores/ignoreCFMLFunction.expected.txt @@ -1,8 +1,10 @@ { + "version" : "", + "timestamp" : "1501202129", "issues" : [ ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ ], "countBySeverity" : [ ] } diff --git a/src/test/resources/com/cflint/tests/Ignores/ignoreLine1.expected.txt b/src/test/resources/com/cflint/tests/Ignores/ignoreLine1.expected.txt index e190a2757..7607703df 100644 --- a/src/test/resources/com/cflint/tests/Ignores/ignoreLine1.expected.txt +++ b/src/test/resources/com/cflint/tests/Ignores/ignoreLine1.expected.txt @@ -1,8 +1,10 @@ { + "version" : "", + "timestamp" : "1501202129", "issues" : [ ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ ], "countBySeverity" : [ ] } diff --git a/src/test/resources/com/cflint/tests/Ignores/ignoreLineMessage1.expected.txt b/src/test/resources/com/cflint/tests/Ignores/ignoreLineMessage1.expected.txt index e190a2757..7607703df 100644 --- a/src/test/resources/com/cflint/tests/Ignores/ignoreLineMessage1.expected.txt +++ b/src/test/resources/com/cflint/tests/Ignores/ignoreLineMessage1.expected.txt @@ -1,8 +1,10 @@ { + "version" : "", + "timestamp" : "1501202129", "issues" : [ ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ ], "countBySeverity" : [ ] } diff --git a/src/test/resources/com/cflint/tests/Ignores/ignoreLineMessageUnmatched.expected.txt b/src/test/resources/com/cflint/tests/Ignores/ignoreLineMessageUnmatched.expected.txt index bc1eeb6e6..b17bf2f03 100644 --- a/src/test/resources/com/cflint/tests/Ignores/ignoreLineMessageUnmatched.expected.txt +++ b/src/test/resources/com/cflint/tests/Ignores/ignoreLineMessageUnmatched.expected.txt @@ -1,4 +1,6 @@ { + "version" : "", + "timestamp" : "1501202129", "issues" : [ { "severity" : "ERROR", "id" : "MISSING_VAR", @@ -16,9 +18,9 @@ "expression" : "someVar" } ] } ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ { "code" : "MISSING_VAR", "count" : 1 diff --git a/src/test/resources/com/cflint/tests/Ignores/ignoreMultiLine.expected.txt b/src/test/resources/com/cflint/tests/Ignores/ignoreMultiLine.expected.txt index 06adcc078..3c1ebdada 100644 --- a/src/test/resources/com/cflint/tests/Ignores/ignoreMultiLine.expected.txt +++ b/src/test/resources/com/cflint/tests/Ignores/ignoreMultiLine.expected.txt @@ -1,4 +1,6 @@ { + "version" : "", + "timestamp" : "1501202129", "issues" : [ { "severity" : "ERROR", "id" : "MISSING_VAR", @@ -16,9 +18,9 @@ "expression" : "someVar" } ] } ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ { "code" : "MISSING_VAR", "count" : 1 diff --git a/src/test/resources/com/cflint/tests/Ignores/ignoreMultiLine2.expected.txt b/src/test/resources/com/cflint/tests/Ignores/ignoreMultiLine2.expected.txt index e190a2757..7607703df 100644 --- a/src/test/resources/com/cflint/tests/Ignores/ignoreMultiLine2.expected.txt +++ b/src/test/resources/com/cflint/tests/Ignores/ignoreMultiLine2.expected.txt @@ -1,8 +1,10 @@ { + "version" : "", + "timestamp" : "1501202129", "issues" : [ ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ ], "countBySeverity" : [ ] } diff --git a/src/test/resources/com/cflint/tests/Ignores/ignoreMultiLineComponent.expected.txt b/src/test/resources/com/cflint/tests/Ignores/ignoreMultiLineComponent.expected.txt index d2ede0ed7..28c42f4ab 100644 --- a/src/test/resources/com/cflint/tests/Ignores/ignoreMultiLineComponent.expected.txt +++ b/src/test/resources/com/cflint/tests/Ignores/ignoreMultiLineComponent.expected.txt @@ -1,4 +1,6 @@ { + "version" : "", + "timestamp" : "1501202129", "issues" : [ { "severity" : "ERROR", "id" : "MISSING_VAR", @@ -16,9 +18,9 @@ "expression" : "someVar" } ] } ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ { "code" : "MISSING_VAR", "count" : 1 diff --git a/src/test/resources/com/cflint/tests/Ignores/ignoreMultiLineComponent2.expected.txt b/src/test/resources/com/cflint/tests/Ignores/ignoreMultiLineComponent2.expected.txt index e190a2757..7607703df 100644 --- a/src/test/resources/com/cflint/tests/Ignores/ignoreMultiLineComponent2.expected.txt +++ b/src/test/resources/com/cflint/tests/Ignores/ignoreMultiLineComponent2.expected.txt @@ -1,8 +1,10 @@ { + "version" : "", + "timestamp" : "1501202129", "issues" : [ ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ ], "countBySeverity" : [ ] } diff --git a/src/test/resources/com/cflint/tests/Includes/Header.expected.txt b/src/test/resources/com/cflint/tests/Includes/Header.expected.txt index f7a06399f..0518ad836 100644 --- a/src/test/resources/com/cflint/tests/Includes/Header.expected.txt +++ b/src/test/resources/com/cflint/tests/Includes/Header.expected.txt @@ -1,4 +1,6 @@ { + "version" : "", + "timestamp" : "1501202129", "issues" : [ { "severity" : "WARNING", "id" : "GLOBAL_LITERAL_VALUE_USED_TOO_OFTEN", @@ -48,9 +50,9 @@ "expression" : "'companyName'" } ] } ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ { "code" : "GLOBAL_LITERAL_VALUE_USED_TOO_OFTEN", "count" : 3 diff --git a/src/test/resources/com/cflint/tests/Includes/Template.expected.txt b/src/test/resources/com/cflint/tests/Includes/Template.expected.txt index 3fbe7e889..57c1e256e 100644 --- a/src/test/resources/com/cflint/tests/Includes/Template.expected.txt +++ b/src/test/resources/com/cflint/tests/Includes/Template.expected.txt @@ -1,4 +1,6 @@ { + "version" : "", + "timestamp" : "1501202130", "issues" : [ { "severity" : "WARNING", "id" : "GLOBAL_LITERAL_VALUE_USED_TOO_OFTEN", @@ -16,9 +18,9 @@ "expression" : "'companyName'" } ] } ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ { "code" : "GLOBAL_LITERAL_VALUE_USED_TOO_OFTEN", "count" : 1 diff --git a/src/test/resources/com/cflint/tests/LiteralChecker/literal_arraysort.expected.txt b/src/test/resources/com/cflint/tests/LiteralChecker/literal_arraysort.expected.txt index e190a2757..3bf81006a 100644 --- a/src/test/resources/com/cflint/tests/LiteralChecker/literal_arraysort.expected.txt +++ b/src/test/resources/com/cflint/tests/LiteralChecker/literal_arraysort.expected.txt @@ -1,8 +1,10 @@ { + "version" : "", + "timestamp" : "1501202130", "issues" : [ ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ ], "countBySeverity" : [ ] } diff --git a/src/test/resources/com/cflint/tests/LiteralChecker/literal_checker_326.expected.txt b/src/test/resources/com/cflint/tests/LiteralChecker/literal_checker_326.expected.txt index 32fae4015..703af3dfe 100644 --- a/src/test/resources/com/cflint/tests/LiteralChecker/literal_checker_326.expected.txt +++ b/src/test/resources/com/cflint/tests/LiteralChecker/literal_checker_326.expected.txt @@ -1,4 +1,6 @@ { + "version" : "", + "timestamp" : "1501202130", "issues" : [ { "severity" : "WARNING", "id" : "GLOBAL_LITERAL_VALUE_USED_TOO_OFTEN", @@ -16,9 +18,9 @@ "expression" : "3" } ] } ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ { "code" : "GLOBAL_LITERAL_VALUE_USED_TOO_OFTEN", "count" : 1 diff --git a/src/test/resources/com/cflint/tests/MissingSemiColon/missingSemis1.expected.txt b/src/test/resources/com/cflint/tests/MissingSemiColon/missingSemis1.expected.txt index e9a00a96c..2de377e1b 100644 --- a/src/test/resources/com/cflint/tests/MissingSemiColon/missingSemis1.expected.txt +++ b/src/test/resources/com/cflint/tests/MissingSemiColon/missingSemis1.expected.txt @@ -1,4 +1,6 @@ { + "version" : "", + "timestamp" : "1501202130", "issues" : [ { "severity" : "ERROR", "id" : "MISSING_SEMI", @@ -16,9 +18,9 @@ "expression" : "" } ] } ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ { "code" : "MISSING_SEMI", "count" : 1 diff --git a/src/test/resources/com/cflint/tests/Naming/nameEndsInNumberScript.expected.txt b/src/test/resources/com/cflint/tests/Naming/nameEndsInNumberScript.expected.txt index 01f3f57c4..e99a80ce1 100644 --- a/src/test/resources/com/cflint/tests/Naming/nameEndsInNumberScript.expected.txt +++ b/src/test/resources/com/cflint/tests/Naming/nameEndsInNumberScript.expected.txt @@ -1,4 +1,6 @@ { + "version" : "", + "timestamp" : "1501202130", "issues" : [ { "severity" : "INFO", "id" : "VAR_INVALID_NAME", @@ -48,9 +50,9 @@ "expression" : "" } ] } ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ { "code" : "VAR_INVALID_NAME", "count" : 3 diff --git a/src/test/resources/com/cflint/tests/Naming/tempVar.expected.txt b/src/test/resources/com/cflint/tests/Naming/tempVar.expected.txt index 3db81d2d6..5f797ce00 100644 --- a/src/test/resources/com/cflint/tests/Naming/tempVar.expected.txt +++ b/src/test/resources/com/cflint/tests/Naming/tempVar.expected.txt @@ -1,4 +1,6 @@ { + "version" : "", + "timestamp" : "1501202130", "issues" : [ { "severity" : "INFO", "id" : "VAR_IS_TEMPORARY", @@ -16,9 +18,9 @@ "expression" : "" } ] } ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ { "code" : "VAR_IS_TEMPORARY", "count" : 1 diff --git a/src/test/resources/com/cflint/tests/PackageCase/packagecase_nok.expected.txt b/src/test/resources/com/cflint/tests/PackageCase/packagecase_nok.expected.txt index c5221503a..6e3f96c80 100644 --- a/src/test/resources/com/cflint/tests/PackageCase/packagecase_nok.expected.txt +++ b/src/test/resources/com/cflint/tests/PackageCase/packagecase_nok.expected.txt @@ -1,4 +1,6 @@ { + "version" : "", + "timestamp" : "1501202130", "issues" : [ { "severity" : "WARNING", "id" : "PACKAGE_CASE_MISMATCH", @@ -16,9 +18,9 @@ "expression" : "new tests.packagecase.packagecase_nok()" } ] } ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ { "code" : "PACKAGE_CASE_MISMATCH", "count" : 1 diff --git a/src/test/resources/com/cflint/tests/PackageCase/packagecase_nokC.expected.txt b/src/test/resources/com/cflint/tests/PackageCase/packagecase_nokC.expected.txt index 41b44bf15..350cb0eba 100644 --- a/src/test/resources/com/cflint/tests/PackageCase/packagecase_nokC.expected.txt +++ b/src/test/resources/com/cflint/tests/PackageCase/packagecase_nokC.expected.txt @@ -1,4 +1,6 @@ { + "version" : "", + "timestamp" : "1501202131", "issues" : [ { "severity" : "WARNING", "id" : "PACKAGE_CASE_MISMATCH", @@ -16,9 +18,9 @@ "expression" : "\r\nnew tests.packagecase.packagecase_nokC();\r\n" } ] } ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ { "code" : "PACKAGE_CASE_MISMATCH", "count" : 1 diff --git a/src/test/resources/com/cflint/tests/PackageCase/packagecase_nok_b.expected.txt b/src/test/resources/com/cflint/tests/PackageCase/packagecase_nok_b.expected.txt index ee1366c41..176310dbe 100644 --- a/src/test/resources/com/cflint/tests/PackageCase/packagecase_nok_b.expected.txt +++ b/src/test/resources/com/cflint/tests/PackageCase/packagecase_nok_b.expected.txt @@ -1,4 +1,6 @@ { + "version" : "", + "timestamp" : "1501202131", "issues" : [ { "severity" : "WARNING", "id" : "PACKAGE_CASE_MISMATCH", @@ -16,9 +18,9 @@ "expression" : "CreateObject('component', 'tests.packagecase.packagecase_nok_b')" } ] } ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ { "code" : "PACKAGE_CASE_MISMATCH", "count" : 1 diff --git a/src/test/resources/com/cflint/tests/PackageCase/packagecase_ok.expected.txt b/src/test/resources/com/cflint/tests/PackageCase/packagecase_ok.expected.txt index e190a2757..bd42a4af1 100644 --- a/src/test/resources/com/cflint/tests/PackageCase/packagecase_ok.expected.txt +++ b/src/test/resources/com/cflint/tests/PackageCase/packagecase_ok.expected.txt @@ -1,8 +1,10 @@ { + "version" : "", + "timestamp" : "1501202131", "issues" : [ ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ ], "countBySeverity" : [ ] } diff --git a/src/test/resources/com/cflint/tests/ParseError/cfloop_359.expected.txt b/src/test/resources/com/cflint/tests/ParseError/cfloop_359.expected.txt index e190a2757..bd42a4af1 100644 --- a/src/test/resources/com/cflint/tests/ParseError/cfloop_359.expected.txt +++ b/src/test/resources/com/cflint/tests/ParseError/cfloop_359.expected.txt @@ -1,8 +1,10 @@ { + "version" : "", + "timestamp" : "1501202131", "issues" : [ ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ ], "countBySeverity" : [ ] } diff --git a/src/test/resources/com/cflint/tests/ParseError/fileoutput_359.expected.txt b/src/test/resources/com/cflint/tests/ParseError/fileoutput_359.expected.txt index e190a2757..bd42a4af1 100644 --- a/src/test/resources/com/cflint/tests/ParseError/fileoutput_359.expected.txt +++ b/src/test/resources/com/cflint/tests/ParseError/fileoutput_359.expected.txt @@ -1,8 +1,10 @@ { + "version" : "", + "timestamp" : "1501202131", "issues" : [ ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ ], "countBySeverity" : [ ] } diff --git a/src/test/resources/com/cflint/tests/ParseError/outside_output_359.expected.txt b/src/test/resources/com/cflint/tests/ParseError/outside_output_359.expected.txt index e190a2757..bd42a4af1 100644 --- a/src/test/resources/com/cflint/tests/ParseError/outside_output_359.expected.txt +++ b/src/test/resources/com/cflint/tests/ParseError/outside_output_359.expected.txt @@ -1,8 +1,10 @@ { + "version" : "", + "timestamp" : "1501202131", "issues" : [ ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ ], "countBySeverity" : [ ] } diff --git a/src/test/resources/com/cflint/tests/ParseError/singlequote_359.expected.txt b/src/test/resources/com/cflint/tests/ParseError/singlequote_359.expected.txt index e190a2757..bd42a4af1 100644 --- a/src/test/resources/com/cflint/tests/ParseError/singlequote_359.expected.txt +++ b/src/test/resources/com/cflint/tests/ParseError/singlequote_359.expected.txt @@ -1,8 +1,10 @@ { + "version" : "", + "timestamp" : "1501202131", "issues" : [ ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ ], "countBySeverity" : [ ] } diff --git a/src/test/resources/com/cflint/tests/Parsing/Underscore.expected.txt b/src/test/resources/com/cflint/tests/Parsing/Underscore.expected.txt index e190a2757..ebd9463b5 100644 --- a/src/test/resources/com/cflint/tests/Parsing/Underscore.expected.txt +++ b/src/test/resources/com/cflint/tests/Parsing/Underscore.expected.txt @@ -1,8 +1,10 @@ { + "version" : "", + "timestamp" : "1501202132", "issues" : [ ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ ], "countBySeverity" : [ ] } diff --git a/src/test/resources/com/cflint/tests/Parsing/parsing251.expected.txt b/src/test/resources/com/cflint/tests/Parsing/parsing251.expected.txt index e190a2757..ebd9463b5 100644 --- a/src/test/resources/com/cflint/tests/Parsing/parsing251.expected.txt +++ b/src/test/resources/com/cflint/tests/Parsing/parsing251.expected.txt @@ -1,8 +1,10 @@ { + "version" : "", + "timestamp" : "1501202132", "issues" : [ ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ ], "countBySeverity" : [ ] } diff --git a/src/test/resources/com/cflint/tests/Parsing/parsing253.expected.txt b/src/test/resources/com/cflint/tests/Parsing/parsing253.expected.txt index 1eb379962..4e175446c 100644 --- a/src/test/resources/com/cflint/tests/Parsing/parsing253.expected.txt +++ b/src/test/resources/com/cflint/tests/Parsing/parsing253.expected.txt @@ -1,4 +1,6 @@ { + "version" : "", + "timestamp" : "1501202132", "issues" : [ { "severity" : "ERROR", "id" : "MISSING_VAR", @@ -16,9 +18,9 @@ "expression" : "removeTagList" } ] } ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ { "code" : "MISSING_VAR", "count" : 1 diff --git a/src/test/resources/com/cflint/tests/Query/cfquery_param.expected.txt b/src/test/resources/com/cflint/tests/Query/cfquery_param.expected.txt index e190a2757..ebd9463b5 100644 --- a/src/test/resources/com/cflint/tests/Query/cfquery_param.expected.txt +++ b/src/test/resources/com/cflint/tests/Query/cfquery_param.expected.txt @@ -1,8 +1,10 @@ { + "version" : "", + "timestamp" : "1501202132", "issues" : [ ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ ], "countBySeverity" : [ ] } diff --git a/src/test/resources/com/cflint/tests/Query/cfquery_param2.expected.txt b/src/test/resources/com/cflint/tests/Query/cfquery_param2.expected.txt index e190a2757..ebd9463b5 100644 --- a/src/test/resources/com/cflint/tests/Query/cfquery_param2.expected.txt +++ b/src/test/resources/com/cflint/tests/Query/cfquery_param2.expected.txt @@ -1,8 +1,10 @@ { + "version" : "", + "timestamp" : "1501202132", "issues" : [ ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ ], "countBySeverity" : [ ] } diff --git a/src/test/resources/com/cflint/tests/Query/cfquery_param3.expected.txt b/src/test/resources/com/cflint/tests/Query/cfquery_param3.expected.txt index aecd6aef8..a5256d1d5 100644 --- a/src/test/resources/com/cflint/tests/Query/cfquery_param3.expected.txt +++ b/src/test/resources/com/cflint/tests/Query/cfquery_param3.expected.txt @@ -1,4 +1,6 @@ { + "version" : "", + "timestamp" : "1501202132", "issues" : [ { "severity" : "WARNING", "id" : "CFQUERYPARAM_REQ", @@ -16,9 +18,9 @@ "expression" : "\r\n\t\t SELECT top #arguments.count#\r\n\t\t \tfooCol1, siteID, fooCol3\r\n\t\t FROM\r\n\t\t FooTable\r\n\t\t" } ] } ], - "summary" : { - "totalfiles" : 0, - "totalsize" : 0, + "counts" : { + "totalFiles" : 0, + "totalLines" : 0, "countByCode" : [ { "code" : "CFQUERYPARAM_REQ", "count" : 1 diff --git a/src/test/resources/com/cflint/tests/Query/cfquery_param_byline.expected.txt b/src/test/resources/com/cflint/tests/Query/cfquery_param_byline.expected.txt index 2396dd02e..63ce722ee 100644 --- a/src/test/resources/com/cflint/tests/Query/cfquery_param_byline.expected.txt +++ b/src/test/resources/com/cflint/tests/Query/cfquery_param_byline.expected.txt @@ -1,4 +1,6 @@ { + "version" : "", + "timestamp" : "1501202132", "issues" : [ { "severity" : "WARNING", "id" : "CFQUERYPARAM_REQ", @@ -16,9 +18,9 @@ "expression" : "\r\n SELECT\r\n M.firstName\r\n