ICU-551.24.tar.gz

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

diff --git a/icuSources/test/cintltst/cstrtest.c b/icuSources/test/cintltst/cstrtest.c
index afef9d33ad147150d56d11f54c4b251c3f267ac7..5a7266406977e2f4e0523f2497853a88096f7518 100644 (file)
--- a/icuSources/test/cintltst/cstrtest.c
+++ b/icuSources/test/cintltst/cstrtest.c
@@ -1,6 +1,6 @@
 /*
 **********************************************************************
-* Copyright (C) 1998-2010, International Business Machines Corporation 
+* Copyright (C) 1998-2014, International Business Machines Corporation
 * and others.  All Rights Reserved.
 **********************************************************************
 *
@@ -20,8 +20,6 @@
 #include "cintltst.h"
 #include "cmemory.h"
 
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
-
 static void TestAPI(void);
 void addCStringTest(TestNode** root);
 
@@ -107,26 +105,26 @@ static void TestAPI(void)
     }
 
     uprv_strcpy(src, "this is lower case");
-    if(T_CString_stricmp(src, "THIS is lower CASE") != 0){
-        log_err("FAIL: *****T_CString_stricmp() failed.");
+    if(uprv_stricmp(src, "THIS is lower CASE") != 0){
+        log_err("FAIL: *****uprv_stricmp() failed.");
     }
-    if((intValue=T_CString_stricmp(NULL, "first string is null") )!= -1){
-        log_err("FAIL: T_CString_stricmp() where the first string is null failed. Expected: -1, returned %d\n", intValue);
+    if((intValue=uprv_stricmp(NULL, "first string is null") )!= -1){
+        log_err("FAIL: uprv_stricmp() where the first string is null failed. Expected: -1, returned %d\n", intValue);
     }
-    if((intValue=T_CString_stricmp("second string is null", NULL)) != 1){
-        log_err("FAIL: T_CString_stricmp() where the second string is null failed. Expected: 1, returned %d\n", intValue);
+    if((intValue=uprv_stricmp("second string is null", NULL)) != 1){
+        log_err("FAIL: uprv_stricmp() where the second string is null failed. Expected: 1, returned %d\n", intValue);
     }
-    if((intValue=T_CString_stricmp(NULL, NULL)) != 0){
-        log_err("FAIL: T_CString_stricmp(NULL, NULL) failed.  Expected:  0, returned %d\n", intValue);;
+    if((intValue=uprv_stricmp(NULL, NULL)) != 0){
+        log_err("FAIL: uprv_stricmp(NULL, NULL) failed.  Expected:  0, returned %d\n", intValue);;
     }
-    if((intValue=T_CString_stricmp("", "")) != 0){
-        log_err("FAIL: T_CString_stricmp(\"\", \"\") failed.  Expected:  0, returned %d\n", intValue);;
+    if((intValue=uprv_stricmp("", "")) != 0){
+        log_err("FAIL: uprv_stricmp(\"\", \"\") failed.  Expected:  0, returned %d\n", intValue);;
     }
-    if((intValue=T_CString_stricmp("", "abc")) != -1){
-        log_err("FAIL: T_CString_stricmp(\"\", \"abc\") failed.  Expected: -1, returned %d\n", intValue);
+    if((intValue=uprv_stricmp("", "abc")) != -1){
+        log_err("FAIL: uprv_stricmp(\"\", \"abc\") failed.  Expected: -1, returned %d\n", intValue);
     }
-    if((intValue=T_CString_stricmp("abc", "")) != 1){
-        log_err("FAIL: T_CString_stricmp(\"abc\", \"\") failed.  Expected: 1, returned %d\n", intValue);
+    if((intValue=uprv_stricmp("abc", "")) != 1){
+        log_err("FAIL: uprv_stricmp(\"abc\", \"\") failed.  Expected: 1, returned %d\n", intValue);
     }
 
     temp=uprv_strdup("strdup");
@@ -136,26 +134,26 @@ static void TestAPI(void)
     uprv_free((char *)temp);
   
     uprv_strcpy(src, "this is lower case");
-    if(T_CString_strnicmp(src, "THIS", 4 ) != 0){
-        log_err("FAIL: *****T_CString_strnicmp() failed.");
+    if(uprv_strnicmp(src, "THIS", 4 ) != 0){
+        log_err("FAIL: *****uprv_strnicmp() failed.");
     }
-    if((intValue=T_CString_strnicmp(NULL, "first string is null", 10) )!= -1){
-        log_err("FAIL: T_CString_strnicmp() where the first string is null failed. Expected: -1, returned %d\n", intValue);
+    if((intValue=uprv_strnicmp(NULL, "first string is null", 10) )!= -1){
+        log_err("FAIL: uprv_strnicmp() where the first string is null failed. Expected: -1, returned %d\n", intValue);
     }
-    if((intValue=T_CString_strnicmp("second string is null", NULL, 10)) != 1){
-        log_err("FAIL: T_CString_strnicmp() where the second string is null failed. Expected: 1, returned %d\n", intValue);
+    if((intValue=uprv_strnicmp("second string is null", NULL, 10)) != 1){
+        log_err("FAIL: uprv_strnicmp() where the second string is null failed. Expected: 1, returned %d\n", intValue);
     }
-    if((intValue=T_CString_strnicmp(NULL, NULL, 10)) != 0){
-        log_err("FAIL: T_CString_strnicmp(NULL, NULL, 10) failed.  Expected:  0, returned %d\n", intValue);;
+    if((intValue=uprv_strnicmp(NULL, NULL, 10)) != 0){
+        log_err("FAIL: uprv_strnicmp(NULL, NULL, 10) failed.  Expected:  0, returned %d\n", intValue);;
     }
-    if((intValue=T_CString_strnicmp("", "", 10)) != 0){
-        log_err("FAIL: T_CString_strnicmp(\"\", \"\") failed.  Expected:  0, returned %d\n", intValue);;
+    if((intValue=uprv_strnicmp("", "", 10)) != 0){
+        log_err("FAIL: uprv_strnicmp(\"\", \"\") failed.  Expected:  0, returned %d\n", intValue);;
     }
-    if((intValue=T_CString_strnicmp("", "abc", 10)) != -1){
-        log_err("FAIL: T_CString_stricmp(\"\", \"abc\", 10) failed.  Expected: -1, returned %d\n", intValue);
+    if((intValue=uprv_strnicmp("", "abc", 10)) != -1){
+        log_err("FAIL: uprv_stricmp(\"\", \"abc\", 10) failed.  Expected: -1, returned %d\n", intValue);
     }
-    if((intValue=T_CString_strnicmp("abc", "", 10)) != 1){
-        log_err("FAIL: T_CString_strnicmp(\"abc\", \"\", 10) failed.  Expected: 1, returned %d\n", intValue);
+    if((intValue=uprv_strnicmp("abc", "", 10)) != 1){
+        log_err("FAIL: uprv_strnicmp(\"abc\", \"\", 10) failed.  Expected: 1, returned %d\n", intValue);
     }
     
 }
@@ -249,10 +247,10 @@ TestInvariant() {
             }
 
             errorCode=U_ZERO_ERROR;
-            length=ucnv_toUChars(cnv, us, LENGTHOF(us), invariantChars, -1, &errorCode);
+            length=ucnv_toUChars(cnv, us, UPRV_LENGTHOF(us), invariantChars, -1, &errorCode);
             if(U_FAILURE(errorCode)) {
                 log_err("ucnv_toUChars(invariantChars) failed - %s\n", u_errorName(errorCode));
-            } else if(length!=LENGTHOF(invariantUChars)-1 || u_strcmp(us, invariantUChars)!=0) {
+            } else if(length!=UPRV_LENGTHOF(invariantUChars)-1 || u_strcmp(us, invariantUChars)!=0) {
                 log_err("ucnv_toUChars(invariantChars) failed\n");
             }
 
@@ -280,7 +278,7 @@ TestInvariant() {
         }
     }
 
-    for(i=0; i<LENGTHOF(nonASCIIUChars); ++i) {
+    for(i=0; i<UPRV_LENGTHOF(nonASCIIUChars); ++i) {
         if(uprv_isInvariantUString(nonASCIIUChars+i, 1)) {
             log_err("uprv_isInvariantUString(nonASCIIUChars[%d]) failed\n", i);
         }
@@ -323,7 +321,7 @@ TestCompareInvEbcdicAsAscii() {
         { "\x81\x81\x82", "aab" }
     };
     int32_t i;
-    for(i=1; i<LENGTHOF(invStrings); ++i) {
+    for(i=1; i<UPRV_LENGTHOF(invStrings); ++i) {
         int32_t diff1, diff2;
         /* compare previous vs. current */
         diff1=getSign(uprv_compareInvEbcdicAsAscii(invStrings[i-1][0], invStrings[i][0]));