ICU-64260.0.1.tar.gz

[apple/icu.git] / icuSources / test / cintltst / capitst.c

diff --git a/icuSources/test/cintltst/capitst.c b/icuSources/test/cintltst/capitst.c
index 56f3275bd2fbf620feb671446960f5b2ca99f5d4..616e2e7eef83d7ea51fc710e2bde073b89c9b119 100644 (file)
--- a/icuSources/test/cintltst/capitst.c
+++ b/icuSources/test/cintltst/capitst.c
@@ -1,3 +1,5 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /********************************************************************
  * Copyright (c) 1997-2016, International Business Machines
  * Corporation and others. All Rights Reserved.
@@ -304,7 +306,7 @@ void TestProperty()
       log_err("Testing ucol_getVersion() - unexpected result: %02x.%02x.%02x.%02x\n",
               versionArray[0], versionArray[1], versionArray[2], versionArray[3]);
     } else {
-      log_verbose("ucol_getVersion() result: %02x.%02x.%02x.%02x\n",
+      log_info("ucol_getVersion() en_US result: %02x.%02x.%02x.%02x\n",
                   versionArray[0], versionArray[1], versionArray[2], versionArray[3]);
     }
 
@@ -2045,7 +2047,11 @@ static void TestShortString(void)
         {"LDE_RDE_KPHONEBOOK_T0024_ZLATN","KPHONEBOOK_LDE", "de@collation=phonebook", U_USING_FALLBACK_WARNING, 0, 0 },
 
         {"LEN_RUS_NO_AS_S4","AS_LROOT_NO_S4", NULL, U_USING_DEFAULT_WARNING, 0, 0 },
-        {"LDE_VPHONEBOOK_EO_SI","EO_KPHONEBOOK_LDE_SI", "de@collation=phonebook", U_ZERO_ERROR, 0, 0 },
+        // uloc_canonicalize("de__PHONEBOOK") used to return "de@collation=phonebook"
+        // and we got U_ZERO_ERROR.
+        // Since ICU-20187 "drop support for long-obsolete locale ID variants..."
+        // we actually load the "de__PHONEBOOK" bundle and fall back to "de".
+        {"LDE_VPHONEBOOK_EO_SI","EO_KPHONEBOOK_LDE_SI", "de@collation=phonebook", U_USING_FALLBACK_WARNING, 0, 0 },
         {"LDE_Kphonebook","KPHONEBOOK_LDE", "de@collation=phonebook", U_ZERO_ERROR, 0, 0 },
         {"Xqde_DE@collation=phonebookq_S3_EX","KPHONEBOOK_LDE", "de@collation=phonebook", U_USING_FALLBACK_WARNING, 0, 0 },
         {"LFR_FO", "FO_LROOT", NULL, U_USING_DEFAULT_WARNING, 0, 0 },