ICU-64243.0.1.tar.gz

[apple/icu.git] / icuSources / test / intltest / canittst.cpp

diff --git a/icuSources/test/intltest/canittst.cpp b/icuSources/test/intltest/canittst.cpp
index fe85b1fac3fefca1bae7bbaabb1dedacdf91172a..0a6baebb1360db61a7c84a2012678fc4362b7d5c 100644 (file)
--- a/icuSources/test/intltest/canittst.cpp
+++ b/icuSources/test/intltest/canittst.cpp
@@ -1,6 +1,8 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /********************************************************************
  * COPYRIGHT: 
- * Copyright (c) 2002-2011, International Business Machines Corporation and
+ * Copyright (c) 2002-2016, International Business Machines Corporation and
  * others. All Rights Reserved.
  ********************************************************************
  *
@@ -13,6 +15,7 @@
 #if !UCONFIG_NO_NORMALIZATION
 
 #include "intltest.h"
+#include "cmemory.h"
 #include "cstring.h"
 #include "canittst.h"
 #include "unicode/caniter.h"
@@ -20,8 +23,6 @@
 #include "unicode/uchar.h"
 #include "hash.h"
 
-#define ARRAY_LENGTH(array) ((int32_t)(sizeof (array) / sizeof (*array)))
-
 #define CASE(id,test) case id:                          \
                           name = #test;                 \
                           if (exec) {                   \
@@ -148,7 +149,7 @@ void CanonicalIteratorTest::TestBasic() {
     int32_t i = 0;
     CanonicalIterator it("", status);
     if(U_SUCCESS(status)) {
-      for (i = 0; i < ARRAY_LENGTH(testArray); ++i) {
+      for (i = 0; i < UPRV_LENGTHOF(testArray); ++i) {
           //logln("Results for: " + name.transliterate(testArray[i]));
           UnicodeString testStr = CharsToUnicodeString(testArray[i][0]);
           it.setSource(testStr, status);
@@ -163,7 +164,7 @@ void CanonicalIteratorTest::TestBasic() {
               //logln(++counter + ": " + hex.transliterate(result));
               //logln(" = " + name.transliterate(result));
           }
-          expectEqual(i + ": ", testStr, collectionToString(set), CharsToUnicodeString(testArray[i][1]));
+          expectEqual(i + UnicodeString(": "), testStr, collectionToString(set), CharsToUnicodeString(testArray[i][1]));
 
       }
     } else {
@@ -263,7 +264,7 @@ UnicodeString CanonicalIteratorTest::collectionToString(Hashtable *col) {
     int32_t i = 0;
 
     const UHashElement *ne = NULL;
-    int32_t el = -1;
+    int32_t el = UHASH_FIRST;
     //Iterator it = basic.iterator();
     ne = col->nextElement(el);
     //while (it.hasNext())