ICU-2947 improve testing

X-SVN-Rev: 13247
This commit is contained in:
Ram Viswanadha 2003-09-30 18:23:06 +00:00
parent fbc9235cb7
commit 8efb4c9ef0
3 changed files with 5 additions and 7 deletions

View file

@ -70,9 +70,9 @@ static const char* rawData2[LOCALE_INFO_SIZE][LOCALE_SIZE] = {
/* display country (French) */
{ "\\u00C9tats-Unis", "France", "Espagne", "Gr\\u00E8ce", "Norv\\u00E8ge" },
/* display variant (French) */
{ "", "", "", "", "Nynorsk" },
{ "", "", "", "", "NY" },
/* display name (French) */
{ "anglais (\\u00C9tats-Unis)", "fran\\u00E7ais (France)", "catalan (Espagne)", "grec (Gr\\u00E8ce)", "norv\\u00E9gien (Norv\\u00E8ge, Nynorsk)" },
{ "anglais (\\u00C9tats-Unis)", "fran\\u00E7ais (France)", "catalan (Espagne)", "grec (Gr\\u00E8ce)", "norv\\u00E9gien (Norv\\u00E8ge, NY)" },
/* display language (Catalan) */
{ "angl\\u00E8s", "franc\\u00E8s", "catal\\u00E0", "grec", "noruec" },
@ -1226,9 +1226,7 @@ TestKeyInRootRecursive(UResourceBundle *root, const char *rootName,
UBool isRoot = strcmp(rootName, "root") == 0;
UBool isSpecial = FALSE;
if (currentBundleKey) {
isSpecial = strcmp(currentBundleKey, "Currencies") == 0
|| strcmp(currentBundleKey, "Languages") == 0
|| strcmp(currentBundleKey, "Countries") == 0;
isSpecial = strcmp(currentBundleKey, "Currencies") == 0;
}
if ((isRoot && !isSpecial)

View file

@ -427,7 +427,7 @@ static void TestFallback()
status = U_ZERO_ERROR;
/* OK first one. This should be a Default value. */
subResource = ures_getByKey(fr_FR, "LocaleScript", NULL, &status);
subResource = ures_getByKey(fr_FR, "CurrencyMap", NULL, &status);
if(status != U_USING_DEFAULT_WARNING)
{
log_data_err("Expected U_USING_DEFAULT_ERROR when trying to get LocaleScript from fr_FR, got %s\n",

View file

@ -1841,7 +1841,7 @@ static void TestFallback()
status = U_ZERO_ERROR;
/* OK first one. This should be a Default value. */
subResource = ures_getByKey(fr_FR, "LocaleScript", NULL, &status);
subResource = ures_getByKey(fr_FR, "CurrencyMap", NULL, &status);
if(status != U_USING_DEFAULT_WARNING)
{
log_data_err("Expected U_USING_DEFAULT_ERROR when trying to get LocaleScript from fr_FR, got %s\n",