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

ICU-6089 Support FieldPosition created with DateFormat.Field in SimpleDateFormat.format properly. Also added test cases for verifying the behavior.

Browse Source 
X-SVN-Rev: 23184
This commit is contained in:
Yoshito Umaoka 2008-01-08 22:50:46 +00:00
parent e6bd9614f4
commit b0900e7924
2 changed files with 94 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
icu4j/src/com/ibm/icu/dev/test/format/DateFormatTest.java
View File

@ -247,9 +247,69 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
assertTrue("data size", EXPECTED.length == COUNT * DateFormat.FIELD_COUNT);
//#if defined(FOUNDATION10) || defined(J2SE13)
//#else
final DateFormat.Field[] DTFMT_FIELDS = {
DateFormat.Field.AM_PM,
DateFormat.Field.DAY_OF_MONTH,
DateFormat.Field.DAY_OF_WEEK,
DateFormat.Field.DAY_OF_WEEK_IN_MONTH,
DateFormat.Field.DAY_OF_YEAR,
DateFormat.Field.DOW_LOCAL,
DateFormat.Field.ERA,
DateFormat.Field.EXTENDED_YEAR,
DateFormat.Field.HOUR_OF_DAY0,
DateFormat.Field.HOUR_OF_DAY1,
DateFormat.Field.HOUR0,
DateFormat.Field.HOUR1,
DateFormat.Field.JULIAN_DAY,
DateFormat.Field.MILLISECOND,
DateFormat.Field.MILLISECONDS_IN_DAY,
DateFormat.Field.MINUTE,
DateFormat.Field.MONTH,
DateFormat.Field.QUARTER,
DateFormat.Field.SECOND,
DateFormat.Field.TIME_ZONE,
DateFormat.Field.WEEK_OF_MONTH,
DateFormat.Field.WEEK_OF_YEAR,
DateFormat.Field.YEAR,
DateFormat.Field.YEAR_WOY,
};
final String[][] EXPECTED_BY_FIELD = {
{"PM", "13", "Wednesday", "", "",
"", "", "", "", "",
"", "2", "", "", "",
"34", "August", "", "12", "PT",
"", "", "1997", ""},
{"", "13", "mercredi", "", "",
"", "", "", "14", "",
"", "", "", "", "",
"34", "ao\u00FBt", "", "12", "\u00C9tats-Unis (Los Angeles)",
"", "", "1997", ""},
{"PM", "13", "Wed", "2", "225",
"4", "AD", "1997", "14", "14",
"2", "2", "2450674", "5", "52452513",
"34", "8", "3", "12", "PDT",
"3", "33", "1997", "1997"},
{"PM", "0013", "Wednesday", "0002", "0225",
"0004", "Anno Domini", "1997", "0014", "0014",
"0002", "0002", "2450674", "5130", "52452513",
"0034", "August", "3rd quarter", "0012", "Pacific Daylight Time",
"0003", "0033", "1997", "1997"},
};
//#endif
TimeZone PT = TimeZone.getTimeZone("America/Los_Angeles");
for (j = 0, exp = 0; j < COUNT; ++j) {
// String str;
// String str;
DateFormat df = dateFormats[j];
df.setTimeZone(PT);
logln(" Pattern = " + ((SimpleDateFormat) df).toPattern());
@ -261,14 +321,31 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
continue;
}
FieldPosition pos;
String field;
for (i = 0; i < DateFormat.FIELD_COUNT; ++i, ++exp) {
FieldPosition pos = new FieldPosition(i);
pos = new FieldPosition(i);
buf.setLength(0);
df.format(aug13, buf, pos);
String field = buf.substring(pos.getBeginIndex(), pos.getEndIndex());
assertEquals("field #" + i + " " + DATEFORMAT_FIELD_NAMES[i],
field = buf.substring(pos.getBeginIndex(), pos.getEndIndex());
assertEquals("pattern#" + j + " field #" + i + " " + DATEFORMAT_FIELD_NAMES[i],
EXPECTED[exp], field);
}
//#if defined(FOUNDATION10) || defined(J2SE13)
//#else
// FieldPostion initialized by DateFormat.Field trac#6089
for(i = 0; i < DTFMT_FIELDS.length; i++) {
// The format method only set position for the first occurrence of
// the specified field.
pos = new FieldPosition(DTFMT_FIELDS[i]);
buf.setLength(0);
df.format(aug13, buf, pos);
field = buf.substring(pos.getBeginIndex(), pos.getEndIndex());
assertEquals("pattern#" + j + " " + DTFMT_FIELDS[i].toString(), EXPECTED_BY_FIELD[j][i], field);
}
//#endif
}
}
/**

18
icu4j/src/com/ibm/icu/text/SimpleDateFormat.java
View File

@ -955,11 +955,19 @@ public class SimpleDateFormat extends DateFormat {
break;
} // switch (patternCharIndex)
// Set the FieldPosition (for the first occurence only)
if (pos.getBeginIndex() == pos.getEndIndex() &&
pos.getField() == PATTERN_INDEX_TO_DATE_FORMAT_FIELD[patternCharIndex]) {
pos.setBeginIndex(beginOffset);
pos.setEndIndex(beginOffset + buf.length() - bufstart);
// Set the FieldPosition (for the first occurrence only)
if (pos.getBeginIndex() == pos.getEndIndex()) {
if (pos.getField() == PATTERN_INDEX_TO_DATE_FORMAT_FIELD[patternCharIndex]) {
pos.setBeginIndex(beginOffset);
pos.setEndIndex(beginOffset + buf.length() - bufstart);
}
//#if defined(FOUNDATION10) || defined(J2SE13)
//#else
else if (pos.getFieldAttribute() == PATTERN_INDEX_TO_DATE_FORMAT_ATTRIBUTE[patternCharIndex]) {
pos.setBeginIndex(beginOffset);
pos.setEndIndex(beginOffset + buf.length() - bufstart);
}
//#endif
}
}