ICU-551.41.tar.gz

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

diff --git a/icuSources/test/intltest/loctest.h b/icuSources/test/intltest/loctest.h
index f5bc40a8b368a4a326f76051fdbf9933f464706a..a1c3017f382b5224321d6308535fad24f6169f35 100644 (file)
--- a/icuSources/test/intltest/loctest.h
+++ b/icuSources/test/intltest/loctest.h
@@ -1,6 +1,6 @@
 /********************************************************************
  * COPYRIGHT: 
 /********************************************************************
  * COPYRIGHT: 

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

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


@@ -69,6 +69,18 @@ public:
     void Test4147552(void);
     
     void TestVariantParsing(void);
     void Test4147552(void);
     
     void TestVariantParsing(void);

+
+   /* Test getting keyword enumeratin */
+   void TestKeywordVariants(void);
+
+   /* Test getting keyword values */
+   void TestKeywordVariantParsing(void);
+
+   /* Test setting keyword values */
+   void TestSetKeywordValue(void);
+
+   /* Test getting the locale base name */
+   void TestGetBaseName(void);

     
 #if !UCONFIG_NO_FORMATTING
     void Test4105828(void) ;
     
 #if !UCONFIG_NO_FORMATTING
     void Test4105828(void) ;


@@ -76,11 +88,30 @@ public:
 
     void TestSetIsBogus(void);
 
 
     void TestSetIsBogus(void);
 

+    void TestGetLocale(void);
+
+    void TestVariantWithOutCountry(void);
+
+    void TestCanonicalization(void);
+

 #if !UCONFIG_NO_FORMATTING
     static UDate date(int32_t y, int32_t m, int32_t d, int32_t hr = 0, int32_t min = 0, int32_t sec = 0);
 #endif
 
 #if !UCONFIG_NO_FORMATTING
     static UDate date(int32_t y, int32_t m, int32_t d, int32_t hr = 0, int32_t min = 0, int32_t sec = 0);
 #endif
 

+    void TestCurrencyByDate(void);
+
+    void TestGetVariantWithKeywords(void);
+    void TestIsRightToLeft();
+    void TestBug11421();
+

 private:
 private:

+    void _checklocs(const char* label,
+                    const char* req,
+                    const Locale& validLoc,
+                    const Locale& actualLoc,
+                    const char* expReqValid="gt",
+                    const char* expValidActual="ge"); 
+

     /**
      * routine to perform subtests, used by TestDisplayNames
      **/
     /**
      * routine to perform subtests, used by TestDisplayNames
      **/


@@ -98,39 +129,53 @@ private:
         CROATIAN = 2,
         GREEK = 3,
         NORWEGIAN = 4,
         CROATIAN = 2,
         GREEK = 3,
         NORWEGIAN = 4,

-        MAX_LOCALES = 4
+        ITALIAN = 5,
+        XX = 6,
+        CHINESE = 7,
+        MAX_LOCALES = 7

     };
 
     enum {
         LANG = 0,
     };
 
     enum {
         LANG = 0,

-        CTRY = 1,
-        VAR = 2,
-        NAME = 3,
-        LANG3 = 4,
-        CTRY3 = 5,
-        LCID = 6,
-        DLANG_EN = 7,
-        DCTRY_EN = 8,
-        DVAR_EN = 9,
-        DNAME_EN = 10,
-        DLANG_FR = 11,
-        DCTRY_FR = 12,
-        DVAR_FR = 13,
-        DNAME_FR = 14,
-        DLANG_HR = 15,
-        DCTRY_HR = 16,
-        DVAR_HR = 17,
-        DNAME_HR = 18,
-        DLANG_EL = 19,
-        DCTRY_EL = 20,
-        DVAR_EL = 21,
-        DNAME_EL = 22,
-        DLANG_RT = 23,
-        DCTRY_RT = 24,
-        DVAR_RT = 25,
-        DNAME_RT = 26
+        SCRIPT,
+        CTRY,
+        VAR,
+        NAME,
+        LANG3,
+        CTRY3,
+        LCID,
+        DLANG_EN,
+        DSCRIPT_EN,
+        DCTRY_EN,
+        DVAR_EN,
+        DNAME_EN,
+        DLANG_FR,
+        DSCRIPT_FR,
+        DCTRY_FR,
+        DVAR_FR,
+        DNAME_FR,
+        DLANG_CA,
+        DSCRIPT_CA,
+        DCTRY_CA,
+        DVAR_CA,
+        DNAME_CA,
+        DLANG_EL,
+        DSCRIPT_EL,
+        DCTRY_EL,
+        DVAR_EL,
+        DNAME_EL,
+        DLANG_NO,
+        DSCRIPT_NO,
+        DCTRY_NO,
+        DVAR_NO,
+        DNAME_NO

     };
     };

-};
-
-

 
 

+#if !UCONFIG_NO_COLLATION
+    /**
+     * Check on registered collators.
+     * @param expectExtra if non-null, the locale ID of an 'extra' locale that is registered.
+     */
+    void checkRegisteredCollators(const char *expectExtra = NULL);
+#endif
+};