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 5fe7c174e49ce3ec020b8354dd736b8f3969dae2..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: 

- * Copyright (c) 2002-2012, International Business Machines Corporation and
+ * Copyright (c) 2002-2016, International Business Machines Corporation and

  * others. All Rights Reserved.
  ********************************************************************
  *
  * others. All Rights Reserved.
  ********************************************************************
  *


@@ -13,6 +15,7 @@
 #if !UCONFIG_NO_NORMALIZATION
 
 #include "intltest.h"
 #if !UCONFIG_NO_NORMALIZATION
 
 #include "intltest.h"

+#include "cmemory.h"

 #include "cstring.h"
 #include "canittst.h"
 #include "unicode/caniter.h"
 #include "cstring.h"
 #include "canittst.h"
 #include "unicode/caniter.h"


@@ -20,8 +23,6 @@
 #include "unicode/uchar.h"
 #include "hash.h"
 
 #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) {                   \
 #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)) {
     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);
           //logln("Results for: " + name.transliterate(testArray[i]));
           UnicodeString testStr = CharsToUnicodeString(testArray[i][0]);
           it.setSource(testStr, status);


@@ -263,7 +264,7 @@ UnicodeString CanonicalIteratorTest::collectionToString(Hashtable *col) {
     int32_t i = 0;
 
     const UHashElement *ne = NULL;
     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()) 
     //Iterator it = basic.iterator();
     ne = col->nextElement(el);
     //while (it.hasNext())