ICU-400.37.tar.gz

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

diff --git a/icuSources/test/intltest/dtfmttst.h b/icuSources/test/intltest/dtfmttst.h
index 74f8f05d57a8c3000441d4de9205197e02ff00c3..091c459786e9bfc0d73f865f81dd4eb55788a0ff 100644 (file)
--- a/icuSources/test/intltest/dtfmttst.h
+++ b/icuSources/test/intltest/dtfmttst.h
@@ -1,6 +1,6 @@
 /********************************************************************
  * COPYRIGHT: 
- * Copyright (c) 1997-2003, International Business Machines Corporation and
+ * Copyright (c) 1997-2007, International Business Machines Corporation and
  * others. All Rights Reserved.
  ********************************************************************/
 
@@ -39,14 +39,15 @@ public:
 public: // package
     // internal utility routine (genrates escape sequences for characters)
     static UnicodeString& escape(UnicodeString& s);
-    static const char* fieldNames[];
  
 public:
     /**
      * Verify that returned field position indices are correct.
      */
-    virtual void TestFieldPosition(void);
+    void TestFieldPosition(void);
  
+    void TestGeneral();
+
 public: // package
     // internal utility function
     static void getFieldText(DateFormat* df, int32_t field, UDate date, UnicodeString& str);
@@ -108,12 +109,6 @@ public:
      */
     virtual void TestBadInput135(void);
  
-private:
-    static const char* parseFormats[];
-    static const char* inputStrings[];
- 
-    static const DateFormat::EField fgCalendarToDateFormatField [];
-
 public:
     /**
      * Verify the correct behavior when parsing an array of inputs against an
@@ -139,6 +134,8 @@ public:
      * Further test the formatting of time zones.
      */
     virtual void TestDateFormatZone146(void);
+
+    void TestTimeZoneStringsAPI(void);
  
 public: // package
     /**
@@ -154,9 +151,64 @@ public: // package
 
     void TestWhiteSpaceParsing(void);
 
+    void TestInvalidPattern(void);
+
+    void TestGreekMay(void);
+
+    void TestGenericTime(void);
+
+    void TestGenericTimeZoneOrder(void);
+
+public:
+    /**
+     * Test host-specific formatting.
+     */
+    void TestHost(void);
+
+public:
+    /**
+     * Test patterns added in CLDR 1.4
+     */
+    void TestEras(void);
+
+    void TestNarrowNames(void);
+
+    void TestStandAloneDays(void);
+
+    void TestStandAloneMonths(void);
+
+    void TestQuarters(void);
+    
+    void TestZTimeZoneParsing(void);
+
+    void TestRelativeClone(void);
+    
+    void TestHostClone(void);
+
+public:
+    /***
+     * Test Relative Dates
+     */
+     void TestRelative(void);
+     void TestTimeZoneDisplayName(void);
+/*   void TestRelativeError(void);
+     void TestRelativeOther(void);
+*/
+
+ private:
+      void TestRelative(int daysdelta, 
+                                  const Locale& loc,
+                                  const char *expectChars);
+
  private:
     void expectParse(const char** data, int32_t data_length,
                      const Locale& locale);
+
+    void expect(const char** data, int32_t data_length,
+                const Locale& loc);
+
+    void expectFormat(const char **data, int32_t data_length,
+                      const Locale &locale);
 };
 
 #endif /* #if !UCONFIG_NO_FORMATTING */