AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-882 Don't use the deprecated API.

Browse Source 
X-SVN-Rev: 3911
This commit is contained in:
George Rhoten 2001-03-06 02:04:14 +00:00
parent bf2a3943d4
commit cbf7889f1d
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
icu4c/source/test/intltest/loctest.cpp
View File

@ -218,6 +218,7 @@ void LocaleTest::TestBasicGetters() {
}
/*tests for the depracted API*/
#ifdef ICU_LOCID_USE_DEPRECATES
for (i = 0; i <= MAX_LOCALES; i++) {
Locale testLocale((UnicodeString)rawData[LANG][i], (UnicodeString)rawData[CTRY][i], (UnicodeString)rawData[VAR][i]);
logln("Testing " + (UnicodeString)testLocale.getName() + "...");
@ -249,6 +250,7 @@ void LocaleTest::TestBasicGetters() {
if (testLocale.getVariant(temp).length() != 0 )
errln(" Variant code mismatch: something versus \"\"");
}
#endif
/*----------*/
// NOTE: There used to be a special test for locale names that had language or
// country codes that were longer than two letters. The new version of Locale
@ -286,6 +288,7 @@ void LocaleTest::TestSimpleResourceInfo() {
}
/*tests for the deprecated API*/
#ifdef ICU_LOCID_USE_DEPRECATES
for (i = 0; i <= MAX_LOCALES; i++) {
Locale testLocale((UnicodeString)rawData[LANG][i], (UnicodeString)rawData[CTRY][i], (UnicodeString)rawData[VAR][i]);
logln("Testing " + (testLocale.getName(temp)) + "...");
@ -303,10 +306,11 @@ void LocaleTest::TestSimpleResourceInfo() {
}
err = U_ZERO_ERROR;
}
#endif
Locale locale((UnicodeString)"en");
if(locale.getName(temp) != (UnicodeString)"en" ||
locale.getLanguage(temp) != (UnicodeString)"en"){
Locale locale("en");
if(strcmp(locale.getName(), "en") != 0||
strcmp(locale.getLanguage(), "en") != 0) {
errln("construction of Locale(en) failed\n");
}
/*-----*/
@ -816,6 +820,7 @@ LocaleTest::TestGetLangsAndCountries()
void
LocaleTest::Test4126880()
{
#ifdef ICU_LOCID_USE_DEPRECATES
const UnicodeString *test;
int32_t testCount=0;
@ -842,7 +847,9 @@ LocaleTest::Test4126880()
errln((UnicodeString)"There is an error in getISOLanguages " + testCount);
}
/*----------*/
#else
logln("Skipping Test4126880 for deprecated API");
#endif
}
/**