ICU-511.32.tar.gz

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

diff --git a/icuSources/test/intltest/ucaconf.h b/icuSources/test/intltest/ucaconf.h
index 20a62ff322988fdebb0d7d35823728285ddff99e..3de421e791a6009baacbab2b017902bc8c479c48 100644 (file)
--- a/icuSources/test/intltest/ucaconf.h
+++ b/icuSources/test/intltest/ucaconf.h
@@ -1,6 +1,6 @@
 /********************************************************************
 /********************************************************************

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

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


@@ -18,10 +18,7 @@
 #if !UCONFIG_NO_COLLATION
 
 #include "unicode/tblcoll.h"
 #if !UCONFIG_NO_COLLATION
 
 #include "unicode/tblcoll.h"

-#include "unicode/ustring.h"

 #include "tscoll.h"
 #include "tscoll.h"

-#include "uparse.h"
-#include "cstring.h"

 
 #include <stdio.h>
 
 
 #include <stdio.h>
 


@@ -38,16 +35,17 @@ public:
   void TestRulesShifted(/* par */);     
 private:
   void initRbUCA();
   void TestRulesShifted(/* par */);     
 private:
   void initRbUCA();

-  void setCollNonIgnorable(UCollator *coll);
-  void setCollShifted(UCollator *coll);
-  void testConformance(UCollator *coll);
+  void setCollNonIgnorable(Collator *coll);
+  void setCollShifted(Collator *coll);
+  void testConformance(const Collator *coll);

   void openTestFile(const char *type);
 
   void openTestFile(const char *type);
 

-  UCollator *UCA;
-  UCollator *rbUCA;
+  RuleBasedCollator *UCA;  // rule-based so rules are available
+  Collator *rbUCA;

   FILE *testFile;
   UErrorCode status;
   char testDataPath[1024];
   FILE *testFile;
   UErrorCode status;
   char testDataPath[1024];

+  UBool isAtLeastUCA62;

 };
 
 #endif /* #if !UCONFIG_NO_COLLATION */
 };
 
 #endif /* #if !UCONFIG_NO_COLLATION */