From f2cd33bc2d4e583adbe9e0ea6ada910bc7516f37 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Thu, 28 Apr 2016 10:16:36 +0200 Subject: [PATCH] SONAR-7570 A duration of 0 minute should be converted to "0min" instead of empty --- .../src/main/java/org/sonar/api/utils/Duration.java | 2 +- .../src/test/java/org/sonar/api/utils/DurationTest.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/Duration.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/Duration.java index 4eab07e4b8f..7020978e305 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/Duration.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/Duration.java @@ -121,7 +121,7 @@ public class Duration implements Serializable { stringBuilder.append(minutes); stringBuilder.append(MINUTE); } - return stringBuilder.toString(); + return stringBuilder.length() == 0 ? ("0" + MINUTE) : stringBuilder.toString(); } /** diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/utils/DurationTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/utils/DurationTest.java index ba427bd3197..b3c03a5edd2 100644 --- a/sonar-plugin-api/src/test/java/org/sonar/api/utils/DurationTest.java +++ b/sonar-plugin-api/src/test/java/org/sonar/api/utils/DurationTest.java @@ -45,6 +45,7 @@ public class DurationTest { assertThat(Duration.create(ONE_HOUR_IN_MINUTES).encode(HOURS_IN_DAY)).isEqualTo("1h"); assertThat(Duration.create(HOURS_IN_DAY * ONE_HOUR_IN_MINUTES).encode(HOURS_IN_DAY)).isEqualTo("1d"); assertThat(Duration.create(ONE_MINUTE).encode(HOURS_IN_DAY)).isEqualTo("1min"); + assertThat(Duration.create(0).encode(HOURS_IN_DAY)).isEqualTo("0min"); } @Test @@ -54,6 +55,7 @@ public class DurationTest { assertThat(Duration.decode("23h", HOURS_IN_DAY)).isEqualTo(Duration.create(23 * ONE_HOUR_IN_MINUTES)); assertThat(Duration.decode("15d", HOURS_IN_DAY)).isEqualTo(Duration.create(15 * ONE_DAY_IN_MINUTES)); assertThat(Duration.decode("42min", HOURS_IN_DAY)).isEqualTo(Duration.create(42 * ONE_MINUTE)); + assertThat(Duration.decode("0min", HOURS_IN_DAY)).isEqualTo(Duration.create(0)); assertThat(Duration.decode("25h61min", HOURS_IN_DAY)).isEqualTo(Duration.create(25 * ONE_HOUR_IN_MINUTES + 61)); } -- 2.39.5