AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-10757 Fixed a problem in DurationFormat#formatDurationFromNowTo() - polarity of duration was inverted before.

Browse Source 
X-SVN-Rev: 35457
This commit is contained in:
Yoshito Umaoka 2014-03-13 08:51:44 +00:00
parent 911cf64ec7
commit 134c4e57c9
2 changed files with 41 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
icu4j/main/classes/core/src/com/ibm/icu/impl/duration/BasicDurationFormatter.java
View File

@ -1,6 +1,6 @@
/*
******************************************************************************
* Copyright (C) 2007-2008, International Business Machines Corporation and *
* Copyright (C) 2007-2014, International Business Machines Corporation and *
* others. All Rights Reserved. *
******************************************************************************
*/
@ -52,7 +52,7 @@ class BasicDurationFormatter implements DurationFormatter {
public String formatDurationFromNowTo(Date targetDate) {
long now = System.currentTimeMillis();
long duration = now - targetDate.getTime();
long duration = targetDate.getTime() - now;
return formatDurationFrom(duration, now);
}

41
icu4j/main/tests/core/src/com/ibm/icu/dev/test/duration/ICUDurationTest.java
View File

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 2007-2009, International Business Machines Corporation and *
* Copyright (C) 2007-2014, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@ -59,7 +59,7 @@ public class ICUDurationTest extends TestFmwk {
formatted = df.formatDurationFromNowTo(new Date(0));
Calendar cal = Calendar.getInstance();
int years = cal.get(Calendar.YEAR) - 1970; // year of Date(0)
expect = "fra " + years + " anni";
expect = years + " anni fa";
if(!expect.equals(formatted)) {
errln("Expected " + expect + " but got " + formatted);
} else {
@ -261,4 +261,41 @@ public class ICUDurationTest extends TestFmwk {
"to return an exception for an unsupported operation.");
} catch(Exception e){}
}
public void TestFromNowTo() {
class TestCase {
ULocale locale;
int diffInSeconds;
String expected;
TestCase(ULocale locale, int diffInSeconds, String expected) {
this.locale = locale;
this.diffInSeconds = diffInSeconds;
this.expected = expected;
}
}
TestCase[] testCases = {
new TestCase(ULocale.US, 10, "10 seconds from now"),
new TestCase(ULocale.US, -10, "10 seconds ago"),
new TestCase(ULocale.US, -1800, "30 minutes ago"),
new TestCase(ULocale.US, 3600, "1 hour from now"),
new TestCase(ULocale.US, 10000, "2 hours from now"),
new TestCase(ULocale.US, -20000, "5 hours ago"),
new TestCase(ULocale.FRANCE, -1800, "il y a 30 minutes"),
new TestCase(ULocale.ITALY, 10000, "fra due ore"),
};
final long delayMS = 10; // Safe margin - 10 milliseconds
// See the comments below
for (TestCase test : testCases) {
DurationFormat df = DurationFormat.getInstance(test.locale);
long target = System.currentTimeMillis() + test.diffInSeconds * 1000;
// Need some adjustment because time difference is recalculated in
// formatDurationFromNowTo method.
target = test.diffInSeconds > 0 ? target + delayMS : target - delayMS;
Date d = new Date(target);
String result = df.formatDurationFromNowTo(d);
assertEquals("TestFromNowTo (" + test.locale + ", " + test.diffInSeconds + "sec)",
test.expected, result);
}
}
}