Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(15)

Unified Diff: source/test/cintltst/creststn.c

Issue 1621843002: ICU 56 update step 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@561
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/test/cintltst/cnumtst.c ('k') | source/test/cintltst/cstrcase.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/test/cintltst/creststn.c
diff --git a/source/test/cintltst/creststn.c b/source/test/cintltst/creststn.c
index bd24b44876d82ec78d1b5ef129ac495722b37ec2..a17270ad7c9be615dce806428b032a0c9a2382f0 100644
--- a/source/test/cintltst/creststn.c
+++ b/source/test/cintltst/creststn.c
@@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
- * Copyright (c) 1997-2014, International Business Machines Corporation and
+ * Copyright (c) 1997-2015, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/*******************************************************************************
@@ -271,7 +271,7 @@ static void TestErrorCodes(void) {
if(U_SUCCESS(status) && r != NULL) {
status = U_USING_DEFAULT_WARNING;
- r2 = ures_getByKey(r, "LocaleScript", NULL, &status); /* LocaleScript lives in ti */
+ r2 = ures_getByKey(r, "ExemplarCharacters", NULL, &status); /* ExemplarCharacters lives in ti */
checkStatus(__LINE__, U_USING_FALLBACK_WARNING, status);
}
ures_close(r);
@@ -424,14 +424,10 @@ static void TestDecodedBundle(){
/* pre-flight */
int32_t num =0;
const char *testdatapath = loadTestData(&error);
- resB = ures_open(testdatapath, "iscii", &error);
+ resB = ures_open(testdatapath, "encoded", &error);
srcFromRes=tres_getString(resB,-1,"str",&len,&error);
if(U_FAILURE(error)){
-#if UCONFIG_NO_LEGACY_CONVERSION
- log_info("Couldn't load iscii.bin from test data bundle, (because UCONFIG_NO_LEGACY_CONVERSION is turned on)\n");
-#else
- log_data_err("Could not find iscii.bin from test data bundle. Error: %s\n", u_errorName(error));
-#endif
+ log_data_err("Could not find encoded.res from test data bundle. Error: %s\n", u_errorName(error));
ures_close(resB);
return;
}
@@ -2128,7 +2124,7 @@ static void TestFallback()
UResourceBundle* tResB;
UResourceBundle* zoneResource;
const UChar* version = NULL;
- static const UChar versionStr[] = { 0x0032, 0x002E, 0x0031, 0x002E, 0x0036, 0x002E, 0x0036, 0x0039, 0x0000}; // 2.1.6.69
+ static const UChar versionStr[] = { 0x0032, 0x002E, 0x0031, 0x002E, 0x0031, 0x0039, 0x002E, 0x0031, 0x0034, 0x0000}; // 2.1.19.14
if(err != U_ZERO_ERROR){
log_data_err("Expected U_ZERO_ERROR when trying to test no_NO_NY aliased to nn_NO for Version err=%s\n",u_errorName(err));
@@ -2213,9 +2209,9 @@ static void TestResourceLevelAliasing(void) {
status = U_ZERO_ERROR;
}
/* testing referencing/composed alias */
- uk = ures_findResource("ja/LocaleScript/2", uk, &status);
+ uk = ures_findResource("ja/calendar/gregorian/DateTimePatterns/2", uk, &status);
if((uk == NULL) || U_FAILURE(status)) {
- log_err_status(status, "Couldn't findResource('ja/LocaleScript/2') err %s\n", u_errorName(status));
+ log_err_status(status, "Couldn't findResource('ja/calendar/gregorian/DateTimePatterns/2') err %s\n", u_errorName(status));
goto cleanup;
}
@@ -2234,7 +2230,7 @@ static void TestResourceLevelAliasing(void) {
}
checkStatus(__LINE__, U_ZERO_ERROR, status);
- tb = ures_getByKey(aliasB, "LocaleScript", tb, &status);
+ tb = ures_getByKey(aliasB, "DateTimePatterns", tb, &status);
checkStatus(__LINE__, U_ZERO_ERROR, status);
tb = ures_getByIndex(tb, 2, tb, &status);
checkStatus(__LINE__, U_ZERO_ERROR, status);
@@ -2410,14 +2406,14 @@ static void TestDirectAccess(void) {
}
}
- t = ures_findResource("ja/LocaleScript", t, &status);
+ t = ures_findResource("ja/ExemplarCharacters", t, &status);
if(U_FAILURE(status)) {
log_data_err("Couldn't access keyed resource, error %s\n", u_errorName(status));
status = U_ZERO_ERROR;
} else {
key = ures_getKey(t);
- if(strcmp(key, "LocaleScript")!=0) {
- log_err("Got a strange key, expected 'LocaleScript', got %s\n", key);
+ if(strcmp(key, "ExemplarCharacters")!=0) {
+ log_err("Got a strange key, expected 'ExemplarCharacters', got %s\n", key);
}
}
« no previous file with comments | « source/test/cintltst/cnumtst.c ('k') | source/test/cintltst/cstrcase.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698