From cab3391096edf0885c32d038dd5465fb9acee542 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Fri, 8 Nov 2013 08:37:14 +0100 Subject: [PATCH] SONAR-4776 Never return null when converting WorkDayDuration to days --- .../org/sonar/core/technicaldebt/TechnicalDebtConverter.java | 3 +++ .../sonar/core/technicaldebt/TechnicalDebtConverterTest.java | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/sonar-core/src/main/java/org/sonar/core/technicaldebt/TechnicalDebtConverter.java b/sonar-core/src/main/java/org/sonar/core/technicaldebt/TechnicalDebtConverter.java index 8d69f2c4364..962483a6887 100644 --- a/sonar-core/src/main/java/org/sonar/core/technicaldebt/TechnicalDebtConverter.java +++ b/sonar-core/src/main/java/org/sonar/core/technicaldebt/TechnicalDebtConverter.java @@ -66,6 +66,9 @@ public class TechnicalDebtConverter implements BatchComponent, ServerComponent { } public double toDays(WorkDayDuration technicalDebt) { + if (technicalDebt == null) { + return 0d; + } double resultDays = technicalDebt.days(); resultDays += Double.valueOf(technicalDebt.hours()) / hoursInDay; resultDays += Double.valueOf(technicalDebt.minutes()) / (hoursInDay * 60.0); diff --git a/sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtConverterTest.java b/sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtConverterTest.java index 445dafb1906..d72511e1a29 100644 --- a/sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtConverterTest.java +++ b/sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtConverterTest.java @@ -76,6 +76,11 @@ public class TechnicalDebtConverterTest { assertThat(converter.toDays(WorkDayDuration.of(45, 6, 1))).isEqualTo(1.5625); } + + @Test + public void return_zero_if_null_when_convert_technical_debt_to_days() { + assertThat(converter.toDays((WorkDayDuration) null)).isEqualTo(0.0); + } private void checkValues(WorkDayDuration technicalDebt, int expectedMinutes, int expectedHours, int expectedDays) { assertThat(technicalDebt.minutes()).isEqualTo(expectedMinutes); -- 2.39.5