From 6212cee9c5e178809f25b9cd9a506167953de9c2 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Mon, 17 Mar 2014 09:29:02 +0100 Subject: [PATCH] SONAR-5056 Convert duration with value 0 to null --- .../startup/CopyRequirementsFromCharacteristicsToRules.java | 2 +- .../startup/CopyRequirementsFromCharacteristicsToRulesTest.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sonar-server/src/main/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRules.java b/sonar-server/src/main/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRules.java index 9a7497eec44..51fcac7192f 100644 --- a/sonar-server/src/main/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRules.java +++ b/sonar-server/src/main/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRules.java @@ -209,7 +209,7 @@ public class CopyRequirementsFromCharacteristicsToRules { @CheckForNull @VisibleForTesting static String convertDuration(@Nullable Double oldValue, @Nullable String oldUnit) { - if (oldValue != null) { + if (oldValue != null && oldValue > 0) { String unit = oldUnit != null ? oldUnit : Duration.DAY; // min is replaced by mn unit = "mn".equals(unit) ? Duration.MINUTE : unit; diff --git a/sonar-server/src/test/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest.java b/sonar-server/src/test/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest.java index bd67a8b08e7..f7d48d21523 100644 --- a/sonar-server/src/test/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest.java +++ b/sonar-server/src/test/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest.java @@ -92,6 +92,8 @@ public class CopyRequirementsFromCharacteristicsToRulesTest extends AbstractDaoT assertThat(CopyRequirementsFromCharacteristicsToRules.convertDuration(1.0, null)).isEqualTo("1d"); assertThat(CopyRequirementsFromCharacteristicsToRules.convertDuration(null, "d")).isNull(); + + assertThat(CopyRequirementsFromCharacteristicsToRules.convertDuration(0.0, "d")).isNull(); } @Test -- 2.39.5