organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-06 14:05:32 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 9

ICU-21939 Fix bogus "conflicting fields" error in DateIntervalFormat.

Browse source
This commit is contained in:
Rich Gillam 2022-07-14 17:40:18 -07:00
parent 9c72bf9758
commit 9d230f923c
4 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
icu4c/source/test/intltest/dtifmtts.cpp
View file

@ -65,6 +65,7 @@ void DateIntervalFormatTest::runIndexedTest( int32_t index, UBool exec, const ch
TESTCASE_AUTO(testTicket21222GregorianEraDiff);
TESTCASE_AUTO(testTicket21222ROCEraDiff);
TESTCASE_AUTO(testTicket21222JapaneseEraDiff);
TESTCASE_AUTO(testTicket21939);
TESTCASE_AUTO_END;
}
@ -2372,4 +2373,16 @@ void DateIntervalFormatTest::testTicket21222JapaneseEraDiff() {
verifyCategoryAndField(formatted, expectedCategory, expectedField, status);
}
void DateIntervalFormatTest::testTicket21939() {
IcuTestErrorCode err(*this, "testTicket21939");
LocalPointer<DateIntervalFormat> dif(DateIntervalFormat::createInstance(u"rMdhm", Locale::forLanguageTag("en-u-ca-chinese", err), err));
if (assertSuccess("Error creating DateIntervalFormat", err)) {
const DateFormat* df = dif->getDateFormat();
const SimpleDateFormat* sdf = dynamic_cast<const SimpleDateFormat*>(df);
UnicodeString pattern;
assertEquals("Wrong pattern", u"M/d/r, h:mm\u202Fa", sdf->toPattern(pattern));
}
}
#endif /* #if !UCONFIG_NO_FORMATTING */

2
icu4c/source/test/intltest/dtifmtts.h
View file

@ -88,6 +88,8 @@ public:
void testTicket21222GregorianEraDiff();
void testTicket21222ROCEraDiff();
void testTicket21222JapaneseEraDiff();
void testTicket21939();
private:
/**

4
icu4j/main/classes/core/src/com/ibm/icu/text/DateTimePatternGenerator.java
View file

@ -2804,8 +2804,8 @@ public class DateTimePatternGenerator implements Freezable<DateTimePatternGenera
char ch1 = original.getFieldChar(field);
char ch2 = value.charAt(0);
if ( allowDuplicateFields ||
(ch1 == 'r' && ch2 == 'U') ||
(ch1 == 'U' && ch2 == 'r') ) {
(ch1 == 'r' && (ch2 == 'U' || ch2 == 'y')) ||
((ch1 == 'U' || ch1 == 'y') && ch2 == 'r') ) {
continue;
}
throw new IllegalArgumentException("Conflicting fields:\t"

10
icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateIntervalFormatTest.java
View file

@ -2481,4 +2481,14 @@ public class DateIntervalFormatTest extends TestFmwk {
formatted.toString());
verifyFields(formatted, expectedFields);
}
@Test
public void testTicket21939() {
// the test here is just to check that this particular skeleton doesn't
// lead to an IllegalArgumentException
DateIntervalFormat dif = DateIntervalFormat.getInstance("rMdhm", ULocale.forLanguageTag("en-u-ca-chinese"));
DateFormat df = dif.getDateFormat();
SimpleDateFormat sdf = (SimpleDateFormat)df;
assertEquals("Wrong date format", "M/d/r, h:mm\u202Fa", sdf.toPattern());
}
}