4745761: (cal) RFE: Support builder for constructing Calendar

Reviewed-by: peytoia

src/share/classes/java/util/GregorianCalendar.java

 /*
- * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, 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
@@ -40,7 +40,6 @@ package java.util;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
-import sun.util.locale.provider.CalendarDataUtility;
 import sun.util.calendar.BaseCalendar;
 import sun.util.calendar.CalendarDate;
 import sun.util.calendar.CalendarSystem;
@@ -722,6 +721,18 @@ public class GregorianCalendar extends Calendar {
         this.internalSet(MILLISECOND, millis);
     }
 
+    /**
+     * Constructs an empty GregorianCalendar.
+     *
+     * @param zone    the given time zone
+     * @param aLocale the given locale
+     * @param flag    the flag requesting an empty instance
+     */
+    GregorianCalendar(TimeZone zone, Locale locale, boolean flag) {
+        super(zone, locale);
+        gdate = (BaseCalendar.Date) gcal.newCalendarDate(getZone());
+    }
+
 /////////////////
 // Public methods
 /////////////////

src/share/classes/java/util/JapaneseImperialCalendar.java

 /*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, 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
@@ -301,6 +301,18 @@ class JapaneseImperialCalendar extends Calendar {
         setTimeInMillis(System.currentTimeMillis());
     }
 
+    /**
+     * Constructs an "empty" {@code JapaneseImperialCalendar}.
+     *
+     * @param zone    the given time zone
+     * @param aLocale the given locale
+     * @param flag    the flag requesting an empty instance
+     */
+    JapaneseImperialCalendar(TimeZone zone, Locale aLocale, boolean flag) {
+        super(zone, aLocale);
+        jdate = jcal.newCalendarDate(zone);
+    }
+
     /**
      * Returns {@code "japanese"} as the calendar type of this {@code
      * JapaneseImperialCalendar}.

test/java/util/Calendar/Builder/BuilderTest.java

+/*
+ * Copyright (c) 2013, 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 4745761
+ * @summary Unit test for Calendar.Builder.
+ */
+
+import java.util.*;
+import static java.util.Calendar.*;
+
+public class BuilderTest {
+    private static final Locale jaJPJP = new Locale("ja", "JP", "JP");
+    private static final Locale thTH = new Locale("th", "TH");
+    private static final TimeZone LA = TimeZone.getTimeZone("America/Los_Angeles");
+    private static final TimeZone TOKYO = TimeZone.getTimeZone("Asia/Tokyo");
+    private static int error;
+
+    public static void main(String[] args) {
+        TimeZone tz = TimeZone.getDefault();
+        Locale loc = Locale.getDefault();
+        try {
+            TimeZone.setDefault(TimeZone.getTimeZone("GMT"));
+            Locale.setDefault(Locale.US);
+            Calendar.Builder calb;
+            Calendar cal, expected;
+
+            // set instant
+            calb = builder();
+            long time = System.currentTimeMillis();
+            cal = calb.setInstant(time).build();
+            expected = new GregorianCalendar();
+            expected.setTimeInMillis(time);
+            check(cal, expected);
+
+            calb = builder();
+            cal = calb.setInstant(new Date(time)).build();
+            check(cal, expected);
+
+            // set time zone
+            calb = builder();
+            cal = calb.setTimeZone(LA).setInstant(time).build();
+            expected = new GregorianCalendar(LA, Locale.US);
+            expected.setTimeInMillis(time);
+            check(cal, expected);
+
+            calb = builder();
+            cal = calb.setTimeZone(TOKYO).setInstant(time).build();
+            expected = new GregorianCalendar(TOKYO, Locale.US);
+            expected.setTimeInMillis(time);
+            check(cal, expected);
+
+            // set vs. setFields
+            calb = builder();
+            cal = calb.set(YEAR, 2013).set(MONTH, JANUARY).set(DAY_OF_MONTH, 31)
+                      .set(HOUR_OF_DAY, 10).set(MINUTE, 20).set(SECOND, 30).set(MILLISECOND, 40).build();
+            expected = new GregorianCalendar(2013, JANUARY, 31, 10, 20, 30);
+            expected.set(MILLISECOND, 40);
+            check(cal, expected);
+
+            calb = builder();
+            cal = calb.setFields(YEAR, 2013, MONTH, JANUARY, DAY_OF_MONTH, 31,
+                                 HOUR_OF_DAY, 10, MINUTE, 20, SECOND, 30, MILLISECOND, 40).build();
+            check(cal, expected);
+
+            // field resolution
+            calb = builder();
+            cal = calb.setFields(YEAR, 2013, MONTH, DECEMBER, DAY_OF_MONTH, 31,
+                                 HOUR_OF_DAY, 10, MINUTE, 20, SECOND, 30, MILLISECOND, 40)
+                      .set(DAY_OF_YEAR, 31).build();  // DAY_OF_YEAR wins.
+            check(cal, expected);
+
+            // setDate/setTimeOfDay
+            calb = builder();
+            cal = calb.setDate(2013, JANUARY, 31).setTimeOfDay(10, 20, 30, 40).build();
+            check(cal, expected);
+
+            // week date (ISO 8601)
+            calb = builder().setCalendarType("iso8601");
+            cal = calb.setWeekDate(2013, 1, MONDAY).setTimeOfDay(10, 20, 30).build();
+            expected = getISO8601();
+            expected.set(2012, DECEMBER, 31, 10, 20, 30);
+            check(cal, expected);
+
+            // default YEAR == 1970
+            cal = builder().setFields(MONTH, JANUARY,
+                                                   DAY_OF_MONTH, 9).build();
+            check(cal, new GregorianCalendar(1970, JANUARY, 9));
+
+            // no parameters are given.
+            calb = builder();
+            cal = calb.build();
+            expected = new GregorianCalendar();
+            expected.clear();
+            check(cal, expected);
+
+            // Thai Buddhist calendar
+            calb = builder();
+            cal = calb.setCalendarType("buddhist").setDate(2556, JANUARY, 31).build();
+            expected = Calendar.getInstance(thTH);
+            expected.clear();
+            expected.set(2556, JANUARY, 31);
+            check(cal, expected);
+            // setLocale
+            calb = builder();
+            cal = calb.setLocale(thTH).setDate(2556, JANUARY, 31).build();
+            check(cal, expected);
+
+            // Japanese Imperial calendar
+            cal = builder().setCalendarType("japanese")
+                .setFields(YEAR, 1, DAY_OF_YEAR, 1).build();
+            expected = Calendar.getInstance(jaJPJP);
+            expected.clear();
+            expected.set(1, JANUARY, 8);
+            check(cal, expected);
+            // setLocale
+            calb = builder();
+            cal = calb.setLocale(jaJPJP).setFields(YEAR, 1, DAY_OF_YEAR, 1).build();
+            check(cal, expected);
+
+            testExceptions();
+        } finally {
+            // Restore default Locale and TimeZone
+            Locale.setDefault(loc);
+            TimeZone.setDefault(tz);
+        }
+        if (error > 0) {
+            throw new RuntimeException("Failed");
+        }
+    }
+
+    private static void testExceptions() {
+        Calendar.Builder calb;
+        Calendar cal;
+
+        // NPE
+        try {
+            calb = builder().setInstant((Date)null);
+            noException("setInstant((Date)null)");
+        } catch (NullPointerException npe) {
+        }
+        try {
+            calb = builder().setCalendarType(null);
+            noException("setCalendarType(null)");
+        } catch (NullPointerException npe) {
+        }
+        try {
+            calb = builder().setLocale(null);
+            noException("setLocale(null)");
+        } catch (NullPointerException npe) {
+        }
+        try {
+            calb = builder().setTimeZone(null);
+            noException("setTimeZone(null)");
+        } catch (NullPointerException npe) {
+        }
+
+        // IllegalArgumentException
+        try {
+            // invalid field index in set
+            calb = builder().set(100, 2013);
+            noException("set(100, 2013)");
+        } catch (IllegalArgumentException e) {
+        }
+        try {
+            // invalid field index in setField
+            calb = builder().setFields(100, 2013);
+            noException("setFields(100, 2013)");
+        } catch (IllegalArgumentException e) {
+        }
+        try {
+            // odd number of arguments
+            calb = builder().setFields(YEAR, 2013, MONTH);
+            noException("setFields(YEAR, 2013, MONTH)");
+        } catch (IllegalArgumentException e) {
+        }
+        try {
+            // unknown calendar type
+            calb = builder().setCalendarType("foo");
+            noException("setCalendarType(\"foo\")");
+        } catch (IllegalArgumentException e) {
+        }
+        try {
+            // invalid week definition parameter
+            calb = builder().setWeekDefinition(8, 1);
+            noException("setWeekDefinition(8, 1)");
+        } catch (IllegalArgumentException e) {
+        }
+        try {
+            // invalid week definition parameter
+            calb = builder().setWeekDefinition(SUNDAY, 0);
+            noException("setWeekDefinition(8, 1)");
+        } catch (IllegalArgumentException e) {
+        }
+
+        try {
+            // sets both instant and field parameters
+            calb = builder().setInstant(new Date()).setDate(2013, JANUARY, 1);
+            noException("setInstant(new Date()).setDate(2013, JANUARY, 1)");
+        } catch (IllegalStateException e) {
+        }
+        try {
+            // sets both field parameters and instant
+            calb = builder().setDate(2013, JANUARY, 1).setInstant(new Date());
+            noException("setDate(2013, JANUARY, 1).setInstant(new Date())");
+        } catch (IllegalStateException e) {
+        }
+        try {
+            // sets inconsistent calendar types
+            calb = builder().setCalendarType("iso8601").setCalendarType("japanese");
+            noException("setCalendarType(\"iso8601\").setCalendarType(\"japanese\")");
+        } catch (IllegalStateException e) {
+        }
+
+        // IllegalArgumentException in build()
+        calb = nonLenientBuilder().set(MONTH, 100);
+        checkException(calb, IllegalArgumentException.class);
+        calb = nonLenientBuilder().setTimeOfDay(23, 59, 70);
+        checkException(calb, IllegalArgumentException.class);
+        calb = builder().setCalendarType("japanese").setWeekDate(2013, 1, MONDAY);
+        checkException(calb, IllegalArgumentException.class);
+    }
+
+    private static Calendar.Builder builder() {
+        return new Calendar.Builder();
+    }
+
+    private static Calendar.Builder nonLenientBuilder() {
+        return builder().setLenient(false);
+    }
+
+    private static Calendar getISO8601() {
+        GregorianCalendar cal = new GregorianCalendar();
+        cal.setFirstDayOfWeek(MONDAY);
+        cal.setMinimalDaysInFirstWeek(4);
+        cal.setGregorianChange(new Date(Long.MIN_VALUE));
+        cal.clear();
+        return cal;
+    }
+
+    private static void check(Calendar cal, Calendar expected) {
+        if (!cal.equals(expected)) {
+            error++;
+            System.err.println("FAILED:");
+            System.err.println("\t     cal = "+cal.getTime());
+            System.err.println("\texpected = "+expected.getTime());
+            System.err.printf("\tcal = %s%n\texp = %s%n", cal, expected);
+        }
+    }
+
+    private static void checkException(Calendar.Builder calb, Class<? extends Exception> exception) {
+        try {
+            Calendar cal = calb.build();
+            error++;
+            System.err.println("expected exception: " + exception);
+        } catch (Exception e) {
+            if (!e.getClass().equals(exception)) {
+                error++;
+                System.err.println("unexpected exception: " + e.getClass() + ", expected: " + exception);
+            }
+        }
+    }
+
+    private static void noException(String msg) {
+        error++;
+        System.err.println("no exception with "+msg);
+    }
+}

test/java/util/Calendar/CalendarTypeTest.java

 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, 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
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 7151414
+ * @bug 7151414 4745761
  * @summary Unit test for calendar types
  */
 
@@ -39,20 +39,21 @@ public class CalendarTypeTest {
         new Locale("ja", "JP", "JP"),
         Locale.forLanguageTag("en-US-u-ca-japanese"),
     };
-    static String[] types = new String[] {
+    static final String[] TYPES = new String[] {
         "gregory",
-        "gregory",
-        "buddhist",
         "buddhist",
         "japanese",
-        "japanese",
+    };
+    static final String[] ALIASES = new String[] {
+        "gregorian",
+        "iso8601",
     };
 
     public static void main(String[] args) {
         for (int i = 0; i < locales.length; i++) {
             Calendar cal = Calendar.getInstance(locales[i]);
             String type = cal.getCalendarType();
-            checkValue("bad calendar type", type, types[i]);
+            checkValue("bad calendar type", type, TYPES[i/2]);
         }
 
         GregorianCalendar gcal = new GregorianCalendar();
@@ -63,6 +64,21 @@ public class CalendarTypeTest {
 
         Calendar k = new Koyomi();
         checkValue("bad class name", k.getCalendarType(), k.getClass().getName());
+
+        Set<String> types = Calendar.getAvailableCalendarTypes();
+        if (types.size() != 3) {
+            throw new RuntimeException("size != 3");
+        }
+        for (String s : TYPES) {
+            if (!types.contains(s)) {
+                throw new RuntimeException(s + " not contained");
+            }
+        }
+        for (String s : ALIASES) {
+            if (types.contains(s)) {
+                throw new RuntimeException("alias " + s + " contained");
+            }
+        }
     }
 
     private static void checkValue(String msg, String got, String expected) {