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

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

Issue 845603002: Update ICU to 54.1 step 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@master
Patch Set: remove unusued directories Created 5 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/bocu1tst.c ('k') | source/test/cintltst/capitst.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/test/cintltst/callcoll.c
diff --git a/source/test/cintltst/callcoll.c b/source/test/cintltst/callcoll.c
index 6bbe22938ef9363020536434b91573a551b978ff..8e7f9a576f9d1ff04176c044653b3391cfab0421 100644
--- a/source/test/cintltst/callcoll.c
+++ b/source/test/cintltst/callcoll.c
@@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
- * Copyright (c) 1997-2013, International Business Machines Corporation and
+ * Copyright (c) 1997-2014, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/*******************************************************************************
@@ -1012,6 +1012,13 @@ static void TestJB1401(void)
*/
static void TestVariableTop(void)
{
+#if 0
+ /*
+ * Starting with ICU 53, setting the variable top via a pseudo relation string
+ * is not supported any more.
+ * It was replaced by the [maxVariable symbol] setting.
+ * See ICU tickets #9958 and #8032.
+ */
static const char str[] = "&z = [variable top]";
int len = strlen(str);
UChar rules[sizeof(str)];
@@ -1078,6 +1085,7 @@ static void TestVariableTop(void)
ucol_close(myCollation);
enCollation = NULL;
myCollation = NULL;
+#endif
}
/**
@@ -1167,13 +1175,13 @@ TestInvalidRules(){
"& C < ch, cH, & Ch[variable top]"
};
static const char* preContextArr[MAX_ERROR_STATES] = {
- "his should fail",
- "& C < ch, cH, ",
+ " C < ch, cH, Ch",
+ "& C < ch, cH",
};
static const char* postContextArr[MAX_ERROR_STATES] = {
- "<d",
- " Ch[variable t"
+ "[this should fa",
+ ", & Ch[variable"
};
int i;
@@ -1194,10 +1202,12 @@ TestInvalidRules(){
coll = ucol_openRules(rules,u_strlen(rules),UCOL_OFF,UCOL_DEFAULT_STRENGTH,&parseError,&status);
(void)coll; /* Suppress set but not used warning. */
if(u_strcmp(parseError.preContext,preContextExp)!=0){
- log_err_status(status, "preContext in UParseError for ucol_openRules does not match\n");
+ log_err_status(status, "preContext in UParseError for ucol_openRules does not match: \"%s\"\n",
+ aescstrdup(parseError.preContext, -1));
}
if(u_strcmp(parseError.postContext,postContextExp)!=0){
- log_err_status(status, "postContext in UParseError for ucol_openRules does not match\n");
+ log_err_status(status, "postContext in UParseError for ucol_openRules does not match: \"%s\"\n",
+ aescstrdup(parseError.postContext, -1));
}
}
}
@@ -1216,7 +1226,7 @@ TestJitterbug1098(){
"&\\'<\\\\",
"&\\\"<'\\'",
"&'\"'<\\'",
- '\0'
+ NULL
};
const UCollationResult results1098[] = {
@@ -1308,6 +1318,11 @@ static void TestJ5298(void)
const char *keywordValue = NULL;
log_verbose("Number of collator locales returned : %i \n", ucol_countAvailable());
values = ucol_getKeywordValues("collation", &status);
+ while ((keywordValue = uenum_next(values, NULL, &status)) != NULL) {
+ if (strncmp(keywordValue, "private-", 8) == 0) {
+ log_err("ucol_getKeywordValues() returns private collation keyword: %s\n", keywordValue);
+ }
+ }
for (i = 0; i < ucol_countAvailable(); i++) {
uenum_reset(values, &status);
while ((keywordValue = uenum_next(values, NULL, &status)) != NULL) {
« no previous file with comments | « source/test/cintltst/bocu1tst.c ('k') | source/test/cintltst/capitst.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698