Handle exact execPath matches in JacocoLCOVFormatter

PiperOrigin-RevId: 523963590 Change-Id: I1495b2dfa5423a17414f0d951385b418fb319f65
bazelbuild · Apr 13, 2023 · 928b102 · 928b102
1 parent 11dc7de
commit 928b102
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/java_tools/junitrunner/java/com/google/testing/coverage/JacocoLCOVFormatter.java b/src/java_tools/junitrunner/java/com/google/testing/coverage/JacocoLCOVFormatter.java
@@ -84,7 +84,7 @@ private String getExecPathForEntryName(String classPath) {
             if (parts[1].equals(matchingFileName)) {
               return parts[0];
             }
-          } else if (execPath.endsWith(matchingFileName)) {
+          } else if (execPath.endsWith(matchingFileName) || execPath.equals(classPath)) {
             return execPath;
           }
         }

diff --git a/...itrunner/javatests/com/google/testing/coverage/JacocoLCOVFormatterUninstrumentedTest.java b/...itrunner/javatests/com/google/testing/coverage/JacocoLCOVFormatterUninstrumentedTest.java
@@ -191,4 +191,21 @@ public void testVisitBundleWithoutExecPathsDoesNotPruneOutput() throws IOExcepti
     String coverageOutput = writer.toString();
     assertThat(coverageOutput).isNotEmpty();
   }
+
+  @Test
+  public void testVisitBundleWithExactMatch() throws IOException {
+    // It's possible, albeit unlikely, that the execPath and the package based path match exactly
+    String srcPath = "com/example/Foo.java";
+    ImmutableSet<String> execPaths = ImmutableSet.of(srcPath);
+    JacocoLCOVFormatter formatter = new JacocoLCOVFormatter(execPaths);
+    IReportVisitor visitor =
+        formatter.createVisitor(
+            new PrintWriter(writer), new TreeMap<String, BranchCoverageDetail>());
+
+    visitor.visitBundle(mockBundle, mock(ISourceFileLocator.class));
+    visitor.visitEnd();
+
+    String coverageOutput = writer.toString();
+    assertThat(coverageOutput).contains(srcPath);
+  }
 }