SONAR-7869 api/measures/* formats correctly big MILLISEC metrics

diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MeasureValueFormatter.java b/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MeasureValueFormatter.java
index fcf5e28bd2262669aefc140c8bb4b3459209d76d..84dfacc77a20b877c3faa047d43c2954befdb865 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MeasureValueFormatter.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MeasureValueFormatter.java
@@ -39,8 +39,8 @@ class MeasureValueFormatter {
       case BOOL:
         return formatBoolean(doubleValue);
       case INT:
-      case MILLISEC:
         return formatInteger(doubleValue);
+      case MILLISEC:
       case WORK_DUR:
         return formatLong(doubleValue);
       case FLOAT:
@@ -64,8 +64,8 @@ class MeasureValueFormatter {
       case BOOL:
         return formatBoolean(value);
       case INT:
-      case MILLISEC:
         return formatInteger(value);
+      case MILLISEC:
       case WORK_DUR:
         return formatLong(value);
       case FLOAT:

diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/ws/MeasureValueFormatterTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/ws/MeasureValueFormatterTest.java
index 9ad6ea678e5a51ce82afa6a6c6fdc25d4ec8f8fd..e2c7d8f3669e4563ca2dce8131083b98fd327818 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/measure/ws/MeasureValueFormatterTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/measure/ws/MeasureValueFormatterTest.java
@@ -50,6 +50,7 @@ public class MeasureValueFormatterTest {
     assertThat(formatNumericalValue(1_000.123d, newMetric(FLOAT))).isEqualTo("1000.123");
     assertThat(formatNumericalValue(1_000.0d, newMetric(INT))).isEqualTo("1000");
     assertThat(formatNumericalValue(1_000.0d, newMetric(WORK_DUR))).isEqualTo("1000");
+    assertThat(formatNumericalValue(6_000_000_000_000.0d, newMetric(MILLISEC))).isEqualTo("6000000000000");
   }
 
   @Test
@@ -57,8 +58,8 @@ public class MeasureValueFormatterTest {
     assertThat(formatMeasureValue(newNumericMeasure(-1.0d), newMetric(BOOL))).isEqualTo("false");
     assertThat(formatMeasureValue(newNumericMeasure(1.0d), newMetric(BOOL))).isEqualTo("true");
     assertThat(formatMeasureValue(newNumericMeasure(1000.123d), newMetric(PERCENT))).isEqualTo("1000.123");
-    assertThat(formatMeasureValue(newNumericMeasure(1000d), newMetric(MILLISEC))).isEqualTo("1000");
     assertThat(formatMeasureValue(newNumericMeasure(1000.0d), newMetric(WORK_DUR))).isEqualTo("1000");
+    assertThat(formatMeasureValue(newNumericMeasure(6_000_000_000_000.0d), newMetric(MILLISEC))).isEqualTo("6000000000000");
     assertThat(formatMeasureValue(newTextMeasure("text-value"), newMetric(DATA))).isEqualTo("text-value");
   }