Updated Branches: refs/heads/wicket-1.5.x ea440cc9f -> 907634246
WICKET-4597 bug in Duration.toString(Locale locale) Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/90763424 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/90763424 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/90763424 Branch: refs/heads/wicket-1.5.x Commit: 907634246b046bbc577d643b5b6fe3d29333ecaf Parents: ea440cc Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Fri Jun 15 11:17:07 2012 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Fri Jun 15 11:17:07 2012 +0300 ---------------------------------------------------------------------- .../java/org/apache/wicket/util/time/Duration.java | 2 +- .../org/apache/wicket/util/time/DurationTest.java | 23 +++++++++++++++ 2 files changed, 24 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/90763424/wicket-util/src/main/java/org/apache/wicket/util/time/Duration.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/main/java/org/apache/wicket/util/time/Duration.java b/wicket-util/src/main/java/org/apache/wicket/util/time/Duration.java index fc232bf..c366990 100755 --- a/wicket-util/src/main/java/org/apache/wicket/util/time/Duration.java +++ b/wicket-util/src/main/java/org/apache/wicket/util/time/Duration.java @@ -526,7 +526,7 @@ public class Duration extends AbstractTimeValue return unitString(seconds(), "second", locale); } - return unitString(seconds(), "millisecond", locale); + return unitString(getMilliseconds(), "millisecond", locale); } else { http://git-wip-us.apache.org/repos/asf/wicket/blob/90763424/wicket-util/src/test/java/org/apache/wicket/util/time/DurationTest.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/test/java/org/apache/wicket/util/time/DurationTest.java b/wicket-util/src/test/java/org/apache/wicket/util/time/DurationTest.java index 103e039..7f3f671 100644 --- a/wicket-util/src/test/java/org/apache/wicket/util/time/DurationTest.java +++ b/wicket-util/src/test/java/org/apache/wicket/util/time/DurationTest.java @@ -107,4 +107,27 @@ public final class DurationTest assertEquals("1.5 hours", Duration.hours(1.5).toString(Locale.US)); assertEquals("1,5 hours", Duration.hours(1.5).toString(Locale.GERMAN)); } + + + /** + * Check if toString(Locale locale) respects the appropriate value and format (in English). + */ + @Test + public void toStringValues() + { + assertEquals("1 day", Duration.days(1).toString(Locale.ENGLISH)); + assertEquals("5 days", Duration.days(5).toString(Locale.ENGLISH)); + + assertEquals("1 hour", Duration.hours(1).toString(Locale.ENGLISH)); + assertEquals("23 hours", Duration.hours(23).toString(Locale.ENGLISH)); + + assertEquals("1 minute", Duration.minutes(1).toString(Locale.ENGLISH)); + assertEquals("2 minutes", Duration.minutes(2).toString(Locale.ENGLISH)); + + assertEquals("1 second", Duration.seconds(1).toString(Locale.ENGLISH)); + assertEquals("2 seconds", Duration.seconds(2).toString(Locale.ENGLISH)); + + assertEquals("1 millisecond", Duration.milliseconds(1).toString(Locale.ENGLISH)); + assertEquals("955 milliseconds", Duration.milliseconds(955).toString(Locale.ENGLISH)); + } }
