Merge pull request #1289 from guwirth/zeroMeasuresWithoutReports

guwirth · web-flow · commit ef64f3d26c66 · 2017-11-10T07:17:05.000+01:00
fix zeroMeasuresWithoutReports SQ &lt; 6.2
diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/coverage/CxxCoverageSensor.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/coverage/CxxCoverageSensor.java
@@ -185,29 +185,37 @@ private void zeroMeasuresWithoutReports(
     Iterable<InputFile> inputFiles = fileSystem.inputFiles(p.and(p.hasType(InputFile.Type.MAIN),
       p.hasLanguage(this.language.getKey())));
 
+    int filesCnt = 0, unitCnt = 0, itCnt = 0, overallCnt = 0;
     for (InputFile inputFile : inputFiles) {
       Set<Integer> linesOfCodeForFile = linesOfCode.get(inputFile);
       String file = CxxUtils.normalizePath(inputFile.absolutePath());
 
       if (coverageMeasures != null && !coverageMeasures.containsKey(file)) {
         saveZeroValueForResource(inputFile, context, CoverageType.UNIT, linesOfCodeForFile);
+        unitCnt++;
       }
 
       if (itCoverageMeasures != null && !itCoverageMeasures.containsKey(file)) {
         saveZeroValueForResource(inputFile, context, CoverageType.IT, linesOfCodeForFile);
+        itCnt++;
       }
 
       if (overallCoverageMeasures != null && !overallCoverageMeasures.containsKey(file)) {
         saveZeroValueForResource(inputFile, context, CoverageType.OVERALL, linesOfCodeForFile);
+        overallCnt++;
       }
+      filesCnt++;
+    }
+    if (LOG.isDebugEnabled()) {
+      LOG.debug("zeroMeasuresWithoutReports: total={} / unit={} / it={} / overall={}", filesCnt, unitCnt, itCnt, overallCnt);
     }
   }
 
   private void saveZeroValueForResource(InputFile inputFile, SensorContext context, CoverageType ctype,
     @Nullable Set<Integer> linesOfCode) {
     if (linesOfCode != null) {
       if (LOG.isDebugEnabled()) {
-        LOG.debug("Zeroing {} coverage measures for file '{}'", ctype, inputFile.relativePath());
+        LOG.debug("Zeroing {} coverage measures for file '{}': linesOfCode='{}'", ctype, inputFile.relativePath(), linesOfCode.size());
       }
       NewCoverage newCoverage = context.newCoverage()
         .onFile(inputFile)
diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/visitors/CxxFileLinesVisitor.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/visitors/CxxFileLinesVisitor.java
@@ -56,14 +56,14 @@ public class CxxFileLinesVisitor extends SquidAstVisitor<Grammar> implements Ast
   private final FileLinesContextFactory fileLinesContextFactory;
   private static final Version SQ_6_2 = Version.create(6, 2);
   private static boolean isSQ62orNewer;
-  private static Set<Integer> linesOfCode = Sets.newHashSet();
-  private static Set<Integer> linesOfComments = Sets.newHashSet();
-  private static Set<Integer> executableLines = Sets.newHashSet();
+  private static final Set<Integer> linesOfCode = Sets.newHashSet();
+  private static final Set<Integer> linesOfComments = Sets.newHashSet();
+  private static final Set<Integer> executableLines = Sets.newHashSet();
   private final FileSystem fileSystem;
   private final Map<InputFile, Set<Integer>> allLinesOfCode;
   private static int isWithinFunctionDefinition;
   private static final Set<String> ignoreToken = Sets.newHashSet(";", "{", "}", "(", ")", "[", "]");
-  private static AstNodeType[] nodesToVisit = {
+  private static final AstNodeType[] nodesToVisit = {
       CxxGrammarImpl.labeledStatement,
       CxxGrammarImpl.expressionStatement,
       CxxGrammarImpl.iterationStatement,
@@ -203,12 +203,14 @@ public void leaveFile(AstNode astNode) {
     }
 
     fileLinesContext.save();
-    this.allLinesOfCode.put(inputFile, linesOfCode);
-    
+    this.allLinesOfCode.put(inputFile, Sets.newHashSet(linesOfCode));
+
     if (LOG.isDebugEnabled()) {
-      LOG.debug("executableLines: '{}'", executableLines);
-      LOG.debug("linesOfCode:     '{}'", linesOfCode);
-      LOG.debug("linesOfComments: '{}'", linesOfComments);
+      LOG.debug("CxxFileLinesVisitor: '{}'", inputFile.absolutePath());
+      LOG.debug("   lines:           '{}'", inputFile.lines());
+      LOG.debug("   executableLines: '{}'", executableLines);
+      LOG.debug("   linesOfCode:     '{}'", linesOfCode);
+      LOG.debug("   linesOfComments: '{}'", linesOfComments);
     }
   }
 
diff --git a/cxx-sensors/src/test/java/org/sonar/cxx/sensors/visitors/CxxFileLinesVisitorTest.java b/cxx-sensors/src/test/java/org/sonar/cxx/sensors/visitors/CxxFileLinesVisitorTest.java
@@ -70,7 +70,12 @@ public void TestLinesOfCode() throws UnsupportedEncodingException, IOException {
 
     assertThat(visitor.getLinesOfComments()).hasSize(11);
     assertThat(visitor.getLinesOfComments()).containsOnly(48, 1, 33, 97, 35, 117, 102, 7, 119, 106, 13);
-
+    
+    Set<Integer> lines = linesOfCode.get(inputFile);
+    assertThat(lines).isNotNull();
+    assertThat(lines).containsOnly(8, 10, 14, 16, 17, 21, 22, 23, 26, 31, 34, 35, 42, 44, 45, 51, 53, 55, 56, 58,
+                                   59, 63, 65, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 79, 82, 84, 86, 87, 89, 90,
+                                   95, 98, 99, 100, 102, 115, 118, 119);    
   }
 
   @Test
diff --git a/cxx-squid/src/main/java/org/sonar/cxx/CxxLanguage.java b/cxx-squid/src/main/java/org/sonar/cxx/CxxLanguage.java
@@ -26,7 +26,6 @@
 import org.sonar.api.measures.Metric;
 import org.sonar.api.resources.AbstractLanguage;
 import org.sonar.api.config.Settings;
-import org.sonar.api.internal.apachecommons.lang.builder.HashCodeBuilder;
 
 /**
  * {@inheritDoc}
@@ -48,14 +47,6 @@ public CxxLanguage(String key, String name, Settings settings) {
     this.MetricsCache = new HashMap<>();
   }
 
-  @Override
-  public int hashCode() {
-    return new HashCodeBuilder(17, 31). // two randomly chosen prime numbers
-          appendSuper(super.hashCode()).
-          append(getKey()).
-          toHashCode();
-  }
-
   @Override
   public boolean equals(Object obj) {
     if (obj == this) {
diff --git a/integration-tests/features/importing_coverage.feature b/integration-tests/features/importing_coverage.feature
@@ -73,14 +73,14 @@ Feature: Importing coverage data
       """
     And the following metrics have following values:
       | metric                  | value |
-      | coverage                | 11.1  |
-      | line_coverage           | 7.3   |
+      | coverage                | 9.8   |
+      | line_coverage           | 6.4   |
       | branch_coverage         | 50    |
-      | it_coverage             | 25.0  |
-      | it_line_coverage        | 19.0  |
+      | it_coverage             | 22.4  |
+      | it_line_coverage        | 16.7  |
       | it_branch_coverage      | 50    |
-      | overall_coverage        | 26.1  |
-      | overall_line_coverage   | 20.0  |
+      | overall_coverage        | 30.0  |
+      | overall_line_coverage   | 23.9  |
       | overall_branch_coverage | 50    |
 
   @SqApi56
diff --git a/sonar-c-plugin/src/main/java/org/sonar/plugins/c/CLanguage.java b/sonar-c-plugin/src/main/java/org/sonar/plugins/c/CLanguage.java
@@ -23,7 +23,6 @@
 import java.util.Arrays;
 import java.util.List;
 import org.sonar.api.config.Settings;
-import org.sonar.api.internal.apachecommons.lang.builder.HashCodeBuilder;
 import org.sonar.cxx.CxxLanguage;
 import org.sonar.cxx.checks.BooleanEqualityComparisonCheck;
 import org.sonar.cxx.checks.ClassComplexityCheck;
@@ -96,14 +95,6 @@ public CLanguage(Settings settings) {
     headerSuffixes = createStringArray(settings.getStringArray(CPlugin.HEADER_FILE_SUFFIXES_KEY), DEFAULT_HEADER_SUFFIXES);
     fileSuffixes = mergeArrays(sourceSuffixes, headerSuffixes);    
   }
-  
-  @Override
-  public int hashCode() {
-    return new HashCodeBuilder(17, 31). // two randomly chosen prime numbers
-      appendSuper(super.hashCode()).
-      append(getKey()).
-      toHashCode();
-  }
 
   @Override
   public boolean equals(Object obj) {
diff --git a/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/CppLanguage.java b/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/CppLanguage.java
@@ -23,7 +23,6 @@
 import java.util.Arrays;
 import java.util.List;
 import org.sonar.api.config.Settings;
-import org.sonar.api.internal.apachecommons.lang.builder.HashCodeBuilder;
 import org.sonar.cxx.CxxLanguage;
 import org.sonar.cxx.checks.BooleanEqualityComparisonCheck;
 import org.sonar.cxx.checks.ClassComplexityCheck;
@@ -100,15 +99,6 @@ public CppLanguage(Settings settings) {
                                                                          DEFAULT_HEADER_SUFFIXES);
     fileSuffixes = mergeArrays(sourceSuffixes, headerSuffixes);    
   }
-  
-  @Override
-  public int hashCode() {
-    // two randomly chosen prime numbers
-    return new HashCodeBuilder(17, 31). 
-      appendSuper(super.hashCode()).
-      append(getKey()).
-      toHashCode();
-  }
 
   @Override
   public boolean equals(Object obj) {

Original file line number	Diff line number	Diff line change
`@@ -185,29 +185,37 @@ private void zeroMeasuresWithoutReports(`
`185`	`185`	`Iterable<InputFile> inputFiles = fileSystem.inputFiles(p.and(p.hasType(InputFile.Type.MAIN),`
`186`	`186`	`p.hasLanguage(this.language.getKey())));`
`187`	`187`
	`188`	`+ int filesCnt = 0, unitCnt = 0, itCnt = 0, overallCnt = 0;`
`188`	`189`	`for (InputFile inputFile : inputFiles) {`
`189`	`190`	`Set<Integer> linesOfCodeForFile = linesOfCode.get(inputFile);`
`190`	`191`	`String file = CxxUtils.normalizePath(inputFile.absolutePath());`
`191`	`192`
`192`	`193`	`if (coverageMeasures != null && !coverageMeasures.containsKey(file)) {`
`193`	`194`	`saveZeroValueForResource(inputFile, context, CoverageType.UNIT, linesOfCodeForFile);`
	`195`	`+ unitCnt++;`
`194`	`196`	`}`
`195`	`197`
`196`	`198`	`if (itCoverageMeasures != null && !itCoverageMeasures.containsKey(file)) {`
`197`	`199`	`saveZeroValueForResource(inputFile, context, CoverageType.IT, linesOfCodeForFile);`
	`200`	`+ itCnt++;`
`198`	`201`	`}`
`199`	`202`
`200`	`203`	`if (overallCoverageMeasures != null && !overallCoverageMeasures.containsKey(file)) {`
`201`	`204`	`saveZeroValueForResource(inputFile, context, CoverageType.OVERALL, linesOfCodeForFile);`
	`205`	`+ overallCnt++;`
`202`	`206`	`}`
	`207`	`+ filesCnt++;`
	`208`	`+ }`
	`209`	`+ if (LOG.isDebugEnabled()) {`
	`210`	`+ LOG.debug("zeroMeasuresWithoutReports: total={} / unit={} / it={} / overall={}", filesCnt, unitCnt, itCnt, overallCnt);`
`203`	`211`	`}`
`204`	`212`	`}`
`205`	`213`
`206`	`214`	`private void saveZeroValueForResource(InputFile inputFile, SensorContext context, CoverageType ctype,`
`207`	`215`	`@Nullable Set<Integer> linesOfCode) {`
`208`	`216`	`if (linesOfCode != null) {`
`209`	`217`	`if (LOG.isDebugEnabled()) {`
`210`		`- LOG.debug("Zeroing {} coverage measures for file '{}'", ctype, inputFile.relativePath());`
	`218`	`+ LOG.debug("Zeroing {} coverage measures for file '{}': linesOfCode='{}'", ctype, inputFile.relativePath(), linesOfCode.size());`
`211`	`219`	`}`
`212`	`220`	`NewCoverage newCoverage = context.newCoverage()`
`213`	`221`	`.onFile(inputFile)`