Change linesCovered and linesTested to be long

uber-archive · Oct 2, 2018 · 25ecb0d · 25ecb0d
1 parent 9de1d3f
commit 25ecb0d
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 25 deletions.
diff --git a/src/main/java/com/uber/jenkins/phabricator/coverage/CoberturaCoverageProvider.java b/src/main/java/com/uber/jenkins/phabricator/coverage/CoberturaCoverageProvider.java
@@ -78,8 +78,8 @@ static CodeCoverageMetrics convertCobertura(CoverageResult result) {
         float methodCoverage = getCoveragePercentage(result, CoverageMetric.METHOD);
         float lineCoverage = getCoveragePercentage(result, CoverageMetric.LINE);
         float conditionalCoverage = getCoveragePercentage(result, CoverageMetric.CONDITIONAL);
-        float linesCovered = result.getCoverage(CoverageMetric.LINE).numerator;
-        float linesTested = result.getCoverage(CoverageMetric.LINE).denominator;
+        long linesCovered = (long) result.getCoverage(CoverageMetric.LINE).numerator;
+        long linesTested = (long) result.getCoverage(CoverageMetric.LINE).denominator;
 
         return new CodeCoverageMetrics(
                 packagesCoverage,

diff --git a/src/main/java/com/uber/jenkins/phabricator/coverage/CodeCoverageMetrics.java b/src/main/java/com/uber/jenkins/phabricator/coverage/CodeCoverageMetrics.java
@@ -28,13 +28,13 @@ public class CodeCoverageMetrics {
     private final float methodCoveragePercent;
     private final float lineCoveragePercent;
     private final float conditionalCoveragePercent;
-    private final float linesCovered;
-    private final float linesTested;
+    private final long linesCovered;
+    private final long linesTested;
 
     public CodeCoverageMetrics(
             float packagesCoveragePercent, float filesCoveragePercent,
             float classesCoveragePercent, float methodCoveragePercent, float lineCoveragePercent,
-            float conditionalCoveragePercent, float linesCovered, float linesTested) {
+            float conditionalCoveragePercent, long linesCovered, long linesTested) {
         this.packagesCoveragePercent = packagesCoveragePercent;
         this.filesCoveragePercent = filesCoveragePercent;
         this.classesCoveragePercent = classesCoveragePercent;

diff --git a/src/main/java/com/uber/jenkins/phabricator/coverage/JacocoCoverageProvider.java b/src/main/java/com/uber/jenkins/phabricator/coverage/JacocoCoverageProvider.java
@@ -83,8 +83,8 @@ static CodeCoverageMetrics convertJacoco(CoverageReport coverageResult) {
         float classCoverage = coverageResult.getClassCoverage().getPercentageFloat();
         float lineCoverage = coverageResult.getLineCoverage().getPercentageFloat();
         float branchCoverage = coverageResult.getBranchCoverage().getPercentageFloat();
-        float linesCovered = coverageResult.getLineCoverage().getCovered();
-        float linesTested = coverageResult.getLineCoverage().getTotal();
+        long linesCovered = coverageResult.getLineCoverage().getCovered();
+        long linesTested = coverageResult.getLineCoverage().getTotal();
 
         return new CodeCoverageMetrics(
                 PERCENTAGE_UNAVAILABLE,

diff --git a/src/main/java/com/uber/jenkins/phabricator/uberalls/UberallsClient.java b/src/main/java/com/uber/jenkins/phabricator/uberalls/UberallsClient.java
@@ -92,8 +92,8 @@ public CodeCoverageMetrics getParentCoverage(String sha) {
                     ((Double) coverage.getDouble(METHOD_COVERAGE_KEY)).floatValue(),
                     ((Double) coverage.getDouble(LINE_COVERAGE_KEY)).floatValue(),
                     ((Double) coverage.getDouble(CONDITIONAL_COVERAGE_KEY)).floatValue(),
-                    ((Double) coverage.getDouble(LINES_COVERED_KEY)).floatValue(),
-                    ((Double) coverage.getDouble(LINES_TESTED_KEY)).floatValue());
+                    (coverage.getLong(LINES_COVERED_KEY)),
+                    (coverage.getLong(LINES_TESTED_KEY)));
         } catch (Exception e) {
             e.printStackTrace(logger.getStream());
         }

diff --git a/src/test/java/com/uber/jenkins/phabricator/CommentBuilderTest.java b/src/test/java/com/uber/jenkins/phabricator/CommentBuilderTest.java
@@ -89,8 +89,8 @@ public void testProcessParentWithIncreasedCoverage() {
                 100.0f,
                 90.0f,
                 90.0f,
-                90.0f,
-                100.0f
+                90,
+                100
         );
         commenter.processParentCoverage(parent, TestUtils.TEST_SHA, FAKE_BRANCH_NAME);
         String comment = commenter.getComment();
@@ -104,7 +104,7 @@ public void testProcessParentWithIncreasedCoverage() {
 
     @Test
     public void testProcessWithDecreaseFailingTheBuild() {
-        CodeCoverageMetrics fiftyPercentDrop = TestUtils.getCoverageResult(100.0f, 100.0f, 100.0f, 100.0f, 50.0f, 50.0f, 100.0f);
+        CodeCoverageMetrics fiftyPercentDrop = TestUtils.getCoverageResult(100.0f, 100.0f, 100.0f, 100.0f, 50.0f, 50, 100);
         CommentBuilder commenter = createCommenter(Result.SUCCESS, fiftyPercentDrop, false, -10.0f);
         boolean passCoverage = commenter.processParentCoverage(TestUtils.getDefaultCodeCoverageMetrics(),
                 TestUtils.TEST_SHA, FAKE_BRANCH_NAME);
@@ -118,7 +118,7 @@ public void testProcessWithDecreaseFailingTheBuild() {
 
     @Test
     public void testProcessWithDecreaseNotFailingTheBuild() {
-        CodeCoverageMetrics fivePercentDrop = TestUtils.getCoverageResult(100.0f, 100.0f, 100.0f, 100.0f, 95.0f, 95.0f, 100.0f);
+        CodeCoverageMetrics fivePercentDrop = TestUtils.getCoverageResult(100.0f, 100.0f, 100.0f, 100.0f, 95.0f, 95, 100);
         CommentBuilder commenter = createCommenter(Result.SUCCESS, fivePercentDrop, false, -10.0f);
         boolean passCoverage = commenter.processParentCoverage(TestUtils.getDefaultCodeCoverageMetrics(),
                 TestUtils.TEST_SHA, FAKE_BRANCH_NAME);
@@ -132,7 +132,7 @@ public void testProcessWithDecreaseNotFailingTheBuild() {
 
     @Test
     public void testProcessWithDecreaseButHigherThanMinNotFailingTheBuild() {
-        CodeCoverageMetrics fifteenPercentDrop = TestUtils.getCoverageResult(100.0f, 100.0f, 100.0f, 100.0f, 85.0f, 85.0f, 100.0f);
+        CodeCoverageMetrics fifteenPercentDrop = TestUtils.getCoverageResult(100.0f, 100.0f, 100.0f, 100.0f, 85.0f, 85, 100);
         CommentBuilder commenter = createCommenter(Result.SUCCESS, fifteenPercentDrop, false, -10.0f, 80.0f);
         boolean passCoverage = commenter.processParentCoverage(TestUtils.getDefaultCodeCoverageMetrics(),
                 TestUtils.TEST_SHA, FAKE_BRANCH_NAME);
@@ -149,7 +149,7 @@ public void testProcessWithoutCoverageCheckSettings() {
         CommentBuilder commenter = new CommentBuilder(
                 logger,
                 Result.SUCCESS,
-                TestUtils.getCoverageResult(100.0f, 100.0f, 100.0f, 100.0f, 50.0f, 50.0f, 100.0f), // 50% drop
+                TestUtils.getCoverageResult(100.0f, 100.0f, 100.0f, 100.0f, 50.0f, 50, 100), // 50% drop
                 FAKE_BUILD_URL,
                 false,
                 null // coverageCheckSettings

diff --git a/src/test/java/com/uber/jenkins/phabricator/PhabricatorNotifierTest.java b/src/test/java/com/uber/jenkins/phabricator/PhabricatorNotifierTest.java
@@ -144,7 +144,9 @@ public void testFailBuildOnDecreasedCoverage() throws Exception {
                 "  \"packageCoverage\": 100,\n" +
                 "  \"classesCoverage\": 100,\n" +
                 "  \"methodCoverage\": 100,\n" +
-                "  \"conditionalCoverage\": 100\n" +
+                "  \"conditionalCoverage\": 100,\n" +
+                "  \"linesCovered\": 100,\n" +
+                "  \"linesTested\": 100\n" +
                 "}");
         notifier.getDescriptor().setUberallsURL("http://uber.alls");
         notifier.setUberallsClient(uberalls);
@@ -167,7 +169,9 @@ public void testPassBuildOnDecreasedCoverageButGreaterThanMinPercent() throws Ex
                 "  \"packageCoverage\": 100,\n" +
                 "  \"classesCoverage\": 100,\n" +
                 "  \"methodCoverage\": 100,\n" +
-                "  \"conditionalCoverage\": 100\n" +
+                "  \"conditionalCoverage\": 100,\n" +
+                "  \"linesCovered\": 100,\n" +
+                "  \"linesTested\": 100\n" +
                 "}");
         notifier.getDescriptor().setUberallsURL("http://uber.alls");
         notifier.setUberallsClient(uberalls);
@@ -187,7 +191,9 @@ public void testPassBuildOnSameCoverage() throws Exception {
                 "  \"packageCoverage\": 0,\n" +
                 "  \"classesCoverage\": 0,\n" +
                 "  \"methodCoverage\": 0,\n" +
-                "  \"conditionalCoverage\": 0\n" +
+                "  \"conditionalCoverage\": 100,\n" +
+                "  \"linesCovered\": 100,\n" +
+                "  \"linesTested\": 100\n" +
                 "}");
         notifier.setUberallsClient(uberalls);
 
@@ -207,7 +213,9 @@ public void testPassBuildOnPositiveMaximumCoverageDecrease() throws Exception {
                 "  \"packageCoverage\": 0,\n" +
                 "  \"classesCoverage\": 0,\n" +
                 "  \"methodCoverage\": 0,\n" +
-                "  \"conditionalCoverage\": 0\n" +
+                "  \"conditionalCoverage\": 100,\n" +
+                "  \"linesCovered\": 100,\n" +
+                "  \"linesTested\": 100\n" +
                 "}");
         notifier.setUberallsClient(uberalls);
 

diff --git a/src/test/java/com/uber/jenkins/phabricator/utils/TestUtils.java b/src/test/java/com/uber/jenkins/phabricator/utils/TestUtils.java
@@ -133,22 +133,22 @@ public static CodeCoverageMetrics getCodeCoverageMetrics(
             float methodCoveragePercent,
             float lineCoveragePercent,
             float conditionalCoveragePercent,
-            float linesCovered,
-            float linesTested) {
+            long linesCovered,
+            long linesTested) {
         return spy(new CodeCoverageMetrics(packagesCoveragePercent, filesCoveragePercent,
                 classesCoveragePercent, methodCoveragePercent, lineCoveragePercent,
                 conditionalCoveragePercent, linesCovered, linesTested));
     }
 
     public static CodeCoverageMetrics getDefaultCodeCoverageMetrics() {
-        return getCodeCoverageMetrics(100.0f, 100.0f, 100.0f, 100.0f, 100.0f, 100.0f, 100.0f, 100.0f);
+        return getCodeCoverageMetrics(100.0f, 100.0f, 100.0f, 100.0f, 100.0f, 100.0f, 100, 100);
     }
 
     public static CodeCoverageMetrics getCoverageResult(
             Float packageCoverage, Float filesCoverage,
             Float classesCoverage, Float methodCoverage,
-            Float linesCoverage, Float linesCovered,
-            Float linesTested) {
+            Float linesCoverage, long linesCovered,
+            long linesTested) {
         return new CodeCoverageMetrics(
                 packageCoverage,
                 filesCoverage,
@@ -162,7 +162,7 @@ public static CodeCoverageMetrics getCoverageResult(
     }
 
     public static CodeCoverageMetrics getEmptyCoverageMetrics() {
-        return new CodeCoverageMetrics(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
+        return new CodeCoverageMetrics(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0);
     }
 
     public static JSONObject getJSONFromFile(Class klass, String filename) throws IOException {