From e1e5ae93580636db2cdb3558e4e0d2159ba37163 Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Fri, 16 May 2003 21:58:37 +0000 Subject: [PATCH] ICU-2436 multiple calendars (Buddhist) X-SVN-Rev: 11973 --- icu4c/source/test/intltest/Makefile.in | 2 +- icu4c/source/test/intltest/caltest.cpp | 28 ++- icu4c/source/test/intltest/dtfmtrtts.cpp | 24 +- icu4c/source/test/intltest/incaltst.cpp | 272 +++++++++++++++++++++++ icu4c/source/test/intltest/incaltst.h | 41 ++++ icu4c/source/test/intltest/itformat.cpp | 2 + 6 files changed, 357 insertions(+), 12 deletions(-) create mode 100644 icu4c/source/test/intltest/incaltst.cpp create mode 100644 icu4c/source/test/intltest/incaltst.h diff --git a/icu4c/source/test/intltest/Makefile.in b/icu4c/source/test/intltest/Makefile.in index 505b7cd4abe..39cc5bf3a21 100644 --- a/icu4c/source/test/intltest/Makefile.in +++ b/icu4c/source/test/intltest/Makefile.in @@ -40,7 +40,7 @@ itrbbi.o rbbiapts.o rbbitst.o ittrans.o transapi.o cpdtrtst.o unhxtrts.o hxuntrt ufltlgts.o testutil.o transrt.o trnserr.o normconf.o sfwdchit.o \ jamotest.o srchtest.o reptest.o regextst.o \ itrbnf.o itrbnfrt.o tstdtmod.o testdata.o datamap.o ucaconf.o icusvtst.o \ -uobjtest.o idnaref.o nptrans.o punyref.o testidn.o testidna.o +uobjtest.o idnaref.o nptrans.o punyref.o testidn.o testidna.o incaltst.o DEPS = $(OBJECTS:.o=.d) diff --git a/icu4c/source/test/intltest/caltest.cpp b/icu4c/source/test/intltest/caltest.cpp index a8c858ef748..cc7935d9910 100644 --- a/icu4c/source/test/intltest/caltest.cpp +++ b/icu4c/source/test/intltest/caltest.cpp @@ -12,11 +12,26 @@ #include "unicode/gregocal.h" #include "unicode/smpdtfmt.h" #include "unicode/simpletz.h" - + // ***************************************************************************** // class CalendarTest // ***************************************************************************** +static UnicodeString fieldName(UCalendarDateFields f); + +static UnicodeString calToStr(const Calendar & cal) +{ + + UnicodeString out; + UErrorCode status; + int i; + for(i = 0;igetTime(status) != date(98, 10, 14, 21, 43) || U_FAILURE(status)) - errln("FAIL: new GregorianCalendar(ymdhm) failed"); + if (gc->getTime(status) != (d =date(98, 10, 14, 21, 43) )|| U_FAILURE(status)) + errln("FAIL: new GregorianCalendar(ymdhm) failed with " + UnicodeString(u_errorName(status)) + ", cal=" + gc->getTime(status) + UnicodeString(calToStr(*gc)) + ", d=" + d); + else + logln(UnicodeString("GOOD: cal=") +gc->getTime(status) + UnicodeString(calToStr(*gc)) + ", d=" + d); delete gc; gc = new GregorianCalendar(1998, 10, 14, 21, 43, 55, status); - if (gc->getTime(status) != date(98, 10, 14, 21, 43, 55) || U_FAILURE(status)) - errln("FAIL: new GregorianCalendar(ymdhms) failed"); + if (gc->getTime(status) != (d=date(98, 10, 14, 21, 43, 55)) || U_FAILURE(status)) + errln("FAIL: new GregorianCalendar(ymdhms) failed with " + UnicodeString(u_errorName(status))); GregorianCalendar gc2(Locale::getEnglish(), status); if (failure(status, "new GregorianCalendar")) return; diff --git a/icu4c/source/test/intltest/dtfmtrtts.cpp b/icu4c/source/test/intltest/dtfmtrtts.cpp index 2cf32693e4e..2db02862444 100644 --- a/icu4c/source/test/intltest/dtfmtrtts.cpp +++ b/icu4c/source/test/intltest/dtfmtrtts.cpp @@ -146,8 +146,12 @@ void DateFormatRoundTripTest::test(const Locale& loc) if(TEST_TABLE[itable++]) { logln("Testing style " + UnicodeString(styleName((DateFormat::EStyle)style))); DateFormat *df = DateFormat::createDateInstance((DateFormat::EStyle)style, loc); - test(df, loc); - delete df; + if(df == NULL) { + errln(UnicodeString("Could not DF::createDateInstance ") + UnicodeString(styleName((DateFormat::EStyle)style)) + " Locale: " + loc.getDisplayName(temp)); + } else { + test(df, loc); + delete df; + } } } @@ -155,8 +159,12 @@ void DateFormatRoundTripTest::test(const Locale& loc) if (TEST_TABLE[itable++]) { logln("Testing style " + UnicodeString(styleName((DateFormat::EStyle)style))); DateFormat *df = DateFormat::createTimeInstance((DateFormat::EStyle)style, loc); - test(df, loc, TRUE); - delete df; + if(df == NULL) { + errln(UnicodeString("Could not DF::createTimeInstance ") + UnicodeString(styleName((DateFormat::EStyle)style)) + " Locale: " + loc.getDisplayName(temp)); + } else { + test(df, loc, TRUE); + delete df; + } } } @@ -165,8 +173,12 @@ void DateFormatRoundTripTest::test(const Locale& loc) if(TEST_TABLE[itable++]) { logln("Testing dstyle" + UnicodeString(styleName((DateFormat::EStyle)dstyle)) + ", tstyle" + UnicodeString(styleName((DateFormat::EStyle)tstyle)) ); DateFormat *df = DateFormat::createDateTimeInstance((DateFormat::EStyle)dstyle, (DateFormat::EStyle)tstyle, loc); - test(df, loc); - delete df; + if(df == NULL) { + errln(UnicodeString("Could not DF::createDateTimeInstance ") + UnicodeString(styleName((DateFormat::EStyle)dstyle)) + ", tstyle" + UnicodeString(styleName((DateFormat::EStyle)tstyle)) + "Locale: " + loc.getDisplayName(temp)); + } else { + test(df, loc); + delete df; + } } } } diff --git a/icu4c/source/test/intltest/incaltst.cpp b/icu4c/source/test/intltest/incaltst.cpp new file mode 100644 index 00000000000..740ca2c68cb --- /dev/null +++ b/icu4c/source/test/intltest/incaltst.cpp @@ -0,0 +1,272 @@ +/******************************************************************** + * COPYRIGHT: + * Copyright (c) 1997-2003, International Business Machines Corporation and + * others. All Rights Reserved. + ********************************************************************/ + +/* Test Internationalized Calendars for C++ */ + +#include "unicode/utypes.h" +#include "strings.h" +#include "unicode/locid.h" + +#if !UCONFIG_NO_FORMATTING + +#define CHECK(status, msg) \ + if (U_FAILURE(status)) { \ + errln((UnicodeString(u_errorName(status)) + UnicodeString("err " ) )+ msg); \ + return; \ + } + + +#include "incaltst.h" +#include "unicode/gregocal.h" +#include "unicode/smpdtfmt.h" +#include "unicode/simpletz.h" + +// ***************************************************************************** +// class IntlCalendarTest +// ***************************************************************************** + +static UnicodeString fieldName(UCalendarDateFields f); + +static UnicodeString calToStr(const Calendar & cal) +{ + + UnicodeString out; + UErrorCode status; + int i; + for(i = 0;igetType()); + if(strcmp(c->getType(), types[j])) { + errln(UnicodeString(locs[j]) + UnicodeString("Calendar type ") + c->getType() + " instead of " + types[j]); + } + } + delete c; + } +} + + + +/** + * Run a test of a quasi-Gregorian calendar. This is a calendar + * that behaves like a Gregorian but has different year/era mappings. + * The int[] data array should have the format: + * + * { era, year, gregorianYear, month, dayOfMonth, ... ... , -1 } + */ +void IntlCalendarTest::quasiGregorianTest(Calendar& cal, const Locale& gcl, const int32_t *data) { + UErrorCode status = U_ZERO_ERROR; + // As of JDK 1.4.1_01, using the Sun JDK GregorianCalendar as + // a reference throws us off by one hour. This is most likely + // due to the JDK 1.4 incorporation of historical time zones. + //java.util.Calendar grego = java.util.Calendar.getInstance(); + Calendar *grego = Calendar::createInstance(gcl, status); + + int32_t tz1 = cal.get(UCAL_ZONE_OFFSET,status); + int32_t tz2 = grego -> get (UCAL_ZONE_OFFSET, status); + if(tz1 != tz2) { + errln((UnicodeString)"cal's tz " + tz1 + " != grego's tz " + tz2); + } + + for (int32_t i=0; data[i]!=-1; ) { + int32_t era = data[i++]; + int32_t year = data[i++]; + int32_t gregorianYear = data[i++]; + int32_t month = data[i++]; + int32_t dayOfMonth = data[i++]; + + grego->clear(); + grego->set(gregorianYear, month, dayOfMonth); + UDate D = grego->getTime(status); + + cal.clear(); + cal.set(UCAL_ERA, era); + cal.set(year, month, dayOfMonth); + UDate d = cal.getTime(status); + // logln((UnicodeString)"cal : " + calToStr(cal)); + // logln((UnicodeString)"grego: " + calToStr(*grego)); + if (d == D) { + logln(UnicodeString("OK: ") + era + ":" + year + "/" + (month+1) + "/" + dayOfMonth + + " => " + d + " (" + UnicodeString(cal.getType())); + } else { + errln(UnicodeString("Fail: ") + era + ":" + year + "/" + (month+1) + "/" + dayOfMonth + + " => " + d + ", expected " + D + " (" + UnicodeString(cal.getType()) + "Off by: " + (d-D)); + } + + // Now, set the gregorian millis on the other calendar + cal.clear(); + cal.setTime(D, status); + int e = cal.get(UCAL_ERA, status); + int y = cal.get(UCAL_YEAR, status); + //logln((UnicodeString)"cal : " + calToStr(cal)); + //logln((UnicodeString)"grego: " + calToStr(*grego)); + if (y == year && e == era) { + logln((UnicodeString)"OK: " + D + " => " + cal.get(UCAL_ERA, status) + ":" + + cal.get(UCAL_YEAR, status) + "/" + + (cal.get(UCAL_MONTH, status)+1) + "/" + cal.get(UCAL_DATE, status) + " (" + UnicodeString(cal.getType())); + } else { + errln((UnicodeString)"Fail: " + D + " => " + cal.get(UCAL_ERA, status) + ":" + + cal.get(UCAL_YEAR, status) + "/" + + (cal.get(UCAL_MONTH, status)+1) + "/" + cal.get(UCAL_DATE, status) + + ", expected " + era + ":" + year + "/" + (month+1) + "/" + + dayOfMonth + " (" + UnicodeString(cal.getType())); + } + } + CHECK(status, "err during quasiGregorianTest()"); +} + +/** + * Verify that BuddhistCalendar shifts years to Buddhist Era but otherwise + * behaves like GregorianCalendar. + */ +void IntlCalendarTest::TestBuddhist() { + // BE 2542 == 1999 CE + int32_t data[] = { 0, // B. era + 2542, // B. year + 1999, // G. year + UCAL_JUNE, // month + 4, // day + + 0, // B. era + 3, // B. year + -540, // 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("th_TH_TRADITIONAL", status); + CHECK(status, UnicodeString("Creating th_TH_TRADITIONAL calendar")); + quasiGregorianTest(*cal,Locale("th_TH"),data); + + // Test simple parse/format with adopt + + const UDate aDate = 999932400000; + SimpleDateFormat *fmt = new SimpleDateFormat(UnicodeString("MMMM d, yyyy G"), Locale("en_US"), status); + CHECK(status, "creating date format instance"); + if(!fmt) { + errln("Coudln't create en_US instance"); + } else { + UnicodeString str; + fmt->format(aDate, str); + logln(UnicodeString() + "Test Date: " + str); + str.remove(); + fmt->adoptCalendar(cal); + cal = NULL; + fmt->format(aDate, str); + logln(UnicodeString() + "as Buddhist Calendar: " + str); + UnicodeString expected("September 8, 2544 BE"); + if(str != expected) { + errln("Expected " + expected + " but got " + str); + } + UDate otherDate = fmt->parse(expected, status); + if(otherDate != aDate) { + UnicodeString str3; + fmt->format(otherDate, str3); + errln("Parse incorrect of " + expected + " - wanted " + aDate + " but got " + otherDate + ", " + str3); + } else { + logln("Parsed OK: " + expected); + } + delete fmt; + } + CHECK(status, "Error occured"); +} + + +#undef CHECK + +#endif /* #if !UCONFIG_NO_FORMATTING */ + +//eof diff --git a/icu4c/source/test/intltest/incaltst.h b/icu4c/source/test/intltest/incaltst.h new file mode 100644 index 00000000000..7c55c9351f1 --- /dev/null +++ b/icu4c/source/test/intltest/incaltst.h @@ -0,0 +1,41 @@ +/******************************************************************** + * COPYRIGHT: + * Copyright (c) 1997-2003, International Business Machines Corporation and + * others. All Rights Reserved. + ********************************************************************/ + +#ifndef __IntlCalendarTest__ +#define __IntlCalendarTest__ + +#include "unicode/utypes.h" + +#if !UCONFIG_NO_FORMATTING + +#include "unicode/calendar.h" +#include "unicode/smpdtfmt.h" +#include "caltztst.h" + +class IntlCalendarTest: public CalendarTimeZoneTest { +public: + // IntlTest override + void runIndexedTest( int32_t index, UBool exec, const char* &name, char* par ); +public: + /** + * Confirm that the registered calendars have the correct type. + */ + void TestTypes(void); + + void TestBuddhist(void); + + protected: + void quasiGregorianTest(Calendar& cal, const Locale& gregoLocale, const int32_t *data); + +public: // package + // internal routine for checking date + static UnicodeString value(Calendar* calendar); + +}; + +#endif /* #if !UCONFIG_NO_FORMATTING */ + +#endif // __IntlCalendarTest__ diff --git a/icu4c/source/test/intltest/itformat.cpp b/icu4c/source/test/intltest/itformat.cpp index 77f55fe2991..f85df9df05e 100644 --- a/icu4c/source/test/intltest/itformat.cpp +++ b/icu4c/source/test/intltest/itformat.cpp @@ -39,6 +39,7 @@ #include "pptest.h" // ParsePositionTest #include "calregts.h" // CalendarRegressionTest #include "tzregts.h" // TimeZoneRegressionTest +#include "incaltst.h" // IntlCalendarTest #define TESTCLASS(id, TestClass) \ case id: \ @@ -95,6 +96,7 @@ void IntlTestFormat::runIndexedTest( int32_t index, UBool exec, const char* &nam TESTCLASS(23,ParsePositionTest); TESTCLASS(24,CalendarRegressionTest); TESTCLASS(25,TimeZoneRegressionTest); + TESTCLASS(26,IntlCalendarTest); //TESTCLASS(0,IntlTestDateFormatSymbolsC); //TESTCLASS(0,IntlTestDecimalFormatSymbolsC);