ICU-57131.0.1.tar.gz

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

diff --git a/icuSources/test/cintltst/encoll.c b/icuSources/test/cintltst/encoll.c
index 38d5be446fdbc1d250701754c3f9f4177c5c1612..f0d3e862e23ba45006c6252c1b56fb445e621909 100644 (file)
--- a/icuSources/test/cintltst/encoll.c
+++ b/icuSources/test/cintltst/encoll.c
@@ -1,6 +1,6 @@
 /********************************************************************
  * COPYRIGHT: 
- * Copyright (c) 1997-2001, International Business Machines Corporation and
+ * Copyright (c) 1997-2016, International Business Machines Corporation and
  * others. All Rights Reserved.
  ********************************************************************/
 /********************************************************************************
@@ -31,6 +31,7 @@
 #include "encoll.h"
 #include "ccolltst.h"
 #include "callcoll.h"
+#include "cmemory.h"
 #include "unicode/ustring.h"
 
 static UCollator *myCollation = NULL;
@@ -240,9 +241,9 @@ const static UChar testAcute[][MAX_TOKEN_LEN] = {
 
 static const UChar testMore[][MAX_TOKEN_LEN] = {
     {(UChar)0x0061 /* 'a' */, (UChar)0x0065 /* 'e' */, 0},
-    {(UChar)0x0061 /* 'a' */, (UChar)0x0066 /* 'f' */, 0},
     { 0x00E6, 0},
     { 0x00C6, 0},
+    {(UChar)0x0061 /* 'a' */, (UChar)0x0066 /* 'f' */, 0},
     {(UChar)0x006F /* 'o' */, (UChar)0x0065 /* 'e' */, 0},
     { 0x0153, 0},
     { 0x0152, 0},
@@ -267,7 +268,7 @@ static void TestTertiary( )
     UErrorCode status = U_ZERO_ERROR;
     myCollation = ucol_open("en_US", &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 English Collation with Tertiary strength\n");
@@ -288,7 +289,7 @@ static void TestTertiary( )
         }
    }
     /*test more interesting cases */
-    testMoreSize = sizeof(testMore) / sizeof(testMore[0]);
+    testMoreSize = UPRV_LENGTHOF(testMore);
     for (i = 0; i < testMoreSize; i++)
     {
         for (j = 0; j < testMoreSize; j++)
@@ -309,7 +310,7 @@ static void TestPrimary()
     UErrorCode status = U_ZERO_ERROR;
     myCollation = ucol_open("en_US", &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_setStrength(myCollation, UCOL_PRIMARY);
@@ -328,7 +329,7 @@ static void TestSecondary()
     UErrorCode status = U_ZERO_ERROR;
     myCollation = ucol_open("en_US", &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_setStrength(myCollation, UCOL_SECONDARY);
@@ -340,7 +341,7 @@ static void TestSecondary()
     
 
     /*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++)