ICU-551.51.tar.gz

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

diff --git a/icuSources/test/intltest/tztest.h b/icuSources/test/intltest/tztest.h
index 51e68b13d3d6849f501b9b6e6e762a8a76598cf7..f1737ca794fb0a2f1d56f83293c23039d91b3f08 100644 (file)
--- a/icuSources/test/intltest/tztest.h
+++ b/icuSources/test/intltest/tztest.h
@@ -1,8 +1,7 @@
 
 /********************************************************************
- * COPYRIGHT: 
- * Copyright (c) 1997-2001, International Business Machines Corporation and
- * others. All Rights Reserved.
+ * Copyright (c) 1997-2014, International Business Machines
+ * Corporation and others. All Rights Reserved.
  ********************************************************************/
  
 #ifndef __TimeZoneTest__
@@ -38,6 +37,8 @@ public:
      */
     virtual void TestGetAvailableIDs913(void);
 
+    virtual void TestGetAvailableIDsNew(void);
+
     /**
      * Generic API testing for API coverage.
      */
@@ -46,11 +47,16 @@ public:
      * Test the setStartRule/setEndRule API calls.
      */
     virtual void TestRuleAPI(void);
+ 
+    void findTransition(const TimeZone& tz,
+                        UDate min, UDate max);
 
-    /**
+   /**
      * subtest used by TestRuleAPI
      **/
-    void testUsingBinarySearch(SimpleTimeZone* tz, UDate min, UDate max, UDate expectedBoundary);
+    void testUsingBinarySearch(const TimeZone& tz,
+                               UDate min, UDate max,
+                               UDate expectedBoundary);
 
 
     /**
@@ -74,11 +80,41 @@ public:
 
     void TestCountries(void);
 
+    void TestHistorical(void);
+
+    void TestEquivalentIDs(void);
+
+    void TestAliasedNames(void);
+    
+    void TestFractionalDST(void);
+
+    void TestFebruary(void);
+
+    void TestCanonicalIDAPI();
+    void TestCanonicalID(void);
+
+    virtual void TestDisplayNamesMeta();
+
+    void TestGetRegion(void);
+    void TestGetUnknown();
+
+    void TestGetWindowsID(void);
+    void TestGetIDForWindowsID(void);
+
     static const UDate INTERVAL;
 
 private:
     // internal functions
-    static UnicodeString& formatMinutes(int32_t min, UnicodeString& rv);
+    static UnicodeString& formatOffset(int32_t offset, UnicodeString& rv);
+    static UnicodeString& formatTZID(int32_t offset, UnicodeString& rv);
+
+    // Some test case data is current date/tzdata version sensitive and producing errors
+    // when year/rule are changed.
+    static const int32_t REFERENCE_YEAR;
+    static const char *REFERENCE_DATA_VERSION;
+
+    void checkContainsAll(StringEnumeration *s1, const char *name1,
+        StringEnumeration *s2, const char *name2);
 };
 
 #endif /* #if !UCONFIG_NO_FORMATTING */