Upgrade ICU4J.

[Dictionary.git] / jars / icu4j-52_1 / main / tests / collate / src / com / ibm / icu / dev / test / format / GlobalizationPreferencesTest.java

diff --git a/jars/icu4j-4_8_1_1/main/tests/collate/src/com/ibm/icu/dev/test/format/GlobalizationPreferencesTest.java b/jars/icu4j-52_1/main/tests/collate/src/com/ibm/icu/dev/test/format/GlobalizationPreferencesTest.java
similarity index 99%
rename from jars/icu4j-4_8_1_1/main/tests/collate/src/com/ibm/icu/dev/test/format/GlobalizationPreferencesTest.java
rename to jars/icu4j-52_1/main/tests/collate/src/com/ibm/icu/dev/test/format/GlobalizationPreferencesTest.java
index 25883c217569e5c73d09337a4e10e8de43a5f2ad..581faf8f2afc7ec8c7b3b370ce6caec83ebf7f03 100644 (file)
--- a/jars/icu4j-4_8_1_1/main/tests/collate/src/com/ibm/icu/dev/test/format/GlobalizationPreferencesTest.java
+++ b/jars/icu4j-52_1/main/tests/collate/src/com/ibm/icu/dev/test/format/GlobalizationPreferencesTest.java
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (C) 2004-2010, International Business Machines Corporation and    *
+ * Copyright (C) 2004-2013, International Business Machines Corporation and    *
  * others. All Rights Reserved.                                                *
  *******************************************************************************
 */
@@ -679,8 +679,8 @@ public class GlobalizationPreferencesTest extends TestFmwk {
         gp1.setCalendar(ical);
         cal = gp1.getCalendar();
         calType = cal.getType();
-        if (!calType.equals("islamic")) {
-            errln("FAIL: Calendar type afte clone is " + calType + " Expected: islamic");
+        if (!calType.equals("islamic-civil")) { // default constructed IslamicCalendar is islamic-civil
+            errln("FAIL: Calendar type afte clone is " + calType + " Expected: islamic-civil");
         }
     }
 
@@ -1175,8 +1175,8 @@ public class GlobalizationPreferencesTest extends TestFmwk {
         df = gp.getDateFormat(GlobalizationPreferences.DF_SHORT, GlobalizationPreferences.DF_NONE);
         pattern = ((SimpleDateFormat)df).toPattern();
         // root pattern must be used
-        if (!pattern.equals("yyyy-MM-dd")) {
-            errln("FAIL: SHORT date pattern is " + pattern + " Expected: yyyy-MM-dd");
+        if (!pattern.equals("y-MM-dd")) {
+            errln("FAIL: SHORT date pattern is " + pattern + " Expected: y-MM-dd");
         }
 
         // Set locale - fr, fr_CA, fr_FR
@@ -1223,8 +1223,8 @@ public class GlobalizationPreferencesTest extends TestFmwk {
         // Date - short
         df = gp.getDateFormat(GlobalizationPreferences.DF_SHORT, GlobalizationPreferences.DF_NONE);
         pattern = ((SimpleDateFormat)df).toPattern();
-        if (!pattern.equals("dd/MM/yyyy")) {
-            errln("FAIL: SHORT date pattern is " + pattern + " Expected: dd/MM/yyyy");
+        if (!pattern.equals("dd/MM/y")) {
+            errln("FAIL: SHORT date pattern is " + pattern + " Expected: dd/MM/y");
         }
 
         // Time - full