diff --git a/icu4c/source/test/intltest/apicoll.cpp b/icu4c/source/test/intltest/apicoll.cpp index 643b58d240c..7241eb214c9 100644 --- a/icu4c/source/test/intltest/apicoll.cpp +++ b/icu4c/source/test/intltest/apicoll.cpp @@ -573,7 +573,7 @@ CollationAPITest::TestGetAll( char* par ) for (int32_t i = 0; i < count; ++i) { UnicodeString locName, dispName; log("Locale name: "); - log(list[i].getName(locName)); + log(list[i].getName()); log(" , the display name is : "); logln(list[i].getDisplayName(dispName)); } diff --git a/icu4c/source/test/intltest/calregts.cpp b/icu4c/source/test/intltest/calregts.cpp index 642c0c95661..0ecea8ea2c8 100644 --- a/icu4c/source/test/intltest/calregts.cpp +++ b/icu4c/source/test/intltest/calregts.cpp @@ -376,7 +376,7 @@ CalendarRegressionTest::test4031502() void CalendarRegressionTest::test4061476() { UErrorCode status = U_ZERO_ERROR; - SimpleDateFormat *fmt = new SimpleDateFormat("ddMMMyy", Locale::UK,status); + SimpleDateFormat *fmt = new SimpleDateFormat(UnicodeString("ddMMMyy"), Locale::UK,status); Calendar *cal = Calendar::createInstance(TimeZone::createTimeZone("GMT"), Locale::UK,status); fmt->adoptCalendar(cal); @@ -562,7 +562,7 @@ CalendarRegressionTest::test4031502() Locale::setDefault(Locale::UK,status); TimeZone *newZone = TimeZone::createTimeZone("GMT"); TimeZone::setDefault(*newZone); - date = new SimpleDateFormat("dd MMM yyy (zzzz) 'is in week' ww",status); + date = new SimpleDateFormat(UnicodeString("dd MMM yyy (zzzz) 'is in week' ww"),status); Calendar *cal = Calendar::createInstance(status); cal->set(1997,Calendar::SEPTEMBER,30); UDate now = cal->getTime(status); @@ -1004,7 +1004,7 @@ CalendarRegressionTest::test4031502() for (int32_t j=0; j<3; ++j) { UnicodeString temp; if (n[j] == 0) - errln(UnicodeString("Fail: No locales for ") + locales[i].getName(temp)); + errln(UnicodeString("Fail: No locales for ") + locales[i].getName()); } } //} @@ -1144,7 +1144,7 @@ CalendarRegressionTest::test4031502() { UErrorCode status = U_ZERO_ERROR; GregorianCalendar *cal = (GregorianCalendar*) Calendar::createInstance(status); - DateFormat *fmt = new SimpleDateFormat("MMMM d, yyyy G",status); + DateFormat *fmt = new SimpleDateFormat(UnicodeString("MMMM d, yyyy G"),status); cal->clear(); for (int32_t y=-20; y<=10; ++y) { cal->set(Calendar::ERA, y < 1 ? GregorianCalendar::BC : GregorianCalendar::AD); @@ -1168,7 +1168,7 @@ CalendarRegressionTest::test4031502() void CalendarRegressionTest::test4125892() { UErrorCode status = U_ZERO_ERROR; GregorianCalendar *cal = (GregorianCalendar*) Calendar::createInstance(status); - DateFormat *fmt = new SimpleDateFormat("MMMM d, yyyy G",status); + DateFormat *fmt = new SimpleDateFormat(UnicodeString("MMMM d, yyyy G"),status); cal->clear(); cal->set(Calendar::ERA, GregorianCalendar::BC); cal->set(Calendar::YEAR, 81); // 81 BC is a leap year (proleptically) @@ -1549,7 +1549,7 @@ CalendarRegressionTest::Test4167060() { UErrorCode status = U_ZERO_ERROR; Calendar::EDateFields field = Calendar::YEAR; - DateFormat *format = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy G", + DateFormat *format = new SimpleDateFormat(UnicodeString("EEE MMM dd HH:mm:ss zzz yyyy G"), Locale::US, status); if(U_FAILURE(status)) { errln("Couldn't create SimpleDateFormat"); diff --git a/icu4c/source/test/intltest/caltest.cpp b/icu4c/source/test/intltest/caltest.cpp index 1e9d854eda1..d4ef6f275a0 100644 --- a/icu4c/source/test/intltest/caltest.cpp +++ b/icu4c/source/test/intltest/caltest.cpp @@ -1166,7 +1166,7 @@ CalendarTest::TestDOW_LOCALandYEAR_WOY() int32_t times = 20; Calendar *cal=Calendar::createInstance(Locale::GERMANY, status); if (U_FAILURE(status)) { errln("Couldn't create GregorianCalendar"); return; } - SimpleDateFormat *sdf=new SimpleDateFormat("YYYY'-W'ww-ee", Locale::GERMANY, status); + SimpleDateFormat *sdf=new SimpleDateFormat(UnicodeString("YYYY'-W'ww-ee"), Locale::GERMANY, status); if (U_FAILURE(status)) { errln("Couldn't create SimpleDateFormat"); return; } sdf->applyLocalizedPattern(UnicodeString("JJJJ'-W'ww-ee"), status); if (U_FAILURE(status)) { errln("Couldn't apply localized pattern"); return; } @@ -1220,7 +1220,7 @@ void CalendarTest::yearAddTest(Calendar& cal, UErrorCode& status) { UDate t = cal.getTime(status); UnicodeString str, str2; - SimpleDateFormat fmt("EEE MMM dd yyyy / YYYY'-W'ww-ee", status); + SimpleDateFormat fmt(UnicodeString("EEE MMM dd yyyy / YYYY'-W'ww-ee"), status); fmt.setCalendar(cal); fmt.format(t, str.remove()); @@ -1270,7 +1270,7 @@ static UnicodeString fieldName(Calendar::EDateFields f) { void CalendarTest::loop_addroll(Calendar *cal, SimpleDateFormat *sdf, int times, Calendar::EDateFields field, Calendar::EDateFields field2, UErrorCode& errorCode) { Calendar *calclone; - SimpleDateFormat fmt("EEE MMM dd yyyy / YYYY'-W'ww-ee", errorCode); + SimpleDateFormat fmt(UnicodeString("EEE MMM dd yyyy / YYYY'-W'ww-ee"), errorCode); fmt.setCalendar(*cal); int i; @@ -1448,7 +1448,7 @@ void CalendarTest::TestWOY(void) { int32_t i; GregorianCalendar cal(status); - SimpleDateFormat fmt("EEE MMM dd yyyy', WOY' w", status); + SimpleDateFormat fmt(UnicodeString("EEE MMM dd yyyy', WOY' w"), status); CHECK(status, "Fail: Cannot construct calendar/format"); Calendar::EDaysOfWeek fdw; diff --git a/icu4c/source/test/intltest/caltztst.cpp b/icu4c/source/test/intltest/caltztst.cpp index 86771041893..bc5869c3ef7 100644 --- a/icu4c/source/test/intltest/caltztst.cpp +++ b/icu4c/source/test/intltest/caltztst.cpp @@ -48,7 +48,7 @@ DateFormat* CalendarTimeZoneTest::getDateFormat() if(theFormat == 0) // If we weren't able to pull it out of the cache, then we have to create it. { UErrorCode status = U_ZERO_ERROR; - theFormat = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", status); + theFormat = new SimpleDateFormat(UnicodeString("EEE MMM dd HH:mm:ss zzz yyyy"), status); if (U_FAILURE(status)) { delete theFormat; diff --git a/icu4c/source/test/intltest/dtfmapts.cpp b/icu4c/source/test/intltest/dtfmapts.cpp index 59e8ac685bf..92621448e38 100644 --- a/icu4c/source/test/intltest/dtfmapts.cpp +++ b/icu4c/source/test/intltest/dtfmapts.cpp @@ -163,7 +163,7 @@ void IntlTestDateFormatAPI::testAPI(char *par) logln((UnicodeString) "Got " + count + " locales" ); for(int32_t i = 0; i < count; i++) { UnicodeString name; - name = locales[i].getName(name); + name = locales[i].getName(); logln(name); } diff --git a/icu4c/source/test/intltest/dtfmrgts.cpp b/icu4c/source/test/intltest/dtfmrgts.cpp index bb674c94f6b..8b76ca79916 100644 --- a/icu4c/source/test/intltest/dtfmrgts.cpp +++ b/icu4c/source/test/intltest/dtfmrgts.cpp @@ -206,7 +206,7 @@ void DateFormatRegressionTest::Test4056591(void) UErrorCode status = U_ZERO_ERROR; //try { - SimpleDateFormat *fmt = new SimpleDateFormat("yyMMdd", Locale::US, status); + SimpleDateFormat *fmt = new SimpleDateFormat(UnicodeString("yyMMdd"), Locale::US, status); failure(status, "new SimpleDateFormat"); UDate start = date(1809-1900, Calendar::DECEMBER, 25); fmt->set2DigitYearStart(start, status); @@ -262,7 +262,7 @@ void DateFormatRegressionTest::Test4059917(void) SimpleDateFormat *fmt; UnicodeString myDate; - fmt = new SimpleDateFormat( "yyyy/MM/dd", status ); + fmt = new SimpleDateFormat( UnicodeString("yyyy/MM/dd"), status ); failure(status, "new SimpleDateFormat"); myDate = "1997/01/01"; aux917( fmt, myDate ); @@ -270,7 +270,7 @@ void DateFormatRegressionTest::Test4059917(void) delete fmt; fmt = NULL; - fmt = new SimpleDateFormat( "yyyyMMdd", status ); + fmt = new SimpleDateFormat( UnicodeString("yyyyMMdd"), status ); failure(status, "new SimpleDateFormat"); myDate = "19970101"; aux917( fmt, myDate ); @@ -318,7 +318,7 @@ void DateFormatRegressionTest::Test4060212(void) logln( "dateString= " + dateString ); logln("Using yyyy-DDD.hh:mm:ss"); UErrorCode status = U_ZERO_ERROR; - SimpleDateFormat *formatter = new SimpleDateFormat("yyyy-DDD.hh:mm:ss", status); + SimpleDateFormat *formatter = new SimpleDateFormat(UnicodeString("yyyy-DDD.hh:mm:ss"), status); failure(status, "new SimpleDateFormat"); ParsePosition pos(0); UDate myDate = formatter->parse( dateString, pos ); @@ -339,7 +339,7 @@ void DateFormatRegressionTest::Test4060212(void) logln("Using yyyy-ddd.hh:mm:ss"); delete formatter; formatter = NULL; - formatter = new SimpleDateFormat("yyyy-ddd.hh:mm:ss", status); + formatter = new SimpleDateFormat(UnicodeString("yyyy-ddd.hh:mm:ss"), status); failure(status, "new SimpleDateFormat"); pos.setIndex(0); myDate = formatter->parse( dateString, pos ); @@ -363,7 +363,7 @@ void DateFormatRegressionTest::Test4061287(void) { UErrorCode status = U_ZERO_ERROR; - SimpleDateFormat *df = new SimpleDateFormat("dd/MM/yyyy", status); + SimpleDateFormat *df = new SimpleDateFormat(UnicodeString("dd/MM/yyyy"), status); failure(status, "new SimpleDateFormat"); //try { logln(UnicodeString("") + df->parse("35/01/1971", status)); @@ -641,7 +641,7 @@ void DateFormatRegressionTest::Test4100302(void) void DateFormatRegressionTest::Test4101483(void) { UErrorCode status = U_ZERO_ERROR; - SimpleDateFormat *sdf = new SimpleDateFormat("z", Locale::US, status); + SimpleDateFormat *sdf = new SimpleDateFormat(UnicodeString("z"), Locale::US, status); failure(status, "new SimpleDateFormat"); FieldPosition fp(DateFormat::TIMEZONE_FIELD); //Date d = date(9234567890L); @@ -674,7 +674,7 @@ void DateFormatRegressionTest::Test4103340(void) // choose a date that is the FIRST of some month // and some arbitrary time UDate d = date(97, 3, 1, 1, 1, 1); - SimpleDateFormat *df = new SimpleDateFormat("MMMM", Locale::US, status); + SimpleDateFormat *df = new SimpleDateFormat(UnicodeString("MMMM"), Locale::US, status); failure(status, "new SimpleDateFormat"); UnicodeString s; @@ -703,7 +703,7 @@ void DateFormatRegressionTest::Test4103341(void) // {sfb} changed from setDefault to adoptDefault TimeZone::adoptDefault(TimeZone::createTimeZone("CST")); UErrorCode status = U_ZERO_ERROR; - SimpleDateFormat *simple = new SimpleDateFormat("MM/dd/yyyy HH:mm", status); + SimpleDateFormat *simple = new SimpleDateFormat(UnicodeString("MM/dd/yyyy HH:mm"), status); failure(status, "new SimpleDateFormat"); TimeZone *temp = TimeZone::createDefault(); if(simple->getTimeZone() != *temp) @@ -814,11 +814,11 @@ void DateFormatRegressionTest::Test4106807(void) UErrorCode status = U_ZERO_ERROR; SimpleDateFormat *sdfs [] = { - new SimpleDateFormat("yyyyMMddHHmmss", status), - new SimpleDateFormat("yyyyMMddHHmmss'Z'", status), - new SimpleDateFormat("yyyyMMddHHmmss''", status), - new SimpleDateFormat("yyyyMMddHHmmss'a''a'", status), - new SimpleDateFormat("yyyyMMddHHmmss %", status) + new SimpleDateFormat(UnicodeString("yyyyMMddHHmmss"), status), + new SimpleDateFormat(UnicodeString("yyyyMMddHHmmss'Z'"), status), + new SimpleDateFormat(UnicodeString("yyyyMMddHHmmss''"), status), + new SimpleDateFormat(UnicodeString("yyyyMMddHHmmss'a''a'"), status), + new SimpleDateFormat(UnicodeString("yyyyMMddHHmmss %"), status) }; failure(status, "new SimpleDateFormat"); @@ -959,7 +959,7 @@ void DateFormatRegressionTest::Test4151706(void) { UErrorCode status = U_ZERO_ERROR; SimpleDateFormat *fmt = - new SimpleDateFormat("EEEE, dd-MMM-yy HH:mm:ss z", Locale::US, status); + new SimpleDateFormat(UnicodeString("EEEE, dd-MMM-yy HH:mm:ss z"), Locale::US, status); failure(status, "new SimpleDateFormat"); //try { UDate d = fmt->parse("Thursday, 31-Dec-98 23:00:00 GMT", status); diff --git a/icu4c/source/test/intltest/dtfmtrtts.cpp b/icu4c/source/test/intltest/dtfmtrtts.cpp index 48697831c3a..3bbbcf7461e 100644 --- a/icu4c/source/test/intltest/dtfmtrtts.cpp +++ b/icu4c/source/test/intltest/dtfmtrtts.cpp @@ -58,7 +58,7 @@ DateFormatRoundTripTest::failure(UErrorCode status, const char* msg) void DateFormatRoundTripTest::TestDateFormatRoundTrip() { UErrorCode status = U_ZERO_ERROR; - dateFormat = new SimpleDateFormat("EEE MMM dd HH:mm:ss.SSS zzz yyyy G", status); + dateFormat = new SimpleDateFormat((UnicodeString)"EEE MMM dd HH:mm:ss.SSS zzz yyyy G", status); failure(status, "new SimpleDateFormat"); getFieldCal = Calendar::createInstance(status); diff --git a/icu4c/source/test/intltest/dtfmttst.cpp b/icu4c/source/test/intltest/dtfmttst.cpp index f599b8df92c..58efa5eb7a6 100644 --- a/icu4c/source/test/intltest/dtfmttst.cpp +++ b/icu4c/source/test/intltest/dtfmttst.cpp @@ -58,7 +58,7 @@ void DateFormatTest::TestWallyWedel() * Instantiate a SimpleDateFormat set up to produce a full time zone name. */ - SimpleDateFormat *sdf = new SimpleDateFormat("zzzz", status); + SimpleDateFormat *sdf = new SimpleDateFormat((UnicodeString)"zzzz", status); /* * A String array for the time zone ids. */ @@ -157,8 +157,8 @@ void DateFormatTest::TestTwoDigitYearDSTParse(void) { UErrorCode status = U_ZERO_ERROR; - SimpleDateFormat* fullFmt = new SimpleDateFormat("EEE MMM dd HH:mm:ss.SSS zzz yyyy G", status); - SimpleDateFormat *fmt = new SimpleDateFormat("dd-MMM-yy h:mm:ss 'o''clock' a z", Locale::ENGLISH, status); + SimpleDateFormat* fullFmt = new SimpleDateFormat((UnicodeString)"EEE MMM dd HH:mm:ss.SSS zzz yyyy G", status); + SimpleDateFormat *fmt = new SimpleDateFormat((UnicodeString)"dd-MMM-yy h:mm:ss 'o''clock' a z", Locale::ENGLISH, status); //DateFormat* fmt = DateFormat::createDateTimeInstance(DateFormat::MEDIUM, DateFormat::FULL, Locale::ENGLISH); UnicodeString* s = new UnicodeString("03-Apr-04 2:20:47 o'clock AM PST"); int32_t hour = 2; @@ -276,8 +276,8 @@ DateFormatTest::TestFieldPosition(void) dateFormats[0] = DateFormat::createDateTimeInstance(DateFormat::FULL, DateFormat::FULL, Locale::US); dateFormats[1] = DateFormat::createDateTimeInstance(DateFormat::FULL, DateFormat::FULL, Locale::FRANCE); - dateFormats[2] = new SimpleDateFormat("G, y, M, d, k, H, m, s, S, E, D, F, w, W, a, h, K, z, Y, e", status); - dateFormats[3] = new SimpleDateFormat("GGGG, yyyy, MMMM, dddd, kkkk, HHHH, mmmm, ssss, SSSS, EEEE, DDDD, FFFF, wwww, WWWW, aaaa, hhhh, KKKK, zzzz, YYYY, eeee", status); + dateFormats[2] = new SimpleDateFormat((UnicodeString)"G, y, M, d, k, H, m, s, S, E, D, F, w, W, a, h, K, z, Y, e", status); + dateFormats[3] = new SimpleDateFormat((UnicodeString)"GGGG, yyyy, MMMM, dddd, kkkk, HHHH, mmmm, ssss, SSSS, EEEE, DDDD, FFFF, wwww, WWWW, aaaa, hhhh, KKKK, zzzz, YYYY, eeee", status); for (j = 0, exp = 0; j < dateFormats_length;++j) { UnicodeString str; DateFormat* df = dateFormats[j]; @@ -415,11 +415,11 @@ DateFormatTest::TestRunTogetherPattern917() UErrorCode status = U_ZERO_ERROR; SimpleDateFormat* fmt; UnicodeString myDate; - fmt = new SimpleDateFormat("yyyy/MM/dd", status); + fmt = new SimpleDateFormat((UnicodeString)"yyyy/MM/dd", status); myDate = "1997/02/03"; testIt917(fmt, myDate, date(97, 2 - 1, 3)); delete fmt; - fmt = new SimpleDateFormat("yyyyMMdd", status); + fmt = new SimpleDateFormat((UnicodeString)"yyyyMMdd", status); myDate = "19970304"; testIt917(fmt, myDate, date(97, 3 - 1, 4)); delete fmt; @@ -574,7 +574,7 @@ void DateFormatTest::TestQuotePattern161() { UErrorCode status = U_ZERO_ERROR; - SimpleDateFormat* formatter = new SimpleDateFormat("MM/dd/yyyy 'at' hh:mm:ss a zzz", status); + SimpleDateFormat* formatter = new SimpleDateFormat((UnicodeString)"MM/dd/yyyy 'at' hh:mm:ss a zzz", status); UDate currentTime_1 = date(97, Calendar::AUGUST, 13, 10, 42, 28); UnicodeString dateString; ((DateFormat*)formatter)->format(currentTime_1, dateString); UnicodeString exp("08/13/1997 at 10:42:28 AM "); @@ -781,7 +781,7 @@ DateFormatTest::TestDateFormatZone061() DateFormat *formatter; date= 859248000000.0; logln((UnicodeString)"Date 1997/3/25 00:00 GMT: " + date); - formatter = new SimpleDateFormat("dd-MMM-yyyyy HH:mm", Locale::UK, status); + formatter = new SimpleDateFormat((UnicodeString)"dd-MMM-yyyyy HH:mm", Locale::UK, status); formatter->adoptTimeZone(TimeZone::createTimeZone("GMT")); UnicodeString temp; formatter->format(date, temp); logln((UnicodeString)"Formatted in GMT to: " + temp); diff --git a/icu4c/source/test/intltest/itercoll.cpp b/icu4c/source/test/intltest/itercoll.cpp index 3ad32d350f7..7c9cbed4a03 100644 --- a/icu4c/source/test/intltest/itercoll.cpp +++ b/icu4c/source/test/intltest/itercoll.cpp @@ -60,7 +60,7 @@ void CollationIteratorTest::TestPrevious(char *par) UnicodeString source; RuleBasedCollator *c1 = NULL; c1 = new RuleBasedCollator( - "< a,A < b,B < c,C, d,D < z,Z < ch,cH,Ch,CH", status); + (UnicodeString)"< a,A < b,B < c,C, d,D < z,Z < ch,cH,Ch,CH", status); if (c1 == NULL || U_FAILURE(status)) { @@ -77,7 +77,7 @@ void CollationIteratorTest::TestPrevious(char *par) // Test with an expanding character sequence RuleBasedCollator *c2 = NULL; - c2 = new RuleBasedCollator("< a < b < c/abd < d", status); + c2 = new RuleBasedCollator((UnicodeString)"< a < b < c/abd < d", status); if (c2 == NULL || U_FAILURE(status)) { @@ -94,7 +94,7 @@ void CollationIteratorTest::TestPrevious(char *par) // Now try both RuleBasedCollator *c3 = NULL; - c3 = new RuleBasedCollator("< a < b < c/aba < d < z < ch", status); + c3 = new RuleBasedCollator((UnicodeString)"< a < b < c/aba < d < z < ch", status); if (c3 == NULL || U_FAILURE(status)) { @@ -234,7 +234,7 @@ void CollationIteratorTest::TestClearBuffers(char *par) { UErrorCode status = U_ZERO_ERROR; RuleBasedCollator *c = NULL; - c = new RuleBasedCollator("< a < b < c & ab = d", status); + c = new RuleBasedCollator((UnicodeString)"< a < b < c & ab = d", status); if (c == NULL || U_FAILURE(status)) { diff --git a/icu4c/source/test/intltest/ittxtbd.cpp b/icu4c/source/test/intltest/ittxtbd.cpp index 4df3c3c104d..ca690d7f902 100644 --- a/icu4c/source/test/intltest/ittxtbd.cpp +++ b/icu4c/source/test/intltest/ittxtbd.cpp @@ -764,7 +764,7 @@ thaiLineSelection->addElement(CharsToUnicodeString("\\u0e2b\\u0e19\\u0e49\\u0e32 thaiLineSelection->addElement(CharsToUnicodeString("\\u0e19\\u0e31\\u0e49\\u0e19")); BreakIterator* e = BreakIterator::createLineInstance( - Locale(UnicodeString("th", (char*)0)), status); + Locale("th"), status); if (U_FAILURE(status)) { errln("Failed to create the BreakIterator for default locale in TestThaiLineBreak.\n"); @@ -831,7 +831,7 @@ thaiLineSelection->addElement(CharsToUnicodeString("(\\u0e1b\\u0e23\\u0e30\\u0e4 thaiLineSelection->addElement(CharsToUnicodeString("(\"\\u0e2e\\u0e32\\u0e23\\u0e4c\\u0e14\\u0e14\\u0e34\\u0e2a\\u0e01\\u0e4c\").")); BreakIterator* e = BreakIterator::createLineInstance( - Locale(UnicodeString("th", (char*)0)), status); + Locale("th"), status); if (U_FAILURE(status)) { errln("Failed to create the BreakIterator for default locale in TestMixedThaiLineBreak.\n"); @@ -861,7 +861,7 @@ void IntlTestTextBoundary::TestMaiyamok() thaiLineSelection->addElement(CharsToUnicodeString("\\u0e43\\u0e2b\\u0e21\\u0e48")); BreakIterator* e = BreakIterator::createLineInstance( - Locale(UnicodeString("th", (char*)0)), status); + Locale("th"), status); if (U_FAILURE(status)) { diff --git a/icu4c/source/test/intltest/loctest.cpp b/icu4c/source/test/intltest/loctest.cpp index 5cdc848dbbe..74152d06852 100644 --- a/icu4c/source/test/intltest/loctest.cpp +++ b/icu4c/source/test/intltest/loctest.cpp @@ -7,11 +7,81 @@ #include "loctest.h" #include #include +#include #include "unicode/decimfmt.h" //#include "unicode/datefmt.h" #include "unicode/smpdtfmt.h" +char* rawData[27][7] = { + + // language code + { "en", "fr", "hr", "el", "no", "it", "xx" }, + // country code + { "US", "FR", "HR", "GR", "NO", "", "YY" }, + // variant code + { "", "", "", "", "NY", "", "" }, + // full name + { "en_US", "fr_FR", "hr_HR", "el_GR", "no_NO_NY", "it", "xx_YY" }, + // ISO-3 language + { "eng", "fra", "hrv", "ell", "nor", "ita", "" }, + // ISO-3 country + { "USA", "FRA", "HRV", "GRC", "NOR", "", "" }, + // LCID (not currently public) + { "409", "40c", "41a", "408", "814", "", "" }, + + // display langage (English) + { "English", "French", "Croatian", "Greek", "Norwegian", "Italian", "xx" }, + // display country (English) + { "United States", "France", "Croatia", "Greece", "Norway", "", "YY" }, + // display variant (English) + { "", "", "", "", "Nynorsk", "", ""}, + //{ "", "", "", "", "NY", "", ""}, + // display name (English) + // Updated no_NO_NY English display name for new pattern-based algorithm + // (part of Euro support). + { "English (United States)", "French (France)", "Croatian (Croatia)", "Greek (Greece)", "Norwegian (Norway, Nynorsk)", "Italian", "xx (YY)" }, + //{ "English (United States)", "French (France)", "Croatian (Croatia)", "Greek (Greece)", "Norwegian (Norway,NY)", "Italian", "xx (YY)" }, + + // display langage (French) + { "anglais", "fran\\u00E7ais", "", "grec", "norv\\u00E9gien", "italien", "xx" }, + // display country (French) + { "\\u00C9tats-Unis", "France", "", "Gr\\u00E8ce", "Norv\\u00E8ge", "", "YY" }, + // display variant (French) + { "", "", "", "", "Nynorsk", "", "" }, + // display name (French) + //{ "anglais (États-Unis)", "français (France)", "", "grec (Grèce)", "norvégien (Norvège,Nynorsk)", "italien", "xx (YY)" }, + { "anglais (\\u00C9tats-Unis)", "fran\\u00E7ais (France)", "", "grec (Gr\\u00E8ce)", "norv\\u00E9gien (Norv\\u00E8ge, Nynorsk)", "italien", "xx (YY)" }, + + // display langage (Croatian) + { "", "", "hrvatski", "", "", "", "xx" }, + // display country (Croatian) + { "", "", "Hrvatska", "", "", "", "YY" }, + // display variant (Croatian) + { "", "", "", "", "", "", ""}, + // display name (Croatian) + { "", "", "hrvatski (Hrvatska)", "", "", "", "xx (YY)" }, + + // display langage (Greek)[actual values listed below] + { "", "", "", "", "", "", "" }, + // display country (Greek)[actual values listed below] + { "", "", "", "", "", "", "" }, + // display variant (Greek) + { "", "", "", "", "", "", "" }, + // display name (Greek)[actual values listed below] + { "", "", "", "", "", "", "" }, + + // display langage () + { "English", "French", "Croatian", "Greek", "Norwegian", "Italian", "xx" }, + // display country () + { "United States", "France", "Croatia", "Greece", "Norway", "", "YY" }, + // display variant () + { "", "", "", "", "Nynorsk", "", ""}, + // display name () + //{ "English (United States)", "French (France)", "Croatian (Croatia)", "Greek (Greece)", "Norwegian (Norway,Nynorsk)", "Italian", "xx (YY)" }, + { "English (United States)", "French (France)", "Croatian (Croatia)", "Greek (Greece)", "Norwegian (Norway,NY)", "Italian", "xx (YY)" } +}; + // * test macros /* Usage: @@ -63,7 +133,7 @@ } -#define test_dumpLocale(l) { UnicodeString s; l.getName(s); logln(#l + UnicodeString(" = ") + s); } +#define test_dumpLocale(l) { UnicodeString s(l.getName(),""); logln(#l + UnicodeString(" = ") + s); } LocaleTest::LocaleTest() { @@ -115,36 +185,36 @@ void LocaleTest::TestBasicGetters() { int32_t i; for (i = 0; i <= MAX_LOCALES; i++) { - Locale testLocale(dataTable[LANG][i], dataTable[CTRY][i], dataTable[VAR][i]); - logln("Testing " + testLocale.getName(temp) + "..."); + Locale testLocale(rawData[LANG][i], rawData[CTRY][i], rawData[VAR][i]); + logln("Testing " + (UnicodeString)testLocale.getName() + "..."); - if (testLocale.getLanguage(temp) != (dataTable[LANG][i])) + if ( (temp=testLocale.getLanguage()) != (dataTable[LANG][i])) errln(" Language code mismatch: " + temp + " versus " + dataTable[LANG][i]); - if (testLocale.getCountry(temp) != (dataTable[CTRY][i])) + if ( (temp=testLocale.getCountry()) != (dataTable[CTRY][i])) errln(" Country code mismatch: " + temp + " versus " + dataTable[CTRY][i]); - if (testLocale.getVariant(temp) != (dataTable[VAR][i])) + if ( (temp=testLocale.getVariant()) != (dataTable[VAR][i])) errln(" Variant code mismatch: " + temp + " versus " + dataTable[VAR][i]); - if (testLocale.getName(temp) != (dataTable[NAME][i])) + if ( (temp=testLocale.getName()) != (dataTable[NAME][i])) errln(" Locale name mismatch: " + temp + " versus " + dataTable[NAME][i]); } logln("Same thing without variant codes..."); for (i = 0; i <= MAX_LOCALES; i++) { - Locale testLocale(dataTable[LANG][i], dataTable[CTRY][i]); - logln("Testing " + testLocale.getName(temp) + "..."); + Locale testLocale(rawData[LANG][i], rawData[CTRY][i]); + logln("Testing " + (temp=testLocale.getName()) + "..."); - if (testLocale.getLanguage(temp) != (dataTable[LANG][i])) + if ( (temp=testLocale.getLanguage()) != (dataTable[LANG][i])) errln(" Language code mismatch: " + temp + " versus " + dataTable[LANG][i]); - if (testLocale.getCountry(temp) != (dataTable[CTRY][i])) + if ( (temp=testLocale.getCountry()) != (dataTable[CTRY][i])) errln(" Country code mismatch: " + temp + " versus " + dataTable[CTRY][i]); - if (testLocale.getVariant(temp).length() != 0) - errln(" Variant code mismatch: " + temp + " versus \"\""); + if (testLocale.getVariant()[0] != 0) + errln(" Variant code mismatch: something versus \"\""); } @@ -157,15 +227,16 @@ void LocaleTest::TestBasicGetters() { void LocaleTest::TestSimpleResourceInfo() { UnicodeString temp; char temp2[20]; + UErrorCode err = U_ZERO_ERROR; for (int32_t i = 0; i <= MAX_LOCALES; i++) { - Locale testLocale(dataTable[LANG][i], dataTable[CTRY][i], dataTable[VAR][i]); - logln("Testing " + testLocale.getName(temp) + "..."); + Locale testLocale(rawData[LANG][i], rawData[CTRY][i], rawData[VAR][i]); + logln("Testing " + (temp=testLocale.getName()) + "..."); - if (testLocale.getISO3Language(temp) != (dataTable[LANG3][i])) + if ( (temp=testLocale.getISO3Language()) != (dataTable[LANG3][i])) errln(" ISO-3 language code mismatch: " + temp + " versus " + dataTable[LANG3][i]); - if (testLocale.getISO3Country(temp) != (dataTable[CTRY3][i])) + if ( (temp=testLocale.getISO3Country()) != (dataTable[CTRY3][i])) errln(" ISO-3 country code mismatch: " + temp + " versus " + dataTable[CTRY3][i]); @@ -173,6 +244,12 @@ void LocaleTest::TestSimpleResourceInfo() { if (UnicodeString(temp2) != dataTable[LCID][i]) errln((UnicodeString)" LCID mismatch: " + (int32_t)testLocale.getLCID() + " versus " + dataTable[LCID][i]); + + if(U_FAILURE(err)) + { + errln((UnicodeString)"Some error on number " + i + u_errorName(err)); + } + err = U_ZERO_ERROR; } } @@ -243,7 +320,7 @@ LocaleTest::TestDisplayNames() #define test_assert(test) \ { \ if(!(test)) \ - errln("FAIL: " + UnicodeString(#test) + " was not true." ); \ + errln("FAIL: " + UnicodeString(#test) + " was not true. " + UnicodeString(__FILE__ " line ") + __LINE__ ); \ else \ logln("PASS: asserted " + UnicodeString(#test) ); \ } @@ -344,7 +421,11 @@ public: POSIXLocale(const UnicodeString& l) :Locale() { - setFromPOSIXID(l); + char *ch; + ch = new char[l.size() + 1]; + ch[l.extract(0, 0x7fffffff, ch, "")] = 0; + setFromPOSIXID(ch); + delete [] ch; } POSIXLocale(const char *l) :Locale() @@ -404,7 +485,7 @@ void LocaleTest::TestGetAvailableLocales() logln(UnicodeString("Number of locales returned = ") + locCount); UnicodeString temp; for(int32_t i = 0; i < locCount; ++i) - logln(locList[i].getName(temp)); + logln(locList[i].getName()); } // I have no idea how to test this function... } @@ -455,14 +536,14 @@ void LocaleTest::doTestDisplayNames(Locale& inLocale, bool_t defaultIsFrench) { UnicodeString temp; - if (defaultIsFrench && Locale::getDefault().getLanguage(temp) != "fr") + if (defaultIsFrench && (temp=Locale::getDefault().getLanguage()) != "fr") errln("Default locale should be French, but it's really " + temp); - else if (!defaultIsFrench && Locale::getDefault().getLanguage(temp) != "en") + else if (!defaultIsFrench && (temp=Locale::getDefault().getLanguage()) != "en") errln("Default locale should be English, but it's really " + temp); for (int32_t i = 0; i <= MAX_LOCALES; i++) { - Locale testLocale(dataTable[LANG][i], dataTable[CTRY][i], dataTable[VAR][i]); - logln(" Testing " + testLocale.getName(temp) + "..."); + Locale testLocale(rawData[LANG][i], rawData[CTRY][i], rawData[VAR][i]); + logln(" Testing " + (temp=testLocale.getName()) + "..."); UnicodeString testLang; UnicodeString testCtry; @@ -528,74 +609,6 @@ void LocaleTest::doTestDisplayNames(Locale& inLocale, UnicodeString** LocaleTest::dataTable = 0; -char* rawData[27][7] = { - - // language code - { "en", "fr", "hr", "el", "no", "it", "xx" }, - // country code - { "US", "FR", "HR", "GR", "NO", "", "YY" }, - // variant code - { "", "", "", "", "NY", "", "" }, - // full name - { "en_US", "fr_FR", "hr_HR", "el_GR", "no_NO_NY", "it", "xx_YY" }, - // ISO-3 language - { "eng", "fra", "hrv", "ell", "nor", "ita", "" }, - // ISO-3 country - { "USA", "FRA", "HRV", "GRC", "NOR", "", "" }, - // LCID (not currently public) - { "409", "40c", "41a", "408", "814", "", "" }, - - // display langage (English) - { "English", "French", "Croatian", "Greek", "Norwegian", "Italian", "xx" }, - // display country (English) - { "United States", "France", "Croatia", "Greece", "Norway", "", "YY" }, - // display variant (English) - { "", "", "", "", "Nynorsk", "", ""}, - //{ "", "", "", "", "NY", "", ""}, - // display name (English) - // Updated no_NO_NY English display name for new pattern-based algorithm - // (part of Euro support). - { "English (United States)", "French (France)", "Croatian (Croatia)", "Greek (Greece)", "Norwegian (Norway, Nynorsk)", "Italian", "xx (YY)" }, - //{ "English (United States)", "French (France)", "Croatian (Croatia)", "Greek (Greece)", "Norwegian (Norway,NY)", "Italian", "xx (YY)" }, - - // display langage (French) - { "anglais", "fran\\u00E7ais", "", "grec", "norv\\u00E9gien", "italien", "xx" }, - // display country (French) - { "\\u00C9tats-Unis", "France", "", "Gr\\u00E8ce", "Norv\\u00E8ge", "", "YY" }, - // display variant (French) - { "", "", "", "", "Nynorsk", "", "" }, - // display name (French) - //{ "anglais (États-Unis)", "français (France)", "", "grec (Grèce)", "norvégien (Norvège,Nynorsk)", "italien", "xx (YY)" }, - { "anglais (\\u00C9tats-Unis)", "fran\\u00E7ais (France)", "", "grec (Gr\\u00E8ce)", "norv\\u00E9gien (Norv\\u00E8ge, Nynorsk)", "italien", "xx (YY)" }, - - // display langage (Croatian) - { "", "", "hrvatski", "", "", "", "xx" }, - // display country (Croatian) - { "", "", "Hrvatska", "", "", "", "YY" }, - // display variant (Croatian) - { "", "", "", "", "", "", ""}, - // display name (Croatian) - { "", "", "hrvatski (Hrvatska)", "", "", "", "xx (YY)" }, - - // display langage (Greek)[actual values listed below] - { "", "", "", "", "", "", "" }, - // display country (Greek)[actual values listed below] - { "", "", "", "", "", "", "" }, - // display variant (Greek) - { "", "", "", "", "", "", "" }, - // display name (Greek)[actual values listed below] - { "", "", "", "", "", "", "" }, - - // display langage () - { "English", "French", "Croatian", "Greek", "Norwegian", "Italian", "xx" }, - // display country () - { "United States", "France", "Croatia", "Greece", "Norway", "", "YY" }, - // display variant () - { "", "", "", "", "Nynorsk", "", ""}, - // display name () - //{ "English (United States)", "French (France)", "Croatian (Croatia)", "Greek (Greece)", "Norwegian (Norway,Nynorsk)", "Italian", "xx (YY)" }, - { "English (United States)", "French (France)", "Croatian (Croatia)", "Greek (Greece)", "Norwegian (Norway,NY)", "Italian", "xx (YY)" } -}; UChar greekDisplayLanguage[] = { 0x03b5, 0x03bb, 0x03bb, 0x03b7, 0x03bd, 0x03b9, 0x03ba, 0x03ac, 0 }; UChar greekDisplayCountry[] = { 0x0395, 0x03bb, 0x03bb, 0x03ac, 0x03b4, 0x03b1, 0 }; @@ -629,31 +642,20 @@ void LocaleTest::TestISO3Fallback() { Locale test("xx", "YY"); - bool_t gotException = FALSE; - UnicodeString result; - UErrorCode err = U_ZERO_ERROR; - //try { - result = test.getISO3Language(result, err); - //} - //catch (MissingResourceException e) { - if(U_FAILURE(err)) - gotException = TRUE; - //} - if (!gotException) - errln("getISO3Language() on xx_YY returned " + result + " instead of throwing an exception"); + const char * result; - gotException = FALSE; - err = U_ZERO_ERROR; - //try { - result = test.getISO3Country(result, err); - //} - //catch (MissingResourceException e) { - if(U_FAILURE(err)) - gotException = TRUE; - //} - if (!gotException) - errln("getISO3Country() on xx_YY returned " + result + " instead of throwing an exception"); + result = test.getISO3Language(); + + // Conform to C API usage + + if (!result || (result[0] != 0)) + errln("getISO3Language() on xx_YY returned " + UnicodeString(result) + " instead of \"\""); + + result = test.getISO3Country(); + + if (!result || (result[0] != 0)) + errln("getISO3Country() on xx_YY returned " + UnicodeString(result) + " instead of \"\""); } /** @@ -671,13 +673,16 @@ LocaleTest::TestGetLangsAndCountries() // all lower case for the language codes, all upper case for the country codes) // 4) Is each list in sorted order? int32_t testCount = 0; - const UnicodeString *test = Locale::getISOLanguages(testCount); - UnicodeString spotCheck1 [] = { "en", "es", "fr", "de", "it", + const char * const * test = Locale::getISOLanguages(); + const char spotCheck1[ ][4] = { "en", "es", "fr", "de", "it", "ja", "ko", "zh", "th", "he", "id", "iu", "ug", "yi", "za" }; int32_t spotLen = 15; int32_t i; + + for(testCount = 0;test[testCount];testCount++) + ; if (testCount != 142) errln("Expected getISOLanguages() to return 142 languages; it returned" + testCount); @@ -685,28 +690,30 @@ LocaleTest::TestGetLangsAndCountries() for (i = 0; i < 15; i++) { int32_t j; for (j = 0; j < testCount; j++) - if (test[j] == spotCheck1[i]) + if (uprv_strcmp(test[j],spotCheck1[i])== 0) break; - if (j == testCount || test[j] != spotCheck1[i]) - errln("Couldn't find " + spotCheck1[i] + " in language list."); + if (j == testCount || (uprv_strcmp(test[j],spotCheck1[i])!=0)) + errln("Couldn't find " + (UnicodeString)spotCheck1[i] + " in language list."); } } for (i = 0; i < testCount; i++) { - UnicodeString lc(test[i]); - if (test[i] != lc.toLower()) - errln(test[i] + " is not all lower case."); - if (test[i].length() != 2) - errln(test[i] + " is not two characters long."); - if (i > 0 && test[i].compare(test[i - 1]) <= 0) - errln(test[i] + " appears in an out-of-order position in the list."); + UnicodeString testee(test[i],""); + UnicodeString lc(test[i],""); + if (testee != lc.toLower()) + errln(lc + " is not all lower case."); + if (testee.length() != 2) + errln(testee + " is not two characters long."); + if (i > 0 && testee.compare(test[i - 1]) <= 0) + errln(testee + " appears in an out-of-order position in the list."); } - test = Locale::getISOCountries(testCount); + test = Locale::getISOCountries(); UnicodeString spotCheck2 [] = { "US", "CA", "GB", "FR", "DE", "IT", "JP", "KR", "CN", "TW", "TH" }; int32_t spot2Len = 11; - + for(testCount=0;test[testCount];testCount++) + ; if (testCount != 239) errln("Expected getISOLanguages to return 238 languages; it returned" + testCount); @@ -714,20 +721,26 @@ LocaleTest::TestGetLangsAndCountries() for (i = 0; i < spot2Len; i++) { int32_t j; for (j = 0; j < testCount; j++) - if (test[j] == spotCheck2[i]) + { + UnicodeString testee(test[j],""); + + if (testee == spotCheck2[i]) break; - if (j == testCount || test[j] != spotCheck2[i]) + } + UnicodeString testee(test[j],""); + if (j == testCount || testee != spotCheck2[i]) errln("Couldn't find " + spotCheck2[i] + " in country list."); } } for (i = 0; i < testCount; i++) { - UnicodeString uc(test[i]); - if (test[i] != uc.toUpper()) - errln(test[i] + " is not all upper case."); - if (test[i].length() != 2) - errln(test[i] + " is not two characters long."); - if (i > 0 && test[i].compare(test[i - 1]) <= 0) - errln(test[i] + " appears in an out-of-order position in the list."); + UnicodeString testee(test[i],""); + UnicodeString uc(test[i],""); + if (testee != uc.toUpper()) + errln(testee + " is not all upper case."); + if (testee.length() != 2) + errln(testee + " is not two characters long."); + if (i > 0 && testee.compare(test[i - 1]) <= 0) + errln(testee + " appears in an out-of-order position in the list."); } } @@ -850,7 +863,7 @@ LocaleTest::TestSimpleDisplayNames() // fallback behavior, combination of language and country names to form locale // names, and other stuff like that. This test just checks specific language // and country codes to make sure we have the correct names for them. - UnicodeString languageCodes [] = { "he", "id", "iu", "ug", "yi", "za" }; + char languageCodes[] [4] = { "he", "id", "iu", "ug", "yi", "za" }; UnicodeString languageNames [] = { "Hebrew", "Indonesian", "Inukitut", "Uighur", "Yiddish", "Zhuang" }; @@ -859,7 +872,7 @@ LocaleTest::TestSimpleDisplayNames() Locale l(languageCodes[i], "", ""); l.getDisplayLanguage(Locale::US, test); if (test != languageNames[i]) - errln("Got wrong display name for " + languageCodes[i] + ": Expected \"" + + errln("Got wrong display name for " + UnicodeString(languageCodes[i]) + ": Expected \"" + languageNames[i] + "\", got \"" + test + "\"."); } } @@ -872,34 +885,36 @@ LocaleTest::TestUninstalledISO3Names() { // This test checks to make sure getISO3Language and getISO3Country work right // even for locales that are not installed. - UnicodeString iso2Languages [] = { "am", "ba", "fy", "mr", "rn", + const char iso2Languages [][4] = { "am", "ba", "fy", "mr", "rn", "ss", "tw", "zu" }; - UnicodeString iso3Languages [] = { "amh", "bak", "fry", "mar", "run", + const char iso3Languages [][5] = { "amh", "bak", "fry", "mar", "run", "ssw", "twi", "zul" }; int32_t i; for (i = 0; i < 8; i++) { - UnicodeString test; + UErrorCode err = U_ZERO_ERROR; + + UnicodeString test; Locale l(iso2Languages[i], "", ""); - l.getISO3Language(test); - if(test != iso3Languages[i]) - errln("Got wrong ISO3 code for " + iso2Languages[i] + ": Expected \"" + - iso3Languages[i] + "\", got \"" + test + "\"."); + test = l.getISO3Language(); + if((test != iso3Languages[i]) || U_FAILURE(err)) + errln("Got wrong ISO3 code for " + UnicodeString(iso2Languages[i]) + ": Expected \"" + + iso3Languages[i] + "\", got \"" + test + "\"." + UnicodeString(u_errorName(err))); } - UnicodeString iso2Countries [] = { "AF", "BW", "KZ", "MO", "MN", + char iso2Countries [][4] = { "AF", "BW", "KZ", "MO", "MN", "SB", "TC", "ZW" }; - UnicodeString iso3Countries [] = { "AFG", "BWA", "KAZ", "MAC", "MNG", + char iso3Countries [][4] = { "AFG", "BWA", "KAZ", "MAC", "MNG", "SLB", "TCA", "ZWE" }; for (i = 0; i < 8; i++) { - UnicodeString test; + UErrorCode err = U_ZERO_ERROR; Locale l("", iso2Countries[i], ""); - l.getISO3Country(test); + UnicodeString test(l.getISO3Country(), ""); if (test != iso3Countries[i]) - errln("Got wrong ISO3 code for " + iso2Countries[i] + ": Expected \"" + - iso3Countries[i] + "\", got \"" + test + "\"."); + errln("Got wrong ISO3 code for " + UnicodeString(iso2Countries[i]) + ": Expected \"" + + UnicodeString(iso3Countries[i]) + "\", got \"" + test + "\"." + u_errorName(err)); } } @@ -973,7 +988,7 @@ LocaleTest::TestAtypicalLocales() { errln("Lookup in English failed: expected \"" + englishDisplayNames[i] + "\", got \"" + name + "\""); - logln("Locale name was-> " + localesToTest[i].getName(name)); + logln("Locale name was-> " + (name=localesToTest[i].getName())); } } @@ -1079,7 +1094,7 @@ LocaleTest::TestEuroSupport() for (int32_t i=0; i < locCount; ++i) { Locale loc = locales[i]; UnicodeString temp; - if (loc.getVariant(temp).indexOf(EURO_VARIANT) >= 0) { + if ( (temp=loc.getVariant()).indexOf(EURO_VARIANT) >= 0) { NumberFormat *nf = NumberFormat::createCurrencyInstance(loc, status); UnicodeString pos; nf->format(271828.182845, pos); @@ -1087,11 +1102,11 @@ LocaleTest::TestEuroSupport() nf->format(-271828.182845, neg); if (pos.indexOf(EURO_CURRENCY) >= 0 && neg.indexOf(EURO_CURRENCY) >= 0) { - logln("Ok: " + loc.getName(temp) + + logln("Ok: " + (temp=loc.getName()) + ": " + pos + " / " + neg); } else { - errln("Fail: " + loc.getName(temp) + + errln("Fail: " + (temp=loc.getName()) + " formats without " + EURO_CURRENCY + ": " + pos + " / " + neg + "\n*** THIS FAILURE MAY ONLY MEAN THAT LOCALE DATA HAS CHANGED ***"); @@ -1118,7 +1133,7 @@ LocaleTest::TestToString() { Locale("xx", "YY", "ZZ"), }; - UnicodeString DATA_S [] = { + const char DATA_S [][20] = { "xx", "_YY", "__ZZ", @@ -1129,12 +1144,15 @@ LocaleTest::TestToString() { }; for (int32_t i=0; i < 7; ++i) { - UnicodeString name; - if (DATA[i].getName(name) != DATA_S[i]) { - errln("Fail: Locale.getName(), got:" + name + ", expected: " + DATA_S[i]); + const char *name; + name = DATA[i].getName(); + + if (strcmp(name, DATA_S[i]) != 0) + { + errln("Fail: Locale.getName(), got:" + UnicodeString(name) + ", expected: " + DATA_S[i]); } else - logln("Pass: Locale.getName(), got:" + name ); + logln("Pass: Locale.getName(), got:" + UnicodeString(name) ); } } @@ -1212,20 +1230,17 @@ LocaleTest::Test4143951() void LocaleTest::Test4147315() { + UnicodeString temp; // Try with codes that are the wrong length but happen to match text // at a valid offset in the mapping table Locale locale("aaa", "CCC"); - //try { - UnicodeString result; - UErrorCode err = U_ZERO_ERROR; - locale.getISO3Country(result, err); + const char *result = locale.getISO3Country(); - UnicodeString temp; - if(U_SUCCESS(err)) - errln("ERROR: getISO3Country() returns: " + result + - " for locale '" + locale.getName(temp) + "' rather than exception" ); - //} catch(MissingResourceException e) { } + // Change to conform to C api usage + if((result==NULL)||(result[0] != 0)) + errln("ERROR: getISO3Country() returns: " + UnicodeString(result,"") + + " for locale '" + (temp=locale.getName()) + "' rather than exception" ); } /** @@ -1236,20 +1251,17 @@ LocaleTest::Test4147315() void LocaleTest::Test4147317() { + UnicodeString temp; // Try with codes that are the wrong length but happen to match text // at a valid offset in the mapping table Locale locale("aaa", "CCC"); - //try { - UnicodeString result; - UErrorCode err = U_ZERO_ERROR; - locale.getISO3Language(result, err); + const char *result = locale.getISO3Language(); - UnicodeString temp; - if(U_SUCCESS(err)) - errln("ERROR: getISO3Language() returns: " + result + - " for locale '" + locale.getName(temp) + "' rather than exception" ); - //} catch(MissingResourceException e) { } + // Change to conform to C api usage + if((result==NULL)||(result[0] != 0)) + errln("ERROR: getISO3Language() returns: " + UnicodeString(result,"") + + " for locale '" + (temp=locale.getName()) + "' rather than exception" ); } /* diff --git a/icu4c/source/test/intltest/miscdtfm.cpp b/icu4c/source/test/intltest/miscdtfm.cpp index e48c273cb14..e59b4af25af 100644 --- a/icu4c/source/test/intltest/miscdtfm.cpp +++ b/icu4c/source/test/intltest/miscdtfm.cpp @@ -48,7 +48,7 @@ DateFormatMiscTests::failure(UErrorCode status, const char* msg) } /* - * @test @(#)$RCSfile: miscdtfm.cpp,v $ $Revision: 1.7 $ $Date: 2000/01/15 01:58:57 $ + * @test @(#)$RCSfile: miscdtfm.cpp,v $ $Revision: 1.8 $ $Date: 2000/04/15 21:28:17 $ * * @bug 4097450 */ @@ -111,7 +111,7 @@ DateFormatMiscTests::test4097450() UErrorCode status = U_ZERO_ERROR; SimpleDateFormat *formatter; - SimpleDateFormat *resultFormatter = new SimpleDateFormat("yyyy", status); + SimpleDateFormat *resultFormatter = new SimpleDateFormat((UnicodeString)"yyyy", status); failure(status, "new SimpleDateFormat"); logln("Format\tSource\tResult"); @@ -140,7 +140,7 @@ DateFormatMiscTests::test4097450() } /* - * @test @(#)$RCSfile: miscdtfm.cpp,v $ $Revision: 1.7 $ $Date: 2000/01/15 01:58:57 $ + * @test @(#)$RCSfile: miscdtfm.cpp,v $ $Revision: 1.8 $ $Date: 2000/04/15 21:28:17 $ * * @bug 4099975 */ diff --git a/icu4c/source/test/intltest/nmfmapts.cpp b/icu4c/source/test/intltest/nmfmapts.cpp index 914aaa322ee..65ca7adb242 100644 --- a/icu4c/source/test/intltest/nmfmapts.cpp +++ b/icu4c/source/test/intltest/nmfmapts.cpp @@ -165,8 +165,7 @@ void IntlTestNumberFormatAPI::testAPI(char *par) const Locale *locales = NumberFormat::getAvailableLocales(count); logln((UnicodeString) "Got " + count + " locales" ); for(int32_t i = 0; i < count; i++) { - UnicodeString name; - name = locales[i].getName(name); + UnicodeString name(locales[i].getName(),""); logln(name); } diff --git a/icu4c/source/test/intltest/numrgts.cpp b/icu4c/source/test/intltest/numrgts.cpp index 37817374b4a..f38e9126d14 100644 --- a/icu4c/source/test/intltest/numrgts.cpp +++ b/icu4c/source/test/intltest/numrgts.cpp @@ -663,7 +663,7 @@ void NumberFormatRegressionTest::Test4092480 (void) * interpreted as monetary separator if currency symbol is seen! */ void NumberFormatRegressionTest::Test4087244 (void) { - Locale *de = new Locale(UnicodeString("pt"), UnicodeString("PT")); + Locale *de = new Locale("pt","PT"); UErrorCode status = U_ZERO_ERROR; NumberFormat *nf = NumberFormat::createCurrencyInstance(*de, status); if (nf->getDynamicClassID() != DecimalFormat::getStaticClassID()) { @@ -1392,7 +1392,7 @@ void NumberFormatRegressionTest::Test4122840(void) //if (pattern.indexOf("\u00A4") == -1 ) { UnicodeString temp; if (pattern.indexOf(foo) == -1 ) { - errln(UnicodeString("Currency format for ") + locales[i].getName(temp) + + errln(UnicodeString("Currency format for ") + UnicodeString(locales[i].getName()) + " does not contain generic currency symbol:" + pattern ); } @@ -1442,7 +1442,7 @@ void NumberFormatRegressionTest::Test4122840(void) result2 = fmt2->format(1.111, result2, pos); if (result1 != result2) { - errln("Results for " + locales[i].getName(temp) + " differ: " + + errln("Results for " + (temp=locales[i].getName()) + " differ: " + result1 + " vs " + result2); } diff --git a/icu4c/source/test/intltest/regcoll.cpp b/icu4c/source/test/intltest/regcoll.cpp index d867824fe57..3fd33464e90 100644 --- a/icu4c/source/test/intltest/regcoll.cpp +++ b/icu4c/source/test/intltest/regcoll.cpp @@ -550,7 +550,7 @@ void CollationRegressionTest::Test4079231(char *par) void CollationRegressionTest::Test4078588(char *par) { UErrorCode status = U_ZERO_ERROR; - RuleBasedCollator *rbc = new RuleBasedCollator("< a < bb", status); + RuleBasedCollator *rbc = new RuleBasedCollator((UnicodeString)"< a < bb", status); if (rbc == NULL || U_FAILURE(status)) { @@ -935,7 +935,7 @@ void CollationRegressionTest::Test4141640(char *par) UnicodeString msg, localeName; msg += "Could not create collator for locale "; - msg += locales[i].getName(localeName); + msg += locales[i].getName(); errln(msg); } diff --git a/icu4c/source/test/intltest/tsdate.cpp b/icu4c/source/test/intltest/tsdate.cpp index 661b3add201..32bfc8a0439 100644 --- a/icu4c/source/test/intltest/tsdate.cpp +++ b/icu4c/source/test/intltest/tsdate.cpp @@ -233,7 +233,7 @@ void IntlTestDateFormat::testAvailableLocales(char *par) for (int32_t i=0; igetTime(status); bool_t inDaylightTime = testTZ->inDaylightTime(testDate, status); - SimpleDateFormat *sdf = new SimpleDateFormat("MM/dd/yyyy HH:mm", status); + SimpleDateFormat *sdf = new SimpleDateFormat((UnicodeString)"MM/dd/yyyy HH:mm", status); sdf->setCalendar(*testCal); UnicodeString inDaylightTimeString; diff --git a/icu4c/source/test/intltest/tztest.cpp b/icu4c/source/test/intltest/tztest.cpp index 21247468727..fd728b0666f 100644 --- a/icu4c/source/test/intltest/tztest.cpp +++ b/icu4c/source/test/intltest/tztest.cpp @@ -897,12 +897,12 @@ TimeZoneTest::TestDisplayName() // *** REVISIT SRL how in the world do I check this? looks java specific. // Now be smart -- check to see if zh resource is even present. // If not, we expect the en fallback behavior. - ResourceBundle enRB(Locale::getDataDirectory(), + ResourceBundle enRB(u_getDataDirectory(), Locale::ENGLISH, status); if(U_FAILURE(status)) errln("Couldn't get ResourceBundle for en"); - ResourceBundle zhRB(Locale::getDataDirectory(), + ResourceBundle zhRB(u_getDataDirectory(), zh_CN, status); //if(U_FAILURE(status)) // errln("Couldn't get ResourceBundle for zh_CN");