--- old/test/java/time/test/java/time/temporal/TestMonthDay.java 2013-02-08 10:49:27.000000000 -0800 +++ /dev/null 2013-01-18 16:17:08.886776012 -0800 @@ -1,148 +0,0 @@ -/* - * 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 org.testng.Assert.assertEquals; -import static org.testng.Assert.assertSame; -import static org.testng.Assert.assertTrue; - -import java.time.LocalDate; -import java.time.Month; -import java.time.temporal.MonthDay; - -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; -import test.java.time.AbstractTest; - -/** - * Test MonthDay. - */ -@Test -public class TestMonthDay extends AbstractTest { - - private MonthDay TEST_07_15; - - @BeforeMethod(groups={"tck","implementation"}) - public void setUp() { - TEST_07_15 = MonthDay.of(7, 15); - } - - //----------------------------------------------------------------------- - @Test - public void test_immutable() { - assertImmutable(MonthDay.class); - } - - //----------------------------------------------------------------------- - void check(MonthDay test, int m, int d) { - assertEquals(test.getMonth().getValue(), m); - assertEquals(test.getDayOfMonth(), d); - } - - @Test(groups={"implementation"}) - public void test_with_Month_noChangeSame() { - MonthDay test = MonthDay.of(6, 30); - assertSame(test.with(Month.JUNE), test); - } - - @Test(groups={"implementation"}) - public void test_withMonth_int_noChangeSame() { - MonthDay test = MonthDay.of(6, 30); - assertSame(test.withMonth(6), test); - } - @Test(groups={"implementation"}) - public void test_withDayOfMonth_noChangeSame() { - MonthDay test = MonthDay.of(6, 30); - assertSame(test.withDayOfMonth(30), test); - } - - @Test(groups={"implementation"}) - public void test_adjustDate_same() { - MonthDay test = MonthDay.of(6, 30); - LocalDate date = LocalDate.of(2007, 6, 30); - assertSame(test.adjustInto(date), date); - } - - void doTest_comparisons_MonthDay(MonthDay... localDates) { - for (int i = 0; i < localDates.length; i++) { - MonthDay a = localDates[i]; - for (int j = 0; j < localDates.length; j++) { - MonthDay b = localDates[j]; - if (i < j) { - assertTrue(a.compareTo(b) < 0, a + " <=> " + b); - assertEquals(a.isBefore(b), true, a + " <=> " + b); - assertEquals(a.isAfter(b), false, a + " <=> " + b); - assertEquals(a.equals(b), false, a + " <=> " + b); - } else if (i > j) { - assertTrue(a.compareTo(b) > 0, a + " <=> " + b); - assertEquals(a.isBefore(b), false, a + " <=> " + b); - assertEquals(a.isAfter(b), true, a + " <=> " + b); - assertEquals(a.equals(b), false, a + " <=> " + b); - } else { - assertEquals(a.compareTo(b), 0, a + " <=> " + b); - assertEquals(a.isBefore(b), false, a + " <=> " + b); - assertEquals(a.isAfter(b), false, a + " <=> " + b); - assertEquals(a.equals(b), true, a + " <=> " + b); - } - } - } - } - -} --- /dev/null 2013-01-18 16:17:08.886776012 -0800 +++ new/test/java/time/test/java/time/TestMonthDay.java 2013-02-08 10:49:27.000000000 -0800 @@ -0,0 +1,147 @@ +/* + * 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; + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertSame; +import static org.testng.Assert.assertTrue; + +import java.time.LocalDate; +import java.time.Month; +import java.time.MonthDay; + +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +/** + * Test MonthDay. + */ +@Test +public class TestMonthDay extends AbstractTest { + + private MonthDay TEST_07_15; + + @BeforeMethod(groups={"tck","implementation"}) + public void setUp() { + TEST_07_15 = MonthDay.of(7, 15); + } + + //----------------------------------------------------------------------- + @Test + public void test_immutable() { + assertImmutable(MonthDay.class); + } + + //----------------------------------------------------------------------- + void check(MonthDay test, int m, int d) { + assertEquals(test.getMonth().getValue(), m); + assertEquals(test.getDayOfMonth(), d); + } + + @Test(groups={"implementation"}) + public void test_with_Month_noChangeSame() { + MonthDay test = MonthDay.of(6, 30); + assertSame(test.with(Month.JUNE), test); + } + + @Test(groups={"implementation"}) + public void test_withMonth_int_noChangeSame() { + MonthDay test = MonthDay.of(6, 30); + assertSame(test.withMonth(6), test); + } + @Test(groups={"implementation"}) + public void test_withDayOfMonth_noChangeSame() { + MonthDay test = MonthDay.of(6, 30); + assertSame(test.withDayOfMonth(30), test); + } + + @Test(groups={"implementation"}) + public void test_adjustDate_same() { + MonthDay test = MonthDay.of(6, 30); + LocalDate date = LocalDate.of(2007, 6, 30); + assertSame(test.adjustInto(date), date); + } + + void doTest_comparisons_MonthDay(MonthDay... localDates) { + for (int i = 0; i < localDates.length; i++) { + MonthDay a = localDates[i]; + for (int j = 0; j < localDates.length; j++) { + MonthDay b = localDates[j]; + if (i < j) { + assertTrue(a.compareTo(b) < 0, a + " <=> " + b); + assertEquals(a.isBefore(b), true, a + " <=> " + b); + assertEquals(a.isAfter(b), false, a + " <=> " + b); + assertEquals(a.equals(b), false, a + " <=> " + b); + } else if (i > j) { + assertTrue(a.compareTo(b) > 0, a + " <=> " + b); + assertEquals(a.isBefore(b), false, a + " <=> " + b); + assertEquals(a.isAfter(b), true, a + " <=> " + b); + assertEquals(a.equals(b), false, a + " <=> " + b); + } else { + assertEquals(a.compareTo(b), 0, a + " <=> " + b); + assertEquals(a.isBefore(b), false, a + " <=> " + b); + assertEquals(a.isAfter(b), false, a + " <=> " + b); + assertEquals(a.equals(b), true, a + " <=> " + b); + } + } + } + } + +}