diff --git a/common/source/java/ch/systemsx/cisd/common/time/DateTimeUtils.java b/common/source/java/ch/systemsx/cisd/common/time/DateTimeUtils.java index b8e9e725b64415c8054d8973fd41887613724108..291dce5414d30388004973ccc910cc01add5b23b 100644 --- a/common/source/java/ch/systemsx/cisd/common/time/DateTimeUtils.java +++ b/common/source/java/ch/systemsx/cisd/common/time/DateTimeUtils.java @@ -100,7 +100,13 @@ public final class DateTimeUtils } long minutes = durationInMinutes % 60; long hours = durationInMinutes / 60; - return render(hours, "h") + " " + render(minutes, "min"); + if (minutes > 0) + { + return render(hours, "h") + " " + render(minutes, "min"); + } else + { + return render(hours, "h"); + } } private static String render(long value, String unit) diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/time/DateTimeUtilsTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/time/DateTimeUtilsTest.java index f41f8edd30dcc0ddbc4d3fc58e4093b9a4a2f754..22df1396a6a072a7c1c336d3163e40e40ed4b351 100644 --- a/common/sourceTest/java/ch/systemsx/cisd/common/time/DateTimeUtilsTest.java +++ b/common/sourceTest/java/ch/systemsx/cisd/common/time/DateTimeUtilsTest.java @@ -44,7 +44,7 @@ public class DateTimeUtilsTest extends AssertJUnit assertEquals("2min", DateTimeUtils.renderDuration(100 * 1000)); assertEquals("42min", DateTimeUtils.renderDuration(42 * 1000 * 60)); assertEquals("59min", DateTimeUtils.renderDuration(59 * 1000 * 60)); - assertEquals("1h 0min", DateTimeUtils.renderDuration(60 * 1000 * 60)); + assertEquals("1h", DateTimeUtils.renderDuration(60 * 1000 * 60)); assertEquals("1h 1min", DateTimeUtils.renderDuration(61 * 1000 * 60)); assertEquals("2h 3min", DateTimeUtils.renderDuration(123 * 1000 * 60)); }