Apache
/
commons-lang
mirror of https://github.com/apache/commons-lang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More tests added to DurationFormatUtilsTest and discovered bugs fixed in the DurationFormatUtils.formatPeriod method. 

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/lang/trunk@485481 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Henri Yandell 2006-12-11 03:33:09 +00:00
parent ee4ad2727f
commit 5fb6521ab9
2 changed files with 45 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/java/org/apache/commons/lang/time/DurationFormatUtils.java
View File

@ -312,37 +312,49 @@ public static String formatPeriod(long startMillis, long endMillis, String forma
hours += 24; hours += 24;
days -= 1; days -= 1;
} }
while (days < 0) { if (days < 0) {
end.add(Calendar.MONTH, -1); days += start.getActualMaximum(Calendar.DAY_OF_MONTH);
days += end.getActualMaximum(Calendar.DAY_OF_MONTH); // It's a tricky subject. Jan 15th to March 10th. If I count days-first it is
// HEN: It's a tricky subject. Jan 15th to March 10th. If I count days-first it is
// 1 month and 26 days, but if I count month-first then it is 1 month and 23 days. // 1 month and 26 days, but if I count month-first then it is 1 month and 23 days.
// Here we choose the former.
// Also it's contextual - if asked for no M in the format then I should probably // Also it's contextual - if asked for no M in the format then I should probably
// be doing no calculating here. // be doing no calculating here.
months -= 1; months -= 1;
end.add(Calendar.MONTH, 1);
} }
while (months < 0) { while (months < 0) {
months += 12; months += 12;
years -= 1; years -= 1;
start.add(Calendar.YEAR, 1);
} }
// This next block of code adds in values that // This rest of this code adds in values that
// aren't requested. This allows the user to ask for the // aren't requested. This allows the user to ask for the
// number of months and get the real count and not just 0->11. // number of months and get the real count and not just 0->11.
if (!Token.containsTokenWithValue(tokens, y)) { if (!Token.containsTokenWithValue(tokens, y)) {
if (Token.containsTokenWithValue(tokens, M)) { if (Token.containsTokenWithValue(tokens, M)) {
months += 12 * years; months += 12 * years;
years = 0; years = 0;
} else { } else {
// TODO: this is a bit weak, needs work to know about leap years while(start.get(Calendar.YEAR) != end.get(Calendar.YEAR)) {
days += 365 * years; days += start.getActualMaximum(Calendar.DAY_OF_YEAR);
start.add(Calendar.YEAR, 1);
}
years = 0; years = 0;
} }
} }
if (!Token.containsTokenWithValue(tokens, M)) {
if (!Token.containsTokenWithValue(tokens, M) && months != 0) {
start.set(start.get(Calendar.YEAR), start.get(Calendar.MONTH), 0, 0, 0, 0);
start.add(Calendar.MONTH, 1);
end.set(end.get(Calendar.YEAR), end.get(Calendar.MONTH), 0, 0, 0, 0);
days += end.get(Calendar.DAY_OF_YEAR) - start.get(Calendar.DAY_OF_YEAR); days += end.get(Calendar.DAY_OF_YEAR) - start.get(Calendar.DAY_OF_YEAR);
months = 0; months = 0;
// WARNING: For performance sake the Calendar instances are not being
// cloned but modified inline. They should not be trusted after this point
start = null;
end = null;
} }
if (!Token.containsTokenWithValue(tokens, d)) { if (!Token.containsTokenWithValue(tokens, d)) {
hours += 24 * days; hours += 24 * days;

25
src/test/org/apache/commons/lang/time/DurationFormatUtilsTest.java
View File

@ -420,6 +420,27 @@ public void testEdgeDurations() {
new int[] { 2006, 0, 16, 0, 0, 0 }, "MM"); new int[] { 2006, 0, 16, 0, 0, 0 }, "MM");
assertEqualDuration( "11", new int[] { 2005, 0, 15, 0, 0, 0 }, assertEqualDuration( "11", new int[] { 2005, 0, 15, 0, 0, 0 },
new int[] { 2006, 0, 14, 0, 0, 0 }, "MM"); new int[] { 2006, 0, 14, 0, 0, 0 }, "MM");
assertEqualDuration( "01 26", new int[] { 2006, 0, 15, 0, 0, 0 },
new int[] { 2006, 2, 10, 0, 0, 0 }, "MM dd");
assertEqualDuration( "54", new int[] { 2006, 0, 15, 0, 0, 0 },
new int[] { 2006, 2, 10, 0, 0, 0 }, "dd");
assertEqualDuration( "09 12", new int[] { 2006, 1, 20, 0, 0, 0 },
new int[] { 2006, 11, 4, 0, 0, 0 }, "MM dd");
assertEqualDuration( "287", new int[] { 2006, 1, 20, 0, 0, 0 },
new int[] { 2006, 11, 4, 0, 0, 0 }, "dd");
assertEqualDuration( "11 30", new int[] { 2006, 0, 2, 0, 0, 0 },
new int[] { 2007, 0, 1, 0, 0, 0 }, "MM dd");
assertEqualDuration( "364", new int[] { 2006, 0, 2, 0, 0, 0 },
new int[] { 2007, 0, 1, 0, 0, 0 }, "dd");
assertEqualDuration( "12 00", new int[] { 2006, 0, 1, 0, 0, 0 },
new int[] { 2007, 0, 1, 0, 0, 0 }, "MM dd");
assertEqualDuration( "365", new int[] { 2006, 0, 1, 0, 0, 0 },
new int[] { 2007, 0, 1, 0, 0, 0 }, "dd");
} }
private void assertEqualDuration(String expected, int[] start, int[] end, String format) { private void assertEqualDuration(String expected, int[] start, int[] end, String format) {
@ -429,7 +450,9 @@ private void assertEqualDuration(String expected, int[] start, int[] end, String
Calendar cal2 = Calendar.getInstance(); Calendar cal2 = Calendar.getInstance();
cal2.set(end[0], end[1], end[2], end[3], end[4], end[5]); cal2.set(end[0], end[1], end[2], end[3], end[4], end[5]);
cal2.set(Calendar.MILLISECOND, 0); cal2.set(Calendar.MILLISECOND, 0);
String result = DurationFormatUtils.formatPeriod(cal1.getTime().getTime(), cal2.getTime().getTime(), format); long milli1 = cal1.getTime().getTime();
long milli2 = cal2.getTime().getTime();
String result = DurationFormatUtils.formatPeriod(milli1, milli2, format);
assertEquals(expected, result); assertEquals(expected, result);
} }