ICU-66108.tar.gz

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

diff --git a/icuSources/test/cintltst/usettest.c b/icuSources/test/cintltst/usettest.c
index 4378e7ff340159706690e1fb6c2dd79466db7c35..d6569642c9edbd2ec2341095d5b3854a3cf3ed7d 100644 (file)
--- a/icuSources/test/cintltst/usettest.c
+++ b/icuSources/test/cintltst/usettest.c
@@ -1,17 +1,18 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /*
 **********************************************************************
-* Copyright (c) 2002-2008, International Business Machines
+* Copyright (c) 2002-2016, International Business Machines
 * Corporation and others.  All Rights Reserved.
 **********************************************************************
 */
 #include "unicode/uset.h"
 #include "unicode/ustring.h"
 #include "cintltst.h"
+#include "cmemory.h"
 #include <stdlib.h>
 #include <string.h>
 
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
-
 #define TEST(x) addTest(root, &x, "uset/" # x)
 
 static void TestAPI(void);
@@ -61,19 +62,19 @@ static void Testj2269() {
 }
 
 static const UChar PAT[] = {91,97,45,99,123,97,98,125,93,0}; /* "[a-c{ab}]" */
-static const int32_t PAT_LEN = (sizeof(PAT) / sizeof(PAT[0])) - 1;
+static const int32_t PAT_LEN = UPRV_LENGTHOF(PAT) - 1;
 
 static const UChar PAT_lb[] = {0x6C, 0x62, 0}; /* "lb" */
-static const int32_t PAT_lb_LEN = (sizeof(PAT_lb) / sizeof(PAT_lb[0])) - 1;
+static const int32_t PAT_lb_LEN = UPRV_LENGTHOF(PAT_lb) - 1;
 
 static const UChar VAL_SP[] = {0x53, 0x50, 0}; /* "SP" */
-static const int32_t VAL_SP_LEN = (sizeof(VAL_SP) / sizeof(VAL_SP[0])) - 1;
+static const int32_t VAL_SP_LEN = UPRV_LENGTHOF(VAL_SP) - 1;
 
 static const UChar STR_bc[] = {98,99,0}; /* "bc" */
-static const int32_t STR_bc_LEN = (sizeof(STR_bc) / sizeof(STR_bc[0])) - 1;
+static const int32_t STR_bc_LEN = UPRV_LENGTHOF(STR_bc) - 1;
 
 static const UChar STR_ab[] = {97,98,0}; /* "ab" */
-static const int32_t STR_ab_LEN = (sizeof(STR_ab) / sizeof(STR_ab[0])) - 1;
+static const int32_t STR_ab_LEN = UPRV_LENGTHOF(STR_ab) - 1;
 
 /**
  * Basic API test for uset.x
@@ -84,6 +85,14 @@ static void TestAPI() {
     UErrorCode ec;
     
     /* [] */
+    set = uset_openEmpty();
+    expect(set, "", "abc{ab}", NULL);
+    uset_close(set);
+
+    set = uset_open(1, 0);
+    expect(set, "", "abc{ab}", NULL);
+    uset_close(set);
+
     set = uset_open(1, 1);
     uset_clear(set);
     expect(set, "", "abc{ab}", NULL);
@@ -278,7 +287,7 @@ static void expectContainment(const USet* set,
                             (isIn ? "contains" : "does not contain"),
                             strCopy);
             } else {
-                log_err("FAIL: %s %s \"%s\"\n", pat,
+                log_data_err("FAIL: %s %s \"%s\" (Are you missing data?)\n", pat,
                         (isIn ? "does not contain" : "contains"),
                         strCopy);
             }
@@ -295,7 +304,7 @@ static void expectContainment(const USet* set,
                             (isIn ? "contains" : "does not contain"),
                             *p);
             } else {
-                log_err("FAIL: %s %s '%c'\n", pat,
+                log_data_err("FAIL: %s %s '%c' (Are you missing data?)\n", pat,
                         (isIn ? "does not contain" : "contains"),
                         *p);
             }
@@ -310,7 +319,7 @@ static void expectContainment(const USet* set,
                                     (isIn ? "contains" : "does not contain"),
                                     rangeStart, rangeEnd);
                     } else {
-                        log_err("FAIL: %s %s U+%04X-U+%04X\n", pat,
+                        log_data_err("FAIL: %s %s U+%04X-U+%04X (Are you missing data?)\n", pat,
                                 (isIn ? "does not contain" : "contains"),
                                 rangeStart, rangeEnd);
                     }
@@ -328,7 +337,7 @@ static void expectContainment(const USet* set,
                         (isIn ? "contains" : "does not contain"),
                         rangeStart, rangeEnd);
         } else {
-            log_err("FAIL: %s %s U+%04X-U+%04X\n", pat,
+            log_data_err("FAIL: %s %s U+%04X-U+%04X (Are you missing data?)\n", pat,
                     (isIn ? "does not contain" : "contains"),
                     rangeStart, rangeEnd);
         }
@@ -366,7 +375,7 @@ static void expectItems(const USet* set,
     pat=aescstrdup(ustr, length);
 
     if (uset_isEmpty(set) != (strlen(items)==0)) {
-        log_err("FAIL: %s should return %s from isEmpty\n",
+        log_data_err("FAIL: %s should return %s from isEmpty (Are you missing data?)\n",
                 pat,
                 strlen(items)==0 ? "TRUE" : "FALSE");
     }
@@ -383,7 +392,7 @@ static void expectItems(const USet* set,
         if (start > end || start == -1) {
             /* Fetch our next item */
             if (itemIndex >= itemCount) {
-                log_err("FAIL: ran out of items iterating %s\n", pat);
+                log_data_err("FAIL: ran out of items iterating %s (Are you missing data?)\n", pat);
                 return;
             }
 
@@ -480,11 +489,11 @@ TestSerialized() {
     errorCode=U_ZERO_ERROR;
     set=uset_openPattern(pattern, -1, &errorCode);
     if(U_FAILURE(errorCode)) {
-        log_err("uset_openPattern([:Cf:]) failed - %s\n", u_errorName(errorCode));
+        log_data_err("uset_openPattern([:Cf:]) failed - %s (Are you missing data?)\n", u_errorName(errorCode));
         return;
     }
 
-    length=uset_serialize(set, buffer, LENGTHOF(buffer), &errorCode);
+    length=uset_serialize(set, buffer, UPRV_LENGTHOF(buffer), &errorCode);
     if(U_FAILURE(errorCode)) {
         log_err("unable to uset_serialize([:Cf:]) - %s\n", u_errorName(errorCode));
         uset_close(set);
@@ -548,7 +557,7 @@ static void TestFreezable() {
     idSet=openIDSet();
 
     if (idSet == NULL) {
-        log_err("openIDSet() returned NULL\n");
+        log_data_err("openIDSet() returned NULL. (Are you missing data?)\n");
         uset_close(idSet);
         return;
     }
@@ -598,7 +607,7 @@ static void TestSpan() {
     USet *idSet=openIDSet();
 
     if (idSet == NULL) {
-        log_err("openIDSet() returned NULL\n");
+        log_data_err("openIDSet() returned NULL (Are you missing data?)\n");
         return;
     }