ICU-511.32.tar.gz

[apple/icu.git] / icuSources / test / intltest / ucdtest.h

diff --git a/icuSources/test/intltest/ucdtest.h b/icuSources/test/intltest/ucdtest.h
index cedc3704619983bef8df13b7f1a155fc0d8a0f6c..74fdfc1c3f5a9fedcebf70ff2fa545f2d38e6777 100644 (file)
--- a/icuSources/test/intltest/ucdtest.h
+++ b/icuSources/test/intltest/ucdtest.h
@@ -1,6 +1,6 @@
 /********************************************************************
  * COPYRIGHT: 
 /********************************************************************
  * COPYRIGHT: 

- * Copyright (c) 1997-2003, International Business Machines Corporation and
+ * Copyright (c) 1997-2013, International Business Machines Corporation and

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


@@ -8,14 +8,20 @@
 #include "intltest.h"
 
 /** Helper function for TestUnicodeData */
 #include "intltest.h"
 
 /** Helper function for TestUnicodeData */

-U_CAPI void U_CALLCONV unicodeDataLineFn(void *context,
+U_CFUNC void U_CALLCONV unicodeDataLineFn(void *context,

                               char *fields[][2], int32_t fieldCount,
                               UErrorCode *pErrorCode);
 
                               char *fields[][2], int32_t fieldCount,
                               UErrorCode *pErrorCode);
 

-U_CAPI void U_CALLCONV
-derivedCorePropsLineFn(void *context,
-                       char *fields[][2], int32_t fieldCount,
-                       UErrorCode *pErrorCode);
+U_CFUNC void U_CALLCONV
+derivedPropsLineFn(void *context,
+                   char *fields[][2], int32_t fieldCount,
+                   UErrorCode *pErrorCode);
+
+U_NAMESPACE_BEGIN
+
+class Hashtable;
+
+U_NAMESPACE_END

 
 /** 
  * Test API and functionality of class Unicode
 
 /** 
  * Test API and functionality of class Unicode


@@ -28,6 +34,10 @@ public:
     void runIndexedTest( int32_t index, UBool exec, const char* &name, char* par = NULL );
 
     void TestAdditionalProperties();
     void runIndexedTest( int32_t index, UBool exec, const char* &name, char* par = NULL );
 
     void TestAdditionalProperties();

+    void TestBinaryValues();
+    void TestConsistency();
+    void TestPatternProperties();
+    void TestScriptMetadata();

 
 private:
 
 
 private:
 


@@ -36,10 +46,14 @@ private:
                               UErrorCode *pErrorCode);
 
     friend void U_CALLCONV
                               UErrorCode *pErrorCode);
 
     friend void U_CALLCONV

-    derivedCorePropsLineFn(void *context,
+    derivedPropsLineFn(void *context,

                            char *fields[][2], int32_t fieldCount,
                            UErrorCode *pErrorCode);
 
                            char *fields[][2], int32_t fieldCount,
                            UErrorCode *pErrorCode);
 

-    UnicodeSet derivedCoreProps[30];
-};
+    UnicodeSet derivedProps[30];
+    U_NAMESPACE_QUALIFIER Hashtable *unknownPropertyNames;

 
 

+    UBool compareUSets(const UnicodeSet &a, const UnicodeSet &b,
+                       const char *a_name, const char *b_name,
+                       UBool diffIsError);
+};