Use filenames to compute set of files to publish line coverage for

uber-archive · May 2, 2016 · 448ffa1 · 448ffa1
1 parent b704b20
commit 448ffa1
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/src/main/java/com/uber/jenkins/phabricator/BuildResultProcessor.java b/src/main/java/com/uber/jenkins/phabricator/BuildResultProcessor.java
@@ -35,11 +35,14 @@
 import com.uber.jenkins.phabricator.utils.CommonUtils;
 import com.uber.jenkins.phabricator.utils.Logger;
 
+import org.apache.commons.io.FilenameUtils;
+
 import hudson.FilePath;
 import hudson.model.AbstractBuild;
 import hudson.model.Result;
 
 import java.io.IOException;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -240,7 +243,19 @@ public void processCoverage(CoverageProvider coverageProvider, Set<String> inclu
             return;
         }
 
-        lineCoverage.keySet().retainAll(include);
+        Set<String> includeFileNames = new HashSet<String>();
+        for (String file : include) {
+            includeFileNames.add(FilenameUtils.getBaseName(file));
+        }
+
+        Set<String> includedLineCoverage = new HashSet<String>();
+        for (String file : lineCoverage.keySet()) {
+            if (includeFileNames.contains(FilenameUtils.getBaseName(file))) {
+                includedLineCoverage.add(file);
+            }
+        }
+
+        lineCoverage.keySet().retainAll(includedLineCoverage);
 
         harbormasterCoverage = new CoverageConverter().convert(lineCoverage);
     }

diff --git a/src/test/java/com/uber/jenkins/phabricator/BuildResultProcessorTest.java b/src/test/java/com/uber/jenkins/phabricator/BuildResultProcessorTest.java
@@ -72,6 +72,14 @@ public void testProcessCoverageWithNoIncludes() throws Exception {
         assertNull(processor.getCoverage().get("file.go"));
     }
 
+    @Test
+    public void testProcessCoverageWithNonMatchingPathIncludes() throws Exception {
+        CoverageProvider provider = new FakeCoverageProvider(TestUtils.getDefaultLineCoverage());
+        processor.processCoverage(provider, Sets.newHashSet("somePath/file.go"));
+        assertNotNull(processor.getCoverage());
+        assertEquals("NCUC", processor.getCoverage().get("file.go"));
+    }
+
     @Test
     public void testProcessEmptyCoverage() {
         CoverageProvider provider = new FakeCoverageProvider(null);