Guard against NPE in computing coverage lines (#310)

uber-archive · Dec 4, 2018 · c11c1d9 · c11c1d9
1 parent 9f12549
commit c11c1d9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/main/java/com/uber/jenkins/phabricator/coverage/CoberturaPluginCoverageProvider.java b/src/main/java/com/uber/jenkins/phabricator/coverage/CoberturaPluginCoverageProvider.java
@@ -22,7 +22,6 @@
 
 import java.io.File;
 import java.util.Set;
-import java.util.logging.Logger;
 
 import com.google.common.annotations.VisibleForTesting;
 import hudson.plugins.cobertura.CoberturaBuildAction;
@@ -35,8 +34,6 @@
  */
 public class CoberturaPluginCoverageProvider extends XmlCoverageProvider {
 
-    private static final Logger LOGGER = Logger.getLogger(CoberturaPluginCoverageProvider.class.getName());
-
     private final CoberturaBuildAction buildAction;
 
     public CoberturaPluginCoverageProvider(Set<File> coverageReports, Set<String> includeFiles, CoberturaBuildAction buildAction) {
@@ -68,8 +65,8 @@ static CodeCoverageMetrics convertCobertura(CoverageResult result) {
         float methodCoverage = getCoveragePercentage(result, CoverageMetric.METHOD);
         float lineCoverage = getCoveragePercentage(result, CoverageMetric.LINE);
         float conditionalCoverage = getCoveragePercentage(result, CoverageMetric.CONDITIONAL);
-        long linesCovered = (long) result.getCoverage(CoverageMetric.LINE).numerator;
-        long linesTested = (long) result.getCoverage(CoverageMetric.LINE).denominator;
+        long linesCovered = (long) getCoverageRatio(result, CoverageMetric.LINE).numerator;
+        long linesTested = (long) getCoverageRatio(result, CoverageMetric.LINE).denominator;
 
         return new CodeCoverageMetrics(
                 packagesCoverage,
@@ -83,6 +80,14 @@ static CodeCoverageMetrics convertCobertura(CoverageResult result) {
         );
     }
 
+    private static Ratio getCoverageRatio(CoverageResult result, CoverageMetric metric) {
+        Ratio ratio = result.getCoverage(metric);
+        if (ratio == null) {
+            return Ratio.create(0,0);
+        }
+        return ratio;
+    }
+
     private static float getCoveragePercentage(CoverageResult result, CoverageMetric metric) {
         Ratio ratio = result.getCoverage(metric);
         if (ratio == null) {

diff --git a/src/main/java/com/uber/jenkins/phabricator/coverage/JacocoPluginCoverageProvider.java b/src/main/java/com/uber/jenkins/phabricator/coverage/JacocoPluginCoverageProvider.java
@@ -26,15 +26,12 @@
 
 import java.io.File;
 import java.util.Set;
-import java.util.logging.Logger;
 
 /**
  * Provide Jacoco coverage data via the Jenkins Jacoco Plugin
  */
 public class JacocoPluginCoverageProvider extends XmlCoverageProvider {
 
-    private static final Logger LOGGER = Logger.getLogger(JacocoPluginCoverageProvider.class.getName());
-
     private final JacocoBuildAction buildAction;
 
     public JacocoPluginCoverageProvider(Set<File> coverageReports, Set<String> includeFiles, JacocoBuildAction buildAction) {