< prev index next >

test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java

Print this page

        

@@ -21,11 +21,11 @@
  * questions.
  */
 
  /*
  * @test
- * @bug 8181157
+ * @bug 8181157 8202537
  * @modules jdk.localedata
  * @summary Checks CLDR time zone names are generated correctly at runtime
  * @run testng/othervm -Djava.locale.providers=CLDR TimeZoneNamesTest
  */
 

@@ -45,38 +45,12 @@
     @DataProvider(name="noResourceTZs")
     Object[][] data() {
         return new Object[][] {
             // tzid, locale, style, expected
 
-            // These zone ids are new in tzdb and yet to be reflected in
-            // CLDR data. Thus it's assured there is no l10n names for these.
-            // This list is as of CLDR version 29, and should be examined
+            // This list is as of CLDR version 33, and should be examined
             // on the CLDR data upgrade.
-            {"America/Punta_Arenas",    Locale.US,  "Punta Arenas Standard Time",
-                                                    "GMT-03:00",
-                                                    "Punta Arenas Daylight Time",
-                                                    "GMT-03:00",
-                                                    "Punta Arenas Time",
-                                                    "GMT-03:00"},
-            {"America/Punta_Arenas",    Locale.FRANCE, "Punta Arenas (heure standard)",
-                                                    "UTC\u221203:00",
-                                                    "Punta Arenas (heure d\u2019\u00e9t\u00e9)",
-                                                    "UTC\u221203:00",
-                                                    "heure : Punta Arenas",
-                                                    "UTC\u221203:00"},
-            {"Asia/Atyrau",             Locale.US, "Atyrau Standard Time",
-                                                    "GMT+05:00",
-                                                    "Atyrau Daylight Time",
-                                                    "GMT+05:00",
-                                                    "Atyrau Time",
-                                                    "GMT+05:00"},
-            {"Asia/Atyrau",             Locale.FRANCE, "Atyrau (heure standard)",
-                                                    "UTC+05:00",
-                                                    "Atyrau (heure d\u2019\u00e9t\u00e9)",
-                                                    "UTC+05:00",
-                                                    "heure : Atyrau",
-                                                    "UTC+05:00"},
 
             // no "metazone" zones
             {"Asia/Srednekolymsk",      Locale.US,  "Srednekolymsk Time",
                                                     "SRET",
                                                     "Srednekolymsk Daylight Time",

@@ -87,10 +61,70 @@
                                                     "UTC+11:00",
                                                     "Srednekolymsk (heure standard)",
                                                     "UTC+11:00",
                                                     "heure : Srednekolymsk",
                                                     "UTC+11:00"},
+            {"America/Punta_Arenas",    Locale.US, "Punta Arenas Standard Time",
+                                                    "GMT-03:00",
+                                                    "Punta Arenas Standard Time",
+                                                    "GMT-03:00",
+                                                    "Punta Arenas Time",
+                                                    "GMT-03:00"},
+            {"America/Punta_Arenas",    Locale.FRANCE, "Punta Arenas (heure standard)",
+                                                    "UTC\u221203:00",
+                                                    "Punta Arenas (heure standard)",
+                                                    "UTC\u221203:00",
+                                                    "heure : Punta Arenas",
+                                                    "UTC\u221203:00"},
+            {"Asia/Famagusta",          Locale.US, "Eastern European Time",
+                                                    "EET",
+                                                    "Eastern European Summer Time",
+                                                    "EEST",
+                                                    "Eastern European Time",
+                                                    "EET"},
+            {"Asia/Famagusta",          Locale.FRANCE, "Famagouste (heure standard)",
+                                                    "UTC+02:00",
+                                                    "Famagouste (heure standard)",
+                                                    "UTC+03:00",
+                                                    "heure : Famagouste",
+                                                    "UTC+02:00"},
+            {"Europe/Astrakhan",        Locale.US, "Astrakhan Standard Time", 
+                                                    "GMT+04:00",
+                                                    "Astrakhan Standard Time", 
+                                                    "GMT+04:00",
+                                                    "Astrakhan Time",  
+                                                    "GMT+04:00"},
+            {"Europe/Astrakhan",        Locale.FRANCE, "Astrakhan (heure standard)", 
+                                                    "UTC+04:00",
+                                                    "Astrakhan (heure standard)", 
+                                                    "UTC+04:00",
+                                                    "heure : Astrakhan",  
+                                                    "UTC+04:00"},
+            {"Europe/Saratov",          Locale.US, "Saratov Standard Time", 
+                                                    "GMT+04:00",
+                                                    "Saratov Standard Time", 
+                                                    "GMT+04:00",
+                                                    "Saratov Time",  
+                                                    "GMT+04:00"},
+            {"Europe/Saratov",          Locale.FRANCE, "Saratov (heure standard)", 
+                                                    "UTC+04:00",
+                                                    "Saratov (heure standard)", 
+                                                    "UTC+04:00",
+                                                    "heure : Saratov",  
+                                                    "UTC+04:00"},
+            {"Europe/Ulyanovsk",        Locale.US, "Ulyanovsk Standard Time", 
+                                                    "GMT+04:00",
+                                                    "Ulyanovsk Standard Time", 
+                                                    "GMT+04:00",
+                                                    "Ulyanovsk Time",  
+                                                    "GMT+04:00"},
+            {"Europe/Ulyanovsk",        Locale.FRANCE, "Oulianovsk (heure standard)", 
+                                                    "UTC+04:00",
+                                                    "Oulianovsk (heure standard)", 
+                                                    "UTC+04:00",
+                                                    "heure : Oulianovsk",  
+                                                    "UTC+04:00"},           
             {"Pacific/Bougainville",    Locale.US, "Bougainville Standard Time",
                                                     "BST",
                                                     "Bougainville Daylight Time",
                                                     "BST",
                                                     "Bougainville Time",
< prev index next >