commit aa11586edc29863d3dae056da6bdb434ef16117b
author David Haxton <davidhaxton@asana.com> Wed Feb 26 07:04:12 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Wed Feb 26 07:05:27 2020 -0800
tree 96e19acabef97e765e2b03a82421a4b09ba6e45a
parent cc75565f3d19f3b0a94c73d90fce6036ac61ff44

Coverage: Do not prepend a second forward slash in LCOVFormatter

This fixes: https://github.com/bazelbuild/bazel/issues/10863

Closes #10864.

PiperOrigin-RevId: 297352463

src/java_tools/junitrunner/java/com/google/testing/coverage/JacocoLCOVFormatter.java

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
index 2f5acf5..6d1ba4a 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/coverage/JacocoLCOVFormatter.java
+++ b/src/java_tools/junitrunner/java/com/google/testing/coverage/JacocoLCOVFormatter.java
@@ -70,8 +70,10 @@
         if (execPathsOfUninstrumentedFiles.isEmpty()) {
           return fileName;
         }
+
+        String matchingFileName = fileName.startsWith("/") ? fileName : "/" + fileName;
         for (String execPath : execPathsOfUninstrumentedFiles) {
-          if (execPath.endsWith("/" + fileName)) {
+          if (execPath.endsWith(matchingFileName)) {
             return execPath;
           }
         }
@@ -103,8 +105,9 @@
         // information and process everything at the end.
         for (IPackageCoverage pkgCoverage : bundle.getPackages()) {
           for (IClassCoverage clsCoverage : pkgCoverage.getClasses()) {
-            String fileName = getExecPathForEntryName(
-                clsCoverage.getPackageName() + "/" + clsCoverage.getSourceFileName());
+            String fileName =
+                getExecPathForEntryName(
+                    clsCoverage.getPackageName() + "/" + clsCoverage.getSourceFileName());
             if (fileName == null) {
               continue;
             }
@@ -114,8 +117,8 @@
             sourceToClassCoverage.get(fileName).put(clsCoverage.getName(), clsCoverage);
           }
           for (ISourceFileCoverage srcCoverage : pkgCoverage.getSourceFiles()) {
-            String sourceName = getExecPathForEntryName(
-                srcCoverage.getPackageName() + "/" + srcCoverage.getName());
+            String sourceName =
+                getExecPathForEntryName(srcCoverage.getPackageName() + "/" + srcCoverage.getName());
             if (sourceName != null) {
               sourceToFileCoverage.put(sourceName, srcCoverage);
             }