X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/73c04bcfe1096173b00431f0cdc742894b15eef0..4f1e1a09ce4daed860e35d359ce2fceccb0764e8:/icuSources/test/intltest/incaltst.cpp?ds=sidebyside diff --git a/icuSources/test/intltest/incaltst.cpp b/icuSources/test/intltest/incaltst.cpp index a765e0c4..aeda1640 100644 --- a/icuSources/test/intltest/incaltst.cpp +++ b/icuSources/test/intltest/incaltst.cpp @@ -1,6 +1,8 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html /*********************************************************************** * COPYRIGHT: - * Copyright (c) 1997-2005, International Business Machines Corporation + * Copyright (c) 1997-2014, International Business Machines Corporation * and others. All Rights Reserved. ***********************************************************************/ @@ -18,7 +20,7 @@ #define CHECK(status, msg) \ if (U_FAILURE(status)) { \ - errln((UnicodeString(u_errorName(status)) + UnicodeString(" : " ) )+ msg); \ + dataerrln((UnicodeString(u_errorName(status)) + UnicodeString(" : " ) )+ msg); \ return; \ } @@ -54,9 +56,6 @@ static UnicodeString escape( const UnicodeString&src) // ***************************************************************************** //--- move to CalendarTest? -static const double JULIAN_EPOCH = -210866760000000.; - - // Turn this on to dump the calendar fields #define U_DEBUG_DUMPCALS @@ -75,6 +74,9 @@ void IntlCalendarTest::runIndexedTest( int32_t index, UBool exec, const char* &n CASE(4,TestBuddhistFormat); CASE(5,TestJapaneseFormat); CASE(6,TestJapanese3860); + CASE(7,TestPersian); + CASE(8,TestPersianFormat); + CASE(9,TestTaiwan); default: name = ""; break; } } @@ -101,16 +103,26 @@ IntlCalendarTest::TestTypes() "ja_JP_TRADITIONAL", "th_TH_TRADITIONAL", "th_TH_TRADITIONAL@calendar=gregorian", - "en_US", NULL }; + "en_US", + "th_TH", // Default calendar for th_TH is buddhist + "th", // th's default region is TH and buddhist is used as default for TH + "en_TH", // Default calendar for any locales with region TH is buddhist + "en-TH-u-ca-gregory", + NULL }; const char *types[40] = { "gregorian", "japanese", "gregorian", "japanese", - "buddhist", + "buddhist", "japanese", "buddhist", "gregorian", - "gregorian", NULL }; + "gregorian", + "buddhist", + "buddhist", + "buddhist", + "gregorian", + NULL }; for(j=0;locs[j];j++) { logln(UnicodeString("Creating calendar of locale ") + locs[j]); @@ -120,7 +132,7 @@ IntlCalendarTest::TestTypes() if(U_SUCCESS(status)) { logln(UnicodeString(" type is ") + c->getType()); if(strcmp(c->getType(), types[j])) { - errln(UnicodeString(locs[j]) + UnicodeString("Calendar type ") + c->getType() + " instead of " + types[j]); + dataerrln(UnicodeString(locs[j]) + UnicodeString("Calendar type ") + c->getType() + " instead of " + types[j]); } } delete c; @@ -287,10 +299,63 @@ void IntlCalendarTest::TestBuddhist() { // end sanity check - quasiGregorianTest(*cal,Locale("th_TH"),data); + quasiGregorianTest(*cal,Locale("th_TH@calendar=gregorian"),data); + delete cal; +} + + +/** + * Verify that TaiWanCalendar shifts years to Minguo Era but otherwise + * behaves like GregorianCalendar. + */ +void IntlCalendarTest::TestTaiwan() { + // MG 1 == 1912 AD + UDate timeA = Calendar::getNow(); + + // TODO port these to the data items + int32_t data[] = { + 1, // B. era [928479600000] + 1, // B. year + 1912, // G. year + UCAL_JUNE, // month + 4, // day + + 1, // B. era [-79204842000000] + 3, // B. year + 1914, // G. year + UCAL_FEBRUARY, // month + 12, // day + + 1, // B. era [-79204842000000] + 96, // B. year + 2007, // G. year + UCAL_FEBRUARY, // month + 12, // day + + -1,-1,-1,-1,-1,-1,-1,-1,-1,-1 + }; + Calendar *cal; + UErrorCode status = U_ZERO_ERROR; + cal = Calendar::createInstance("en_US@calendar=roc", status); + CHECK(status, UnicodeString("Creating en_US@calendar=roc calendar")); + + // Sanity check the calendar + UDate timeB = Calendar::getNow(); + UDate timeCal = cal->getTime(status); + + if(!(timeA <= timeCal) || !(timeCal <= timeB)) { + errln((UnicodeString)"Error: Calendar time " + timeCal + + " is not within sampled times [" + timeA + " to " + timeB + "]!"); + } + // end sanity check + + + quasiGregorianTest(*cal,Locale("en_US"),data); delete cal; } + + /** * Verify that JapaneseCalendar shifts years to Japanese Eras but otherwise * behaves like GregorianCalendar. @@ -340,19 +405,21 @@ void IntlCalendarTest::TestJapanese() { delete cal; } + + void IntlCalendarTest::TestBuddhistFormat() { UErrorCode status = U_ZERO_ERROR; // Test simple parse/format with adopt - // First, a contrived english test.. + // First, a contrived English test.. UDate aDate = 999932400000.0; SimpleDateFormat *fmt = new SimpleDateFormat(UnicodeString("MMMM d, yyyy G"), Locale("en_US@calendar=buddhist"), status); CHECK(status, "creating date format instance"); SimpleDateFormat *fmt2 = new SimpleDateFormat(UnicodeString("MMMM d, yyyy G"), Locale("en_US@calendar=gregorian"), status); CHECK(status, "creating gregorian date format instance"); if(!fmt) { - errln("Coudln't create en_US instance"); + errln("Couldn't create en_US instance"); } else { UnicodeString str; fmt2->format(aDate, str); @@ -376,7 +443,7 @@ void IntlCalendarTest::TestBuddhistFormat() { } delete fmt2; - CHECK(status, "Error occured testing Buddhist Calendar in English "); + CHECK(status, "Error occurred testing Buddhist Calendar in English "); status = U_ZERO_ERROR; // Now, try in Thai @@ -417,6 +484,8 @@ void IntlCalendarTest::TestBuddhistFormat() { } } +// TaiwanFormat has been moved to testdata/format.txt + void IntlCalendarTest::TestJapaneseFormat() { Calendar *cal; @@ -435,7 +504,7 @@ void IntlCalendarTest::TestJapaneseFormat() { SimpleDateFormat *fmt2 = new SimpleDateFormat(UnicodeString("MMMM d, yyyy G"), Locale("en_US@calendar=gregorian"), status); CHECK(status, "creating date format instance"); if(!fmt) { - errln("Coudln't create en_US instance"); + errln("Couldn't create en_US instance"); } else { UnicodeString str; fmt2->format(aDate, str); @@ -463,7 +532,7 @@ void IntlCalendarTest::TestJapaneseFormat() { // Test parse with incomplete information fmt = new SimpleDateFormat(UnicodeString("G y"), Locale("en_US@calendar=japanese"), status); - aDate = -3197120400000.; + aDate = -3197117222000.0; CHECK(status, "creating date format instance"); if(!fmt) { errln("Coudln't create en_US instance"); @@ -494,11 +563,11 @@ void IntlCalendarTest::TestJapaneseFormat() { delete cal2; delete fmt2; - CHECK(status, "Error occured"); + CHECK(status, "Error occurred"); // Now, try in Japanese { - UnicodeString expect = CharsToUnicodeString("\\u5e73\\u621013\\u5e749\\u67088\\u65e5\\u571f\\u66dc\\u65e5"); + UnicodeString expect = CharsToUnicodeString("\\u5e73\\u621013\\u5e749\\u67088\\u65e5 \\u571f\\u66dc\\u65e5"); UDate expectDate = 999932400000.0; // Testing a recent date Locale loc("ja_JP@calendar=japanese"); @@ -506,7 +575,7 @@ void IntlCalendarTest::TestJapaneseFormat() { simpleTest(loc, expect, expectDate, status); } { - UnicodeString expect = CharsToUnicodeString("\\u5e73\\u621013\\u5e749\\u67088\\u65e5\\u571f\\u66dc\\u65e5"); + UnicodeString expect = CharsToUnicodeString("\\u5e73\\u621013\\u5e749\\u67088\\u65e5 \\u571f\\u66dc\\u65e5"); UDate expectDate = 999932400000.0; // Testing a recent date Locale loc("ja_JP_TRADITIONAL"); // legacy @@ -514,8 +583,8 @@ void IntlCalendarTest::TestJapaneseFormat() { simpleTest(loc, expect, expectDate, status); } { - UnicodeString expect = CharsToUnicodeString("\\u5b89\\u6c385\\u5e747\\u67084\\u65e5\\u6728\\u66dc\\u65e5"); - UDate expectDate = -6106035600000.0; + UnicodeString expect = CharsToUnicodeString("\\u5b89\\u6c385\\u5e747\\u67084\\u65e5 \\u6728\\u66dc\\u65e5"); + UDate expectDate = -6106032422000.0; // 1776-07-04T00:00:00Z-075258 Locale loc("ja_JP@calendar=japanese"); status = U_ZERO_ERROR; @@ -523,7 +592,7 @@ void IntlCalendarTest::TestJapaneseFormat() { } { // Jitterbug 1869 - this is an ambiguous era. (Showa 64 = Jan 6 1989, but Showa could be 2 other eras) ) - UnicodeString expect = CharsToUnicodeString("\\u662d\\u548c64\\u5e741\\u67086\\u65e5\\u91d1\\u66dc\\u65e5"); + UnicodeString expect = CharsToUnicodeString("\\u662d\\u548c64\\u5e741\\u67086\\u65e5 \\u91d1\\u66dc\\u65e5"); UDate expectDate = 600076800000.0; Locale loc("ja_JP@calendar=japanese"); @@ -532,9 +601,8 @@ void IntlCalendarTest::TestJapaneseFormat() { } { // This Feb 29th falls on a leap year by gregorian year, but not by Japanese year. - UnicodeString expect = CharsToUnicodeString("\\u5EB7\\u6B632\\u5e742\\u670829\\u65e5\\u65e5\\u66dc\\u65e5"); - // Add -1:00 to the following for historical TZ - aliu - UDate expectDate = -16214403600000.0; // courtesy of date format round trip test + UnicodeString expect = CharsToUnicodeString("\\u5EB7\\u6B632\\u5e742\\u670829\\u65e5 \\u65e5\\u66dc\\u65e5"); + UDate expectDate = -16214400422000.0; // 1456-03-09T00:00Z-075258 Locale loc("ja_JP@calendar=japanese"); status = U_ZERO_ERROR; @@ -564,7 +632,7 @@ void IntlCalendarTest::TestJapanese3860() SimpleDateFormat *fmt = new SimpleDateFormat(UnicodeString("y.M.d"), Locale("ja_JP@calendar=japanese"), status); CHECK(status, "creating date format instance"); if(!fmt) { - errln("Coudln't create en_US instance"); + errln("Couldn't create en_US instance"); } else { UErrorCode s2 = U_ZERO_ERROR; cal2->clear(); @@ -583,7 +651,7 @@ void IntlCalendarTest::TestJapanese3860() int32_t gotYear = cal2->get(UCAL_YEAR, s2); int32_t gotEra = cal2->get(UCAL_ERA, s2); int32_t expectYear = 1; - int32_t expectEra = JapaneseCalendar::kCurrentEra; + int32_t expectEra = JapaneseCalendar::getCurrentEra(); if((gotYear!=1) || (gotEra != expectEra)) { errln(UnicodeString("parse "+samplestr+" of 'y.m.d' as Japanese Calendar, expected year ") + expectYear + UnicodeString(" and era ") + expectEra +", but got year " + gotYear + " and era " + gotEra + " (Gregorian:" + str +")"); @@ -594,8 +662,6 @@ void IntlCalendarTest::TestJapanese3860() } } -#if 0 - // this will NOT work - *all the time*. If it is the 1st of the month, for example it will get Jan 1 heisei 1 => jan 1 showa 64, wrong era. { // Test simple parse/format with adopt UDate aDate = 0; @@ -606,7 +672,7 @@ void IntlCalendarTest::TestJapanese3860() SimpleDateFormat *fmt = new SimpleDateFormat(UnicodeString("y"), Locale("ja_JP@calendar=japanese"), status); CHECK(status, "creating date format instance"); if(!fmt) { - errln("Coudln't create en_US instance"); + errln("Couldn't create en_US instance"); } else { UErrorCode s2 = U_ZERO_ERROR; cal2->clear(); @@ -625,7 +691,7 @@ void IntlCalendarTest::TestJapanese3860() int32_t gotYear = cal2->get(UCAL_YEAR, s2); int32_t gotEra = cal2->get(UCAL_ERA, s2); int32_t expectYear = 1; - int32_t expectEra = JapaneseCalendar::kCurrentEra; + int32_t expectEra = 235; //JapaneseCalendar::kCurrentEra; if((gotYear!=1) || (gotEra != expectEra)) { errln(UnicodeString("parse "+samplestr+" of 'y' as Japanese Calendar, expected year ") + expectYear + UnicodeString(" and era ") + expectEra +", but got year " + gotYear + " and era " + gotEra + " (Gregorian:" + str +")"); @@ -635,12 +701,184 @@ void IntlCalendarTest::TestJapanese3860() delete fmt; } } -#endif + delete cal2; delete cal; delete fmt2; } + + + +/** + * Verify the Persian Calendar. + */ +void IntlCalendarTest::TestPersian() { + UDate timeA = Calendar::getNow(); + + Calendar *cal; + UErrorCode status = U_ZERO_ERROR; + cal = Calendar::createInstance("fa_IR@calendar=persian", status); + CHECK(status, UnicodeString("Creating fa_IR@calendar=persian calendar")); + // Sanity check the calendar + UDate timeB = Calendar::getNow(); + UDate timeCal = cal->getTime(status); + + if(!(timeA <= timeCal) || !(timeCal <= timeB)) { + errln((UnicodeString)"Error: Calendar time " + timeCal + + " is not within sampled times [" + timeA + " to " + timeB + "]!"); + } + // end sanity check + + // Test various dates to be sure of validity + int32_t data[] = { + 1925, 4, 24, 1304, 2, 4, + 2011, 1, 11, 1389, 10, 21, + 1986, 2, 25, 1364, 12, 6, + 1934, 3, 14, 1312, 12, 23, + + 2090, 3, 19, 1468, 12, 29, + 2007, 2, 22, 1385, 12, 3, + 1969, 12, 31, 1348, 10, 10, + 1945, 11, 12, 1324, 8, 21, + 1925, 3, 31, 1304, 1, 11, + + 1996, 3, 19, 1374, 12, 29, + 1996, 3, 20, 1375, 1, 1, + 1997, 3, 20, 1375, 12, 30, + 1997, 3, 21, 1376, 1, 1, + + 2008, 3, 19, 1386, 12, 29, + 2008, 3, 20, 1387, 1, 1, + 2004, 3, 19, 1382, 12, 29, + 2004, 3, 20, 1383, 1, 1, + + 2006, 3, 20, 1384, 12, 29, + 2006, 3, 21, 1385, 1, 1, + + 2005, 4, 20, 1384, 1, 31, + 2005, 4, 21, 1384, 2, 1, + 2005, 5, 21, 1384, 2, 31, + 2005, 5, 22, 1384, 3, 1, + 2005, 6, 21, 1384, 3, 31, + 2005, 6, 22, 1384, 4, 1, + 2005, 7, 22, 1384, 4, 31, + 2005, 7, 23, 1384, 5, 1, + 2005, 8, 22, 1384, 5, 31, + 2005, 8, 23, 1384, 6, 1, + 2005, 9, 22, 1384, 6, 31, + 2005, 9, 23, 1384, 7, 1, + 2005, 10, 22, 1384, 7, 30, + 2005, 10, 23, 1384, 8, 1, + 2005, 11, 21, 1384, 8, 30, + 2005, 11, 22, 1384, 9, 1, + 2005, 12, 21, 1384, 9, 30, + 2005, 12, 22, 1384, 10, 1, + 2006, 1, 20, 1384, 10, 30, + 2006, 1, 21, 1384, 11, 1, + 2006, 2, 19, 1384, 11, 30, + 2006, 2, 20, 1384, 12, 1, + 2006, 3, 20, 1384, 12, 29, + 2006, 3, 21, 1385, 1, 1, + + // The 2820-year cycle arithmetical algorithm would fail this one. + 2025, 3, 21, 1404, 1, 1, + + -1,-1,-1,-1,-1,-1,-1,-1,-1,-1 + }; + + Calendar *grego = Calendar::createInstance("fa_IR@calendar=gregorian", status); + for (int32_t i=0; data[i]!=-1; ) { + int32_t gregYear = data[i++]; + int32_t gregMonth = data[i++]-1; + int32_t gregDay = data[i++]; + int32_t persYear = data[i++]; + int32_t persMonth = data[i++]-1; + int32_t persDay = data[i++]; + + // Test conversion from Persian dates + grego->clear(); + grego->set(gregYear, gregMonth, gregDay); + + cal->clear(); + cal->set(persYear, persMonth, persDay); + + UDate persTime = cal->getTime(status); + UDate gregTime = grego->getTime(status); + + if (persTime != gregTime) { + errln(UnicodeString("Expected ") + gregTime + " but got " + persTime); + } + + // Test conversion to Persian dates + cal->clear(); + cal->setTime(gregTime, status); + + int32_t computedYear = cal->get(UCAL_YEAR, status); + int32_t computedMonth = cal->get(UCAL_MONTH, status); + int32_t computedDay = cal->get(UCAL_DATE, status); + + if ((persYear != computedYear) || + (persMonth != computedMonth) || + (persDay != computedDay)) { + errln(UnicodeString("Expected ") + persYear + "/" + (persMonth+1) + "/" + persDay + + " but got " + computedYear + "/" + (computedMonth+1) + "/" + computedDay); + } + + } + + delete cal; + delete grego; +} + +void IntlCalendarTest::TestPersianFormat() { + UErrorCode status = U_ZERO_ERROR; + SimpleDateFormat *fmt = new SimpleDateFormat(UnicodeString("MMMM d, yyyy G"), Locale(" en_US@calendar=persian"), status); + CHECK(status, "creating date format instance"); + SimpleDateFormat *fmt2 = new SimpleDateFormat(UnicodeString("MMMM d, yyyy G"), Locale("en_US@calendar=gregorian"), status); + CHECK(status, "creating gregorian date format instance"); + UnicodeString gregorianDate("January 18, 2007 AD"); + UDate aDate = fmt2->parse(gregorianDate, status); + if(!fmt) { + errln("Couldn't create en_US instance"); + } else { + UnicodeString str; + fmt->format(aDate, str); + logln(UnicodeString() + "as Persian Calendar: " + escape(str)); + UnicodeString expected("Dey 28, 1385 AP"); + if(str != expected) { + errln("Expected " + escape(expected) + " but got " + escape(str)); + } + UDate otherDate = fmt->parse(expected, status); + if(otherDate != aDate) { + UnicodeString str3; + fmt->format(otherDate, str3); + errln("Parse incorrect of " + escape(expected) + " - wanted " + aDate + " but got " + otherDate + ", " + escape(str3)); + } else { + logln("Parsed OK: " + expected); + } + // Two digit year parsing problem #4732 + fmt->applyPattern("yy-MM-dd"); + str.remove(); + fmt->format(aDate, str); + expected.setTo("85-10-28"); + if(str != expected) { + errln("Expected " + escape(expected) + " but got " + escape(str)); + } + otherDate = fmt->parse(expected, status); + if (otherDate != aDate) { + errln("Parse incorrect of " + escape(expected) + " - wanted " + aDate + " but got " + otherDate); + } else { + logln("Parsed OK: " + expected); + } + delete fmt; + } + delete fmt2; + + CHECK(status, "Error occured testing Persian Calendar in English "); +} + + void IntlCalendarTest::simpleTest(const Locale& loc, const UnicodeString& expect, UDate expectDate, UErrorCode& status) { UnicodeString tmp; @@ -657,7 +895,7 @@ void IntlCalendarTest::simpleTest(const Locale& loc, const UnicodeString& expect } d = fmt2->parse(expect,status); - CHECK(status, "Error occured parsing " + UnicodeString(loc.getName())); + CHECK(status, "Error occurred parsing " + UnicodeString(loc.getName())); if(d != expectDate) { fmt2->format(d,tmp); errln(UnicodeString("Failed to parse " ) + escape(expect) + ", " + loc.getName() + " expect " + (double)expectDate + " got " + (double)d + " " + escape(tmp));