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

ICU-8057 Skip validating fields internally set by add method in non-leninent mode.

Browse Source 
X-SVN-Rev: 29337
This commit is contained in:
Yoshito Umaoka 2011-01-19 22:40:25 +00:00
parent 11fadaf5c4
commit c711b870c8
2 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
icu4j/main/classes/core/src/com/ibm/icu/util/Calendar.java
View File

@ -2329,6 +2329,7 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
case DAY_OF_MONTH:
{
Calendar cal = (Calendar) clone();
cal.setLenient(true);
cal.prepareGetActual(field, false);
result = handleGetMonthLength(cal.get(EXTENDED_YEAR), cal.get(MONTH));
}
@ -2337,6 +2338,7 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
case DAY_OF_YEAR:
{
Calendar cal = (Calendar) clone();
cal.setLenient(true);
cal.prepareGetActual(field, false);
result = handleGetYearLength(cal.get(EXTENDED_YEAR));
}
@ -4749,7 +4751,7 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
*/
protected void validateFields() {
for (int field = 0; field < fields.length; field++) {
if (isSet(field)) {
if (stamp[field] >= MINIMUM_USER_STAMP) {
validateField(field);
}
}

32
icu4j/main/tests/core/src/com/ibm/icu/dev/test/calendar/CalendarRegression.java
View File

@ -1,6 +1,6 @@
/**
*******************************************************************************
* Copyright (C) 2000-2010, International Business Machines Corporation and *
* Copyright (C) 2000-2011, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@ -2183,6 +2183,36 @@ public class CalendarRegression extends com.ibm.icu.dev.test.TestFmwk {
}
}
/*
* Test case for add/roll with non-lenient calendar reported by ticket#8057.
* Calendar#add may result internal fields out of valid range. ICU used to
* trigger field range validation also for internal field changes triggered
* by add/roll, then throws IllegalArgumentException. The field value range
* validation should be done only for fields set by user code explicitly
* in non-lenient mode.
*/
public void TestT8057() {
// Set the calendar to the last day in a leap year
GregorianCalendar cal = new GregorianCalendar();
cal.setLenient(false);
cal.clear();
cal.set(2008, Calendar.DECEMBER, 31);
// Force calculating then fields once.
long t = cal.getTimeInMillis();
long expected = 1262246400000L; // 2009-12-31 00:00 PST
try {
cal.add(Calendar.YEAR, 1);
t = cal.getTimeInMillis();
if (t != expected) {
errln("FAIL: wrong date after add: expected=" + expected + " returned=" + t);
}
} catch (IllegalArgumentException e) {
errln("FAIL: add method should not throw IllegalArgumentException");
}
}
}
//eof