--- /dev/null 2013-01-18 16:17:08.886776012 -0800 +++ new/test/java/time/test/java/time/temporal/TestDateTimeBuilderCombinations.java 2013-01-22 16:59:29.000000000 -0800 @@ -0,0 +1,171 @@ +/* + * 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 + * 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. + */ + +/* + * This file is available under and governed by the GNU General Public + * License version 2 only, as published by the Free Software Foundation. + * However, the following notice accompanied the original version of this + * file: + * + * Copyright (c) 2008-2012, Stephen Colebourne & Michael Nascimento Santos + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * * Neither the name of JSR-310 nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package test.java.time.temporal; + +import static java.time.temporal.ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH; +import static java.time.temporal.ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR; +import static java.time.temporal.ChronoField.ALIGNED_WEEK_OF_MONTH; +import static java.time.temporal.ChronoField.ALIGNED_WEEK_OF_YEAR; +import static java.time.temporal.ChronoField.DAY_OF_MONTH; +import static java.time.temporal.ChronoField.DAY_OF_WEEK; +import static java.time.temporal.ChronoField.DAY_OF_YEAR; +import static java.time.temporal.ChronoField.EPOCH_DAY; +import static java.time.temporal.ChronoField.EPOCH_MONTH; +import static java.time.temporal.ChronoField.MONTH_OF_YEAR; +import static java.time.temporal.ChronoField.YEAR; +import static org.testng.Assert.assertEquals; + +import java.time.LocalDate; +import java.time.format.DateTimeBuilder; +import java.time.temporal.TemporalField; + +import org.testng.annotations.DataProvider; +import org.testng.annotations.Test; + +/** + * Test. + */ +public class TestDateTimeBuilderCombinations { + + @DataProvider(name = "combine") + Object[][] data_combine() { + return new Object[][] { + {YEAR, 2012, MONTH_OF_YEAR, 6, DAY_OF_MONTH, 3, null, null, LocalDate.class, LocalDate.of(2012, 6, 3)}, + {EPOCH_MONTH, (2012 - 1970) * 12 + 6 - 1, DAY_OF_MONTH, 3, null, null, null, null, LocalDate.class, LocalDate.of(2012, 6, 3)}, + {YEAR, 2012, ALIGNED_WEEK_OF_YEAR, 6, DAY_OF_WEEK, 3, null, null, LocalDate.class, LocalDate.of(2012, 2, 8)}, + {YEAR, 2012, DAY_OF_YEAR, 155, null, null, null, null, LocalDate.class, LocalDate.of(2012, 6, 3)}, +// {ERA, 1, YEAR_OF_ERA, 2012, DAY_OF_YEAR, 155, null, null, LocalDate.class, LocalDate.of(2012, 6, 3)}, + {YEAR, 2012, MONTH_OF_YEAR, 6, null, null, null, null, LocalDate.class, null}, + {EPOCH_DAY, 12, null, null, null, null, null, null, LocalDate.class, LocalDate.of(1970, 1, 13)}, + }; + } + + @Test(dataProvider = "combine") + public void test_derive(TemporalField field1, Number value1, TemporalField field2, Number value2, + TemporalField field3, Number value3, TemporalField field4, Number value4, Class query, Object expectedVal) { + DateTimeBuilder builder = new DateTimeBuilder(field1, value1.longValue()); + if (field2 != null) { + builder.addFieldValue(field2, value2.longValue()); + } + if (field3 != null) { + builder.addFieldValue(field3, value3.longValue()); + } + if (field4 != null) { + builder.addFieldValue(field4, value4.longValue()); + } + builder.resolve(); + assertEquals(builder.extract((Class) query), expectedVal); + } + + //----------------------------------------------------------------------- + @DataProvider(name = "normalized") + Object[][] data_normalized() { + return new Object[][] { + {YEAR, 2127, null, null, null, null, YEAR, 2127}, + {MONTH_OF_YEAR, 12, null, null, null, null, MONTH_OF_YEAR, 12}, + {DAY_OF_YEAR, 127, null, null, null, null, DAY_OF_YEAR, 127}, + {DAY_OF_MONTH, 23, null, null, null, null, DAY_OF_MONTH, 23}, + {DAY_OF_WEEK, 127, null, null, null, null, DAY_OF_WEEK, 127L}, + {ALIGNED_WEEK_OF_YEAR, 23, null, null, null, null, ALIGNED_WEEK_OF_YEAR, 23}, + {ALIGNED_DAY_OF_WEEK_IN_YEAR, 4, null, null, null, null, ALIGNED_DAY_OF_WEEK_IN_YEAR, 4L}, + {ALIGNED_WEEK_OF_MONTH, 4, null, null, null, null, ALIGNED_WEEK_OF_MONTH, 4}, + {ALIGNED_DAY_OF_WEEK_IN_MONTH, 3, null, null, null, null, ALIGNED_DAY_OF_WEEK_IN_MONTH, 3}, + {EPOCH_MONTH, 15, null, null, null, null, EPOCH_MONTH, null}, + {EPOCH_MONTH, 15, null, null, null, null, YEAR, 1971}, + {EPOCH_MONTH, 15, null, null, null, null, MONTH_OF_YEAR, 4}, + }; + } + + @Test(dataProvider = "normalized") + public void test_normalized(TemporalField field1, Number value1, TemporalField field2, Number value2, + TemporalField field3, Number value3, TemporalField query, Number expectedVal) { + DateTimeBuilder builder = new DateTimeBuilder(field1, value1.longValue()); + if (field2 != null) { + builder.addFieldValue(field2, value2.longValue()); + } + if (field3 != null) { + builder.addFieldValue(field3, value3.longValue()); + } + builder.resolve(); + if (expectedVal != null) { + assertEquals(builder.getLong(query), expectedVal.longValue()); + } else { + assertEquals(builder.containsFieldValue(query), false); + } + } + + //----------------------------------------------------------------------- + // TODO: maybe reinstate +// public void test_split() { +// DateTimeBuilder builder = new DateTimeBuilder(); +// builder.addCalendrical(LocalDateTime.of(2012, 6, 30, 12, 30)); +// builder.addCalendrical(ZoneOffset.ofHours(2)); +// builder.resolve(); +// assertEquals(builder.build(LocalDate.class), LocalDate.of(2012, 6, 30)); +// assertEquals(builder.build(LocalTime.class), LocalTime.of(12, 30)); +// assertEquals(builder.build(ZoneOffset.class), ZoneOffset.ofHours(2)); +// +// assertEquals(builder.build(LocalDateTime.class), LocalDateTime.of(2012, 6, 30, 12, 30)); +// assertEquals(builder.build(OffsetDate.class), OffsetDate.of(LocalDate.of(2012, 6, 30), ZoneOffset.ofHours(2))); +// assertEquals(builder.build(OffsetTime.class), OffsetTime.of(LocalTime.of(12, 30), ZoneOffset.ofHours(2))); +//// assertEquals(builder.build(OffsetDateTime.class), OffsetDateTime.of(2012, 6, 30, 12, 30, ZoneOffset.ofHours(2))); +// } + +}