From 025dc2a16ee7cf9cdf1580d458fb81a1510b188b Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Wed, 23 Jan 2013 19:21:00 +0000
Subject: [PATCH] Improve rendering with DateTimeUtils.renderDuration for
durations which are full hours.
SVN: 28172
---
.../java/ch/systemsx/cisd/common/time/DateTimeUtils.java | 8 +++++++-
.../ch/systemsx/cisd/common/time/DateTimeUtilsTest.java | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
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 b8e9e725b64..291dce5414d 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 f41f8edd30d..22df1396a6a 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));
}
--
GitLab