ICU-62107.0.1.tar.gz

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

diff --git a/icuSources/test/cintltst/ccolltst.c b/icuSources/test/cintltst/ccolltst.c
index 45ccee405f3e07fccefd5cdce0223ad948eadf6e..b42dfd7d2157d2c27fcbed5e9a38ac5a277d315d 100644 (file)
--- a/icuSources/test/cintltst/ccolltst.c
+++ b/icuSources/test/cintltst/ccolltst.c
@@ -1,6 +1,8 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /********************************************************************
  * COPYRIGHT: 
- * Copyright (c) 1997-2001, International Business Machines Corporation and
+ * Copyright (c) 1997-2012, International Business Machines Corporation and
  * others. All Rights Reserved.
  ********************************************************************/
 /********************************************************************************
@@ -24,16 +26,15 @@
 #include "unicode/ustring.h"
 #include "cmemory.h"
 
-UChar U_CALLCONV testInc(void *context);
-
 void addCollTest(TestNode** root);
 
 void addCollTest(TestNode** root)
 {
     addCollAPITest(root);
-    addCurrencyTest(root);
+    addCurrencyCollTest(root);
+#if !UCONFIG_NO_NORMALIZATION
     addNormTest(root);
-    addDanishCollTest(root);
+#endif
     addGermanCollTest(root);
     addSpanishCollTest(root);
     addFrenchCollTest(root);
@@ -47,8 +48,9 @@ void addCollTest(TestNode** root)
     addCollIterTest(root);
     addAllCollTest(root);
     addMiscCollTest(root);
-
+#if !UCONFIG_NO_BREAK_ITERATION && !UCONFIG_NO_FILE_IO
     addSearchTest(root);
+#endif
 }
 
 
@@ -66,6 +68,23 @@ static char* dumpSk(uint8_t *sourceKey, char *sk) {
     return sk;
 }
 
+static const char *getCompareResult(UCollationResult result)
+{
+    if (result == UCOL_LESS)
+    {
+        return "LESS";
+    }
+    else if (result == UCOL_EQUAL)
+    {
+        return "EQUAL";
+    }
+    else if (result == UCOL_GREATER)
+    {
+        return "GREATER";
+    }
+    return "invalid UCollationResult?";
+}
+
 void reportCResult( const UChar source[], const UChar target[], 
                          uint8_t *sourceKey, uint8_t *targetKey,
                          UCollationResult compareResult,
@@ -73,9 +92,6 @@ void reportCResult( const UChar source[], const UChar target[],
                          UCollationResult incResult,
                          UCollationResult expectedResult )
 {
-    UChar *sResult, *sExpect;
-    sResult=(UChar*)malloc(sizeof(UChar) * 10);
-    sExpect=(UChar*)malloc(sizeof(UChar) * 10);
     if (expectedResult < -1 || expectedResult > 1)
     {
         log_err("***** invalid call to reportCResult ****\n");
@@ -84,91 +100,33 @@ void reportCResult( const UChar source[], const UChar target[],
 
     if (compareResult != expectedResult)
     {
-        
-        appendCompareResult(compareResult, sResult);
-        appendCompareResult(expectedResult, sExpect);
         log_err("Compare(%s , %s) returned: %s expected: %s\n", aescstrdup(source,-1), aescstrdup(target,-1),
-            austrdup(sResult), austrdup(sExpect) );
+            getCompareResult(compareResult), getCompareResult(expectedResult) );
     }
 
     if (incResult != expectedResult)
     {
-        
-        appendCompareResult(incResult, sResult);
-        appendCompareResult(expectedResult, sExpect);
         log_err("incCompare(%s , %s) returned: %s expected: %s\n", aescstrdup(source,-1), aescstrdup(target,-1),
-            austrdup(sResult), austrdup(sExpect) );
+            getCompareResult(incResult), getCompareResult(expectedResult) );
     }
 
     if (keyResult != expectedResult)
     {
-    
-        appendCompareResult(keyResult, sResult);
-        appendCompareResult(expectedResult, sExpect);
-
         log_err("KeyCompare(%s , %s) returned: %s expected: %s\n", aescstrdup(source,-1), aescstrdup(target,-1), 
-            austrdup(sResult), austrdup(sExpect) );
-
-    
+            getCompareResult(keyResult), getCompareResult(expectedResult) );
     }
 
     if (keyResult != compareResult)
     {
-    
-        appendCompareResult(keyResult, sResult);
-        appendCompareResult(compareResult, sExpect);
-
         log_err("difference between sortkey and compare result for (%s , %s) Keys: %s compare %s\n", aescstrdup(source,-1), aescstrdup(target,-1), 
-            austrdup(sResult), austrdup(sExpect) );
-
-    
+            getCompareResult(keyResult), getCompareResult(compareResult));
     }
 
     if(keyResult != expectedResult || keyResult != compareResult)
     {
-      char sk[10000];
-      log_verbose("SortKey1: %s\n", dumpSk(sourceKey, sk));
-      log_verbose("SortKey2: %s\n", dumpSk(targetKey, sk));
-    }
-
-    free(sExpect);
-    free(sResult);
-}
-
-UChar* appendCompareResult(UCollationResult result, UChar* target)
-{
-    if (result == UCOL_LESS)
-    {
-        u_uastrcpy(target, "LESS");
-    }
-    else if (result == UCOL_EQUAL)
-    {
-        u_uastrcpy(target, "EQUAL");
-    }
-    else if (result == UCOL_GREATER)
-    {
-        u_uastrcpy(target, "GREATER");
-    }
-    else
-    {
-        u_uastrcpy(target, "huh???");
-    }
-
-    return target;
-}
-
-/* Support for testing incremental strcoll */
-typedef struct {
-    const UChar *start;
-    const UChar *end;
-} testContext;
-
-UChar U_CALLCONV testInc(void *context) {
-    testContext *s = (testContext *)context;
-    if(s->start == s->end) {
-        return 0xFFFF;
-    } else {
-        return *(s->start++);
+        char sk[10000];
+        log_verbose("SortKey1: %s\n", dumpSk(sourceKey, sk));
+        log_verbose("SortKey2: %s\n", dumpSk(targetKey, sk));
     }
 }