ICU-64252.0.1.tar.gz

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

diff --git a/icuSources/test/cintltst/cfrtst.c b/icuSources/test/cintltst/cfrtst.c
index 63a01284f8564f12f6f3cc804b6beb1d37edfaca..de356466e11b809f4427b6603adcdef5d73cb7a3 100644 (file)
--- a/icuSources/test/cintltst/cfrtst.c
+++ b/icuSources/test/cintltst/cfrtst.c
@@ -1,6 +1,8 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /********************************************************************
  * COPYRIGHT: 
- * Copyright (c) 1997-2007, International Business Machines Corporation and
+ * Copyright (c) 1997-2016, International Business Machines Corporation and
  * others. All Rights Reserved.
  ********************************************************************/
 /********************************************************************************
@@ -30,6 +32,7 @@
 #include "ccolltst.h"
 #include "callcoll.h"
 #include "cfrtst.h"
+#include "cmemory.h"
 #include "unicode/ustring.h"
 #include "string.h"
 
@@ -145,9 +148,9 @@ static void TestTertiary( )
 
     int32_t i;
     UErrorCode status = U_ZERO_ERROR;
-    myCollation = ucol_open("fr_FR", &status);
+    myCollation = ucol_open("fr_CA", &status);
     if(U_FAILURE(status) || !myCollation){
-        log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status));
+        log_err_status(status, "ERROR: in creation of rule based collator: %s\n", myErrorName(status));
         return;
     }
 
@@ -156,7 +159,7 @@ static void TestTertiary( )
         log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status));
         return;
     }
-    log_verbose("Testing French Collation with Tertiary strength\n");
+    log_verbose("Testing fr_CA Collation with Tertiary strength\n");
     ucol_setStrength(myCollation, UCOL_QUATERNARY);
     for (i = 0; i < 12 ; i++)
     {
@@ -170,9 +173,9 @@ static void TestSecondary()
     int32_t i,j, testAcuteSize;
     UCollationResult expected=UCOL_EQUAL;
     UErrorCode status = U_ZERO_ERROR;
-    myCollation = ucol_open("fr_FR", &status);
+    myCollation = ucol_open("fr_CA", &status);
     if(U_FAILURE(status)){
-        log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status));
+        log_err_status(status, "ERROR: in creation of rule based collator: %s\n", myErrorName(status));
         return;
     }
     ucol_setAttribute(myCollation, UCOL_STRENGTH, UCOL_SECONDARY, &status);
@@ -180,9 +183,9 @@ static void TestSecondary()
         log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status));
         return;
     }
-    log_verbose("Testing French Collation with Secondary strength\n");
+    log_verbose("Testing fr_CA Collation with Secondary strength\n");
     /*test acute and grave ordering (compare to french collation)*/
-    testAcuteSize = sizeof(testAcute) / sizeof(testAcute[0]);
+    testAcuteSize = UPRV_LENGTHOF(testAcute);
     for (i = 0; i < testAcuteSize; i++)
     {
         for (j = 0; j < testAcuteSize; j++)
@@ -200,12 +203,12 @@ static void TestExtra()
 {
     int32_t i, j;
     UErrorCode status = U_ZERO_ERROR;
-    myCollation = ucol_open("fr_FR", &status);
+    myCollation = ucol_open("fr_CA", &status);
     if(U_FAILURE(status)){
-        log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status));
+        log_err_status(status, "ERROR: in creation of rule based collator: %s\n", myErrorName(status));
         return;
     }
-    log_verbose("Testing French Collation extra with secondary strength\n");
+    log_verbose("Testing fr_CA Collation extra with secondary strength\n");
     ucol_setStrength(myCollation, UCOL_TERTIARY);
     for (i = 0; i < 9 ; i++)
     {
@@ -314,13 +317,13 @@ static void TestGetSortKey() {
     pCollator = ucol_openFromShortString("LFR_AN_CX_EX_FO_HX_NX_S3", 0, NULL, &status);
 
     if (U_FAILURE(status)) {
-        log_err("error opening collator\n");
+        log_data_err("error opening collator -> %s. (Are you missing data?)\n", u_errorName(status));
         return;
     }
 
     lenActualSortKey = ucol_getSortKey(pCollator,
         (const UChar *)pucUTF16,
-        sizeof(pucUTF16) / sizeof(pucUTF16[0]),
+        UPRV_LENGTHOF(pucUTF16),
         pucSortKey,
         LENSORTKEY);