changeset 45378:190ee25b6bef

8176160: AbstractCalendar.getEra compares Era and String Reviewed-by: martin
author naoto
date Thu, 01 Jun 2017 12:44:01 -0700
parents 13a0c766d059
children 5e07cb61bff2
files jdk/src/java.base/share/classes/sun/util/calendar/AbstractCalendar.java jdk/test/sun/util/calendar/Bug8176160.java
diffstat 2 files changed, 58 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/src/java.base/share/classes/sun/util/calendar/AbstractCalendar.java	Thu Jun 01 12:43:46 2017 -0700
+++ b/jdk/src/java.base/share/classes/sun/util/calendar/AbstractCalendar.java	Thu Jun 01 12:44:01 2017 -0700
@@ -63,9 +63,9 @@
 
     public Era getEra(String eraName) {
         if (eras != null) {
-            for (int i = 0; i < eras.length; i++) {
-                if (eras[i].equals(eraName)) {
-                    return eras[i];
+            for (Era era : eras) {
+                if (era.getName().equals(eraName)) {
+                    return era;
                 }
             }
         }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/util/calendar/Bug8176160.java	Thu Jun 01 12:44:01 2017 -0700
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ *@test
+ *@bug 8176160
+ *@summary Make sure CalendarSystem.getEra(name) is consistent with getEras()
+ *@modules java.base/sun.util.calendar
+ *@run main/othervm Bug8176160
+ */
+
+import java.util.Arrays;
+import java.util.List;
+import sun.util.calendar.CalendarSystem;
+import sun.util.calendar.Era;
+
+public class Bug8176160 {
+
+    public static void main(String[] args) throws Exception {
+        List.of("gregorian", "japanese", "julian").stream()
+            .map(CalendarSystem::forName)
+            .forEach(cal -> {
+                Era[] eras = cal.getEras();
+                if (eras != null) {
+                    Arrays.stream(eras)
+                        .forEach(era -> {
+                            System.out.printf("cal: %s, era: %s\n", cal, era);
+                            if (cal.getEra(era.getName()) != era) {
+                                throw new RuntimeException("no match");
+                            }
+                        });
+                }
+            });
+    }
+}