organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-21 12:40:02 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-9287 merge of #9242 for 49.x

Browse source 
X-SVN-Rev: 31846
This commit is contained in:
Michael Ow 2012-05-23 20:23:13 +00:00
parent b9c02417fc
commit 64ebb94d98
3 changed files with 46 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
source/i18n/calendar.cpp
View file

@ -2540,6 +2540,7 @@ UCalendarDateFields Calendar::newerField(UCalendarDateFields defaultField, UCale
UCalendarDateFields Calendar::resolveFields(const UFieldResolutionTable* precedenceTable) {
int32_t bestField = UCAL_FIELD_COUNT;
int32_t tempBestField;
for (int32_t g=0; precedenceTable[g][0][0] != -1 && (bestField == UCAL_FIELD_COUNT); ++g) {
int32_t bestStamp = kUnset;
for (int32_t l=0; precedenceTable[g][l][0] != -1; ++l) {
@ -2557,14 +2558,26 @@ UCalendarDateFields Calendar::resolveFields(const UFieldResolutionTable* precede
}
// Record new maximum stamp & field no.
if (lineStamp > bestStamp) {
bestStamp = lineStamp;
bestField = precedenceTable[g][l][0]; // First field refers to entire line
tempBestField = precedenceTable[g][l][0]; // First field refers to entire line
if (tempBestField >= kResolveRemap) {
tempBestField &= (kResolveRemap-1);
// This check is needed to resolve some issues with UCAL_YEAR precedence mapping
if (tempBestField != UCAL_DATE || (fStamp[UCAL_WEEK_OF_MONTH] < fStamp[tempBestField])) {
bestField = tempBestField;
}
} else {
bestField = tempBestField;
}
if (bestField == tempBestField) {
bestStamp = lineStamp;
}
}
linesInGroup:
;
}
}
return (UCalendarDateFields)( (bestField>=kResolveRemap)?(bestField&(kResolveRemap-1)):bestField );
return (UCalendarDateFields)bestField;
}
const UFieldResolutionTable Calendar::kDatePrecedence[] =

29
source/test/intltest/dtfmrgts.cpp
View file

@ -56,6 +56,7 @@ DateFormatRegressionTest::runIndexedTest( int32_t index, UBool exec, const char*
CASE(25,Test1684)
CASE(26,Test5554)
CASE(27,Test9237)
CASE(28,TestParsing)
default: name = ""; break;
}
}
@ -1496,6 +1497,34 @@ void DateFormatRegressionTest::Test9237(void)
}
}
void DateFormatRegressionTest::TestParsing(void) {
UErrorCode status = U_ZERO_ERROR;
UnicodeString pattern("EEE-WW-MMMM-yyyy");
UnicodeString text("mon-02-march-2011");
int32_t expectedDay = 7;
SimpleDateFormat format(pattern, status);
if (U_FAILURE(status)) {
dataerrln("Unable to create SimpleDateFormat - %s", u_errorName(status));
return;
}
Calendar *cal = new GregorianCalendar(status);
if (cal == NULL || U_FAILURE(status)) {
errln("Unable to create calendar - %s", u_errorName(status));
return;
}
ParsePosition pos(0);
format.parse(text, *cal, pos);
if (cal->get(UCAL_DAY_OF_MONTH, status) != expectedDay) {
errln("Parsing failed: day of month should be '7' with pattern: \"" + pattern + "\" for text: \"" + text + "\"");
}
delete cal;
}
#endif /* #if !UCONFIG_NO_FORMATTING */
//eof

1
source/test/intltest/dtfmrgts.h
View file

@ -52,6 +52,7 @@ public:
void Test1684(void);
void Test5554(void);
void Test9237(void);
void TestParsing(void);
};
#endif /* #if !UCONFIG_NO_FORMATTING */