Review 1

Author: Tim-Pohlmann

sonar-dotnet-shared-library/src/main/java/org/sonar/plugins/dotnet/tests/CoverageParser.java

@@ -24,4 +24,5 @@
 
 @FunctionalInterface
 public interface CoverageParser extends BiConsumer<File, Coverage> {
+  public static final String VERIFY_SONARPROJECTPROPERTIES_MESSAGE = "Verify sonar.sources in .sonarqube\\out\\sonar-project.properties.";
 }

sonar-dotnet-shared-library/src/main/java/org/sonar/plugins/dotnet/tests/DotCoverReportParser.java

@@ -71,7 +71,7 @@ public void parse() {
         collectCoverage(fileCanonicalPath, contents);
       } else {
         LOG.debug("Skipping the import of dotCover code coverage for file '{}' because it is not indexed or"
-            + " does not have the supported language. Verify sonar.sources in .sonarqube\\out\\sonar-project.properties.",
+            + " does not have the supported language. " + VERIFY_SONARPROJECTPROPERTIES_MESSAGE,
           fileCanonicalPath);
       }
     }

sonar-dotnet-shared-library/src/main/java/org/sonar/plugins/dotnet/tests/NCover3ReportParser.java

@@ -129,8 +129,7 @@ private void handleSegmentPointTag(XmlParserHelper xmlParserHelper) {
           coverage.addHits(path, line, vc);
         } else {
           LOG.debug("NCover3 doc '{}', line '{}', vc '{}' will be skipped because it has a path '{}'"
-              + " which is not indexed or does not have the supported language. "
-              + "Verify sonar.sources in .sonarqube\\out\\sonar-project.properties.",
+              + " which is not indexed or does not have the supported language. " + VERIFY_SONARPROJECTPROPERTIES_MESSAGE,
             doc, line, vc, path);
         }
       } else if (!isExcludedLine(line)) {

sonar-dotnet-shared-library/src/main/java/org/sonar/plugins/dotnet/tests/OpenCoverReportParser.java

@@ -128,8 +128,8 @@ private void handleSequencePointTag(XmlParserHelper xmlParserHelper) {
           LOG.trace("OpenCover parser: add hits for file {}, line '{}', visitCount '{}'.",
             coveredFile, line, visitCount);
         } else {
-          LOG.debug("Skipping the file {}, line '{}', visitCount '{}' because file is not indexed or does not have the supported language."
-              + " Verify sonar.sources in .sonarqube\\out\\sonar-project.properties.",
+          LOG.debug("Skipping the file {}, line '{}', visitCount '{}' because file is not indexed or does not have the supported language. "
+              + VERIFY_SONARPROJECTPROPERTIES_MESSAGE,
             coveredFile, line, visitCount);
         }
       } else {
@@ -165,7 +165,7 @@ private void handleBranchPointTag(XmlParserHelper xmlParserHelper) {
             coveredFile, line, offset, visitCount);
         } else {
           LOG.debug("OpenCover parser: Skipping branch hits for file {}, line '{}', offset '{}', visitCount '{}' because file" +
-              " is not indexed or does not have the supported language.",
+              " is not indexed or does not have the supported language. " + VERIFY_SONARPROJECTPROPERTIES_MESSAGE,
             coveredFile, line, offset, visitCount);
         }
       } else {

sonar-dotnet-shared-library/src/main/java/org/sonar/plugins/dotnet/tests/ScannerFileService.java

@@ -66,16 +66,20 @@ public Optional<String> getAbsolutePath(String deterministicBuildPath) {
         String foundFile = foundFiles.get(0);
         LOG.trace("Found indexed file '{}' for '{}' (normalized to '{}').", foundFile, deterministicBuildPath, pathSuffix);
         return Optional.of(foundFile);
+      } else if (foundFiles.size() == 0) {
+        LOG.debug("The file '{}' is not indexed or does not have the supported language. Will skip this coverage entry. "
+            + CoverageParser.VERIFY_SONARPROJECTPROPERTIES_MESSAGE,
+          deterministicBuildPath);
+        return Optional.empty();
       } else {
-        LOG.debug("Found {} indexed files for '{}' (normalized to '{}'). Will skip this coverage entry."
-            + " Verify sonar.sources in .sonarqube\\out\\sonar-project.properties.",
+        LOG.debug("Found {} indexed files for '{}' (normalized to '{}'). Will skip this coverage entry. "
+            + CoverageParser.VERIFY_SONARPROJECTPROPERTIES_MESSAGE,
           foundFiles.size(), deterministicBuildPath, pathSuffix);
         return Optional.empty();
       }
+    } else {
+      LOG.debug("The file '{}' does not have deterministic build path. Will skip this coverage entry.", deterministicBuildPath);
+      return Optional.empty();
     }
-    LOG.debug("The file '{}' is not indexed or does not have the supported language. Will skip this coverage entry. "
-        + "Verify sonar.sources in .sonarqube\\out\\sonar-project.properties.",
-      deterministicBuildPath);
-    return Optional.empty();
   }
 }

sonar-dotnet-shared-library/src/test/java/org/sonar/plugins/dotnet/tests/OpenCoverReportParserTest.java

@@ -326,10 +326,10 @@ public void branchCoverage_codeFile_unsupportedFile() throws Exception {
         // these are not ordered
         "Skipping the file (ID '1', path 'BranchCoverage3296\\Code\\ValueProvider.cs', NO INDEXED PATH), line '5', visitCount '1' because file is not indexed or does not have the supported language. Verify sonar.sources in .sonarqube\\out\\sonar-project.properties.",
         "Skipping the file (ID '2', path 'BranchCoverage3296\\Code\\ValueProvider.cs', NO INDEXED PATH), line '5', visitCount '1' because file is not indexed or does not have the supported language. Verify sonar.sources in .sonarqube\\out\\sonar-project.properties.",
-        "OpenCover parser: Skipping branch hits for file (ID '2', path 'BranchCoverage3296\\Code\\ValueProvider.cs', NO INDEXED PATH), line '5', offset '1', visitCount '1' because file is not indexed or does not have the supported language.",
-        "OpenCover parser: Skipping branch hits for file (ID '2', path 'BranchCoverage3296\\Code\\ValueProvider.cs', NO INDEXED PATH), line '5', offset '1', visitCount '0' because file is not indexed or does not have the supported language.",
-        "OpenCover parser: Skipping branch hits for file (ID '1', path 'BranchCoverage3296\\Code\\ValueProvider.cs', NO INDEXED PATH), line '5', offset '1', visitCount '0' because file is not indexed or does not have the supported language.",
-        "OpenCover parser: Skipping branch hits for file (ID '1', path 'BranchCoverage3296\\Code\\ValueProvider.cs', NO INDEXED PATH), line '5', offset '1', visitCount '1' because file is not indexed or does not have the supported language.");
+        "OpenCover parser: Skipping branch hits for file (ID '2', path 'BranchCoverage3296\\Code\\ValueProvider.cs', NO INDEXED PATH), line '5', offset '1', visitCount '1' because file is not indexed or does not have the supported language. Verify sonar.sources in .sonarqube\\out\\sonar-project.properties.",
+        "OpenCover parser: Skipping branch hits for file (ID '2', path 'BranchCoverage3296\\Code\\ValueProvider.cs', NO INDEXED PATH), line '5', offset '1', visitCount '0' because file is not indexed or does not have the supported language. Verify sonar.sources in .sonarqube\\out\\sonar-project.properties.",
+        "OpenCover parser: Skipping branch hits for file (ID '1', path 'BranchCoverage3296\\Code\\ValueProvider.cs', NO INDEXED PATH), line '5', offset '1', visitCount '0' because file is not indexed or does not have the supported language. Verify sonar.sources in .sonarqube\\out\\sonar-project.properties.",
+        "OpenCover parser: Skipping branch hits for file (ID '1', path 'BranchCoverage3296\\Code\\ValueProvider.cs', NO INDEXED PATH), line '5', offset '1', visitCount '1' because file is not indexed or does not have the supported language. Verify sonar.sources in .sonarqube\\out\\sonar-project.properties.");
   }
 
   @Test

sonar-dotnet-shared-library/src/test/java/org/sonar/plugins/dotnet/tests/ScannerFileServiceTest.java

@@ -159,7 +159,8 @@ public void getAbsolutePath_when_filesystem_returns_empty_returns_empty() {
 
     // assert
     assertThat(result).isEmpty();
-    assertThat(logTester.logs(Level.DEBUG)).containsExactly("Found 0 indexed files for '/_/some/path/file.cs' (normalized to 'some/path/file.cs'). Will skip this coverage entry. Verify sonar.sources in .sonarqube\\out\\sonar-project.properties.");
+    assertThat(logTester.logs(Level.DEBUG)).containsExactly("The file '/_/some/path/file.cs' is not indexed or does not have the "
+      + "supported language. Will skip this coverage entry. Verify sonar.sources in .sonarqube\\out\\sonar-project.properties.");
   }
 
   @Test
@@ -199,9 +200,7 @@ public void getAbsolutePath_with_no_deterministic_path_in_windows_path_returns_e
     verify(fs, never()).predicates();
     assertThat(logTester.logs(Level.TRACE)).isEmpty();
     assertThat(logTester.logs(Level.DEBUG)).hasSize(1);
-    assertThat(logTester.logs(Level.DEBUG).get(0)).isEqualTo(
-      "The file 'C:\\_\\some\\path\\file.cs' is not indexed or does not have the supported language."
-        + " Will skip this coverage entry. Verify sonar.sources in .sonarqube\\out\\sonar-project.properties.");
+    assertThat(logTester.logs(Level.DEBUG).get(0)).isEqualTo("The file 'C:\\_\\some\\path\\file.cs' does not have deterministic build path. Will skip this coverage entry.");
   }
 
   @Test