commit 6a823a3e5b29ae64c99e340c75d57ae24edee3be
author Craig Cornelius <ccornelius@google.com> Tue Oct 16 14:43:03 2012 -0700
committer Elliott Hughes <enh@google.com> Tue Nov 27 16:38:25 2012 -0800
tree 2756b5f7e29f1788a5b803e3225ddd6bd9ef36b0
parent 10bd9f5e40c6f0f7fd7ec805878632b8ae8d02df

ICU 49.2 upgrade.

(cherry-pick of 151192e2fa08cb1b7064e0ed0af6209174e7968d.)

Change-Id: I493390846fc2f7fb74194dfd9a3c8d624516858b

luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/TimeZoneTest.java

diff --git a/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/TimeZoneTest.java b/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/TimeZoneTest.java
index 3364f52..9c4e46b 100644
--- a/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/TimeZoneTest.java
+++ b/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/TimeZoneTest.java
@@ -176,13 +176,16 @@
         assertEquals("\u4e2d\u56fd\u6807\u51c6\u65f6\u95f4", timezone
                 .getDisplayName(Locale.CHINA));
     }
-    
+
     /**
      * @tests java.util.TimeZone#getDisplayName(boolean, int, java.util.Locale)
      */
     public void test_getDisplayNameZILjava_util_Locale() {
         TimeZone timezone = TimeZone.getTimeZone("Asia/Shanghai");
-        assertEquals("\u683c\u6797\u5c3c\u6cbb\u6807\u51c6\u65f6\u95f4+0800",
+        /* Time zone data was changed in ICU49.2.  Many common short names were removed. */
+        assertEquals("中国标准时间",
+                timezone.getDisplayName(false, TimeZone.LONG, Locale.CHINA));
+        assertEquals("GMT+0800",
                 timezone.getDisplayName(false, TimeZone.SHORT, Locale.CHINA));
         try {
             timezone.getDisplayName(false, 100, Locale.CHINA);
@@ -191,7 +194,7 @@
             // expected
         }
     }
-    
+
     /*
      * Regression for HARMONY-5860
      */