diff options
Diffstat (limited to 'Build/source/libs/icu/icu-src/source/test/cintltst/cdateintervalformattest.c')
-rw-r--r-- | Build/source/libs/icu/icu-src/source/test/cintltst/cdateintervalformattest.c | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/Build/source/libs/icu/icu-src/source/test/cintltst/cdateintervalformattest.c b/Build/source/libs/icu/icu-src/source/test/cintltst/cdateintervalformattest.c index 513989ac6bb..8f157d2f5d4 100644 --- a/Build/source/libs/icu/icu-src/source/test/cintltst/cdateintervalformattest.c +++ b/Build/source/libs/icu/icu-src/source/test/cintltst/cdateintervalformattest.c @@ -368,23 +368,23 @@ static void TestFormatToResult() { { const char* message = "Field position test 1"; - const UChar* expectedString = u"27. September 2010, 15:00 – 2. März 2011, 18:30"; + const UChar* expectedString = u"27. September 2010 um 15:00 – 2. März 2011 um 18:30"; udtitvfmt_formatToResult(fmt, Date201009270800, Date201103021030, fdi, &ec); assertSuccess("Formatting", &ec); static const UFieldPositionWithCategory expectedFieldPositions[] = { // category, field, begin index, end index - {UFIELD_CATEGORY_DATE_INTERVAL_SPAN, 0, 0, 25}, + {UFIELD_CATEGORY_DATE_INTERVAL_SPAN, 0, 0, 27}, {UFIELD_CATEGORY_DATE, UDAT_DATE_FIELD, 0, 2}, {UFIELD_CATEGORY_DATE, UDAT_MONTH_FIELD, 4, 13}, {UFIELD_CATEGORY_DATE, UDAT_YEAR_FIELD, 14, 18}, - {UFIELD_CATEGORY_DATE, UDAT_HOUR_OF_DAY0_FIELD, 20, 22}, - {UFIELD_CATEGORY_DATE, UDAT_MINUTE_FIELD, 23, 25}, - {UFIELD_CATEGORY_DATE_INTERVAL_SPAN, 1, 28, 47}, - {UFIELD_CATEGORY_DATE, UDAT_DATE_FIELD, 28, 29}, - {UFIELD_CATEGORY_DATE, UDAT_MONTH_FIELD, 31, 35}, - {UFIELD_CATEGORY_DATE, UDAT_YEAR_FIELD, 36, 40}, - {UFIELD_CATEGORY_DATE, UDAT_HOUR_OF_DAY0_FIELD, 42, 44}, - {UFIELD_CATEGORY_DATE, UDAT_MINUTE_FIELD, 45, 47}}; + {UFIELD_CATEGORY_DATE, UDAT_HOUR_OF_DAY0_FIELD, 22, 24}, + {UFIELD_CATEGORY_DATE, UDAT_MINUTE_FIELD, 25, 27}, + {UFIELD_CATEGORY_DATE_INTERVAL_SPAN, 1, 30, 51}, + {UFIELD_CATEGORY_DATE, UDAT_DATE_FIELD, 30, 31}, + {UFIELD_CATEGORY_DATE, UDAT_MONTH_FIELD, 33, 37}, + {UFIELD_CATEGORY_DATE, UDAT_YEAR_FIELD, 38, 42}, + {UFIELD_CATEGORY_DATE, UDAT_HOUR_OF_DAY0_FIELD, 46, 48}, + {UFIELD_CATEGORY_DATE, UDAT_MINUTE_FIELD, 49, 51}}; checkMixedFormattedValue( message, udtitvfmt_resultAsValue(fdi, &ec), @@ -438,23 +438,23 @@ static void TestFormatCalendarToResult() { { const char* message = "Field position test 1"; - const UChar* expectedString = u"27. September 2010, 15:00 – 2. März 2011, 18:30"; + const UChar* expectedString = u"27. September 2010 um 15:00 – 2. März 2011 um 18:30"; udtitvfmt_formatCalendarToResult(fmt, ucal1, ucal2, fdi, &ec); assertSuccess("Formatting", &ec); static const UFieldPositionWithCategory expectedFieldPositions[] = { // category, field, begin index, end index - {UFIELD_CATEGORY_DATE_INTERVAL_SPAN, 0, 0, 25}, + {UFIELD_CATEGORY_DATE_INTERVAL_SPAN, 0, 0, 27}, {UFIELD_CATEGORY_DATE, UDAT_DATE_FIELD, 0, 2}, {UFIELD_CATEGORY_DATE, UDAT_MONTH_FIELD, 4, 13}, {UFIELD_CATEGORY_DATE, UDAT_YEAR_FIELD, 14, 18}, - {UFIELD_CATEGORY_DATE, UDAT_HOUR_OF_DAY0_FIELD, 20, 22}, - {UFIELD_CATEGORY_DATE, UDAT_MINUTE_FIELD, 23, 25}, - {UFIELD_CATEGORY_DATE_INTERVAL_SPAN, 1, 28, 47}, - {UFIELD_CATEGORY_DATE, UDAT_DATE_FIELD, 28, 29}, - {UFIELD_CATEGORY_DATE, UDAT_MONTH_FIELD, 31, 35}, - {UFIELD_CATEGORY_DATE, UDAT_YEAR_FIELD, 36, 40}, - {UFIELD_CATEGORY_DATE, UDAT_HOUR_OF_DAY0_FIELD, 42, 44}, - {UFIELD_CATEGORY_DATE, UDAT_MINUTE_FIELD, 45, 47}}; + {UFIELD_CATEGORY_DATE, UDAT_HOUR_OF_DAY0_FIELD, 22, 24}, + {UFIELD_CATEGORY_DATE, UDAT_MINUTE_FIELD, 25, 27}, + {UFIELD_CATEGORY_DATE_INTERVAL_SPAN, 1, 30, 51}, + {UFIELD_CATEGORY_DATE, UDAT_DATE_FIELD, 30, 31}, + {UFIELD_CATEGORY_DATE, UDAT_MONTH_FIELD, 33, 37}, + {UFIELD_CATEGORY_DATE, UDAT_YEAR_FIELD, 38, 42}, + {UFIELD_CATEGORY_DATE, UDAT_HOUR_OF_DAY0_FIELD, 46, 48}, + {UFIELD_CATEGORY_DATE, UDAT_MINUTE_FIELD, 49, 51}}; checkMixedFormattedValue( message, udtitvfmt_resultAsValue(fdi, &ec), @@ -493,23 +493,23 @@ static void TestFormatCalendarToResult() { ucal_setMillis(ucal5, Date158210160000, &ec); // 1 2 3 4 // 012345678901234567890123456789012345678901234567890 - const UChar* expectedString = u"4. Oktober 1582, 00:00 – 16. Oktober 1582, 00:00"; + const UChar* expectedString = u"4. Oktober 1582 um 00:00 – 16. Oktober 1582 um 00:00"; udtitvfmt_formatCalendarToResult(fmt, ucal4, ucal5, fdi, &ec); assertSuccess("Formatting", &ec); static const UFieldPositionWithCategory expectedFieldPositions[] = { // category, field, begin index, end index - {UFIELD_CATEGORY_DATE_INTERVAL_SPAN, 0, 0, 22}, + {UFIELD_CATEGORY_DATE_INTERVAL_SPAN, 0, 0, 24}, {UFIELD_CATEGORY_DATE, UDAT_DATE_FIELD, 0, 1}, {UFIELD_CATEGORY_DATE, UDAT_MONTH_FIELD, 3, 10}, {UFIELD_CATEGORY_DATE, UDAT_YEAR_FIELD, 11, 15}, - {UFIELD_CATEGORY_DATE, UDAT_HOUR_OF_DAY0_FIELD, 17, 19}, - {UFIELD_CATEGORY_DATE, UDAT_MINUTE_FIELD, 20, 22}, - {UFIELD_CATEGORY_DATE_INTERVAL_SPAN, 1, 25, 48}, - {UFIELD_CATEGORY_DATE, UDAT_DATE_FIELD, 25, 27}, - {UFIELD_CATEGORY_DATE, UDAT_MONTH_FIELD, 29, 36}, - {UFIELD_CATEGORY_DATE, UDAT_YEAR_FIELD, 37, 41}, - {UFIELD_CATEGORY_DATE, UDAT_HOUR_OF_DAY0_FIELD, 43, 45}, - {UFIELD_CATEGORY_DATE, UDAT_MINUTE_FIELD, 46, 48}}; + {UFIELD_CATEGORY_DATE, UDAT_HOUR_OF_DAY0_FIELD, 19, 21}, + {UFIELD_CATEGORY_DATE, UDAT_MINUTE_FIELD, 22, 24}, + {UFIELD_CATEGORY_DATE_INTERVAL_SPAN, 1, 27, 52}, + {UFIELD_CATEGORY_DATE, UDAT_DATE_FIELD, 27, 29}, + {UFIELD_CATEGORY_DATE, UDAT_MONTH_FIELD, 31, 38}, + {UFIELD_CATEGORY_DATE, UDAT_YEAR_FIELD, 39, 43}, + {UFIELD_CATEGORY_DATE, UDAT_HOUR_OF_DAY0_FIELD, 47, 49}, + {UFIELD_CATEGORY_DATE, UDAT_MINUTE_FIELD, 50, 52}}; checkMixedFormattedValue( message, udtitvfmt_resultAsValue(fdi, &ec), @@ -527,23 +527,23 @@ static void TestFormatCalendarToResult() { const char* message = "Field position test 4"; // 1 2 3 4 // 012345678901234567890123456789012345678901234567890 - const UChar* expectedString = u"14. Oktober 1582, 00:00 – 16. Oktober 1582, 00:00"; + const UChar* expectedString = u"14. Oktober 1582 um 00:00 – 16. Oktober 1582 um 00:00"; udtitvfmt_formatCalendarToResult(fmt, ucal4, ucal5, fdi, &ec); assertSuccess("Formatting", &ec); static const UFieldPositionWithCategory expectedFieldPositions[] = { // category, field, begin index, end index - {UFIELD_CATEGORY_DATE_INTERVAL_SPAN, 0, 0, 23}, + {UFIELD_CATEGORY_DATE_INTERVAL_SPAN, 0, 0, 25}, {UFIELD_CATEGORY_DATE, UDAT_DATE_FIELD, 0, 2}, {UFIELD_CATEGORY_DATE, UDAT_MONTH_FIELD, 4, 11}, {UFIELD_CATEGORY_DATE, UDAT_YEAR_FIELD, 12, 16}, - {UFIELD_CATEGORY_DATE, UDAT_HOUR_OF_DAY0_FIELD, 18, 20}, - {UFIELD_CATEGORY_DATE, UDAT_MINUTE_FIELD, 21, 23}, - {UFIELD_CATEGORY_DATE_INTERVAL_SPAN, 1, 26, 49}, - {UFIELD_CATEGORY_DATE, UDAT_DATE_FIELD, 26, 28}, - {UFIELD_CATEGORY_DATE, UDAT_MONTH_FIELD, 30, 37}, - {UFIELD_CATEGORY_DATE, UDAT_YEAR_FIELD, 38, 42}, - {UFIELD_CATEGORY_DATE, UDAT_HOUR_OF_DAY0_FIELD, 44, 46}, - {UFIELD_CATEGORY_DATE, UDAT_MINUTE_FIELD, 47, 49}}; + {UFIELD_CATEGORY_DATE, UDAT_HOUR_OF_DAY0_FIELD, 20, 22}, + {UFIELD_CATEGORY_DATE, UDAT_MINUTE_FIELD, 23, 25}, + {UFIELD_CATEGORY_DATE_INTERVAL_SPAN, 1, 28, 53}, + {UFIELD_CATEGORY_DATE, UDAT_DATE_FIELD, 28, 30}, + {UFIELD_CATEGORY_DATE, UDAT_MONTH_FIELD, 32, 39}, + {UFIELD_CATEGORY_DATE, UDAT_YEAR_FIELD, 40, 44}, + {UFIELD_CATEGORY_DATE, UDAT_HOUR_OF_DAY0_FIELD, 48, 50}, + {UFIELD_CATEGORY_DATE, UDAT_MINUTE_FIELD, 51, 53}}; checkMixedFormattedValue( message, udtitvfmt_resultAsValue(fdi, &ec), |