< prev index next >

test/java/time/test/java/time/chrono/TestJapaneseChronology.java

Print this page

        

*** 1,7 **** /* ! * 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. Oracle designates this --- 1,7 ---- /* ! * Copyright (c) 2013, 2019, 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. Oracle designates this
*** 56,65 **** --- 56,67 ---- // and the first day of Showa. { JapaneseEra.TAISHO, 15, 12, 24, 1926 }, { JapaneseEra.SHOWA, 1, 12, 25, 1926 }, { JapaneseEra.SHOWA, 64, 1, 7, 1989 }, { JapaneseEra.HEISEI, 1, 1, 8, 1989 }, + { JapaneseEra.HEISEI, 31, 4, 30, 2019 }, + { JapaneseEra.of(3), 1, 5, 1, 2019 }, // NEWERA }; } @DataProvider(name="day_year_data") Object[][] dayYearData() {
*** 72,90 **** { JapaneseEra.SHOWA, 1, 1, 12, 25 }, { JapaneseEra.SHOWA, 2, 8, 1, 8 }, { JapaneseEra.SHOWA, 64, 7, 1, 7 }, { JapaneseEra.HEISEI, 1, 1, 1, 8 }, { JapaneseEra.HEISEI, 2, 8, 1, 8 }, }; } @DataProvider(name="range_data") Object[][] rangeData() { return new Object[][] { // field, minSmallest, minLargest, maxSmallest, maxLargest ! { ChronoField.ERA, -1, -1, 2, 2}, ! { ChronoField.YEAR_OF_ERA, 1, 1, 15, 999999999-1989 }, // depends on the current era { ChronoField.DAY_OF_YEAR, 1, 1, 7, 366}, { ChronoField.YEAR, 1873, 1873, 999999999, 999999999}, }; } --- 74,94 ---- { JapaneseEra.SHOWA, 1, 1, 12, 25 }, { JapaneseEra.SHOWA, 2, 8, 1, 8 }, { JapaneseEra.SHOWA, 64, 7, 1, 7 }, { JapaneseEra.HEISEI, 1, 1, 1, 8 }, { JapaneseEra.HEISEI, 2, 8, 1, 8 }, + { JapaneseEra.HEISEI, 31, 120, 4, 30 }, + { JapaneseEra.of(3), 1, 1, 5, 1 }, // NEWERA }; } @DataProvider(name="range_data") Object[][] rangeData() { return new Object[][] { // field, minSmallest, minLargest, maxSmallest, maxLargest ! { ChronoField.ERA, -1, -1, 3, 3}, ! { ChronoField.YEAR_OF_ERA, 1, 1, 15, 999999999-2019}, // depends on the current era { ChronoField.DAY_OF_YEAR, 1, 1, 7, 366}, { ChronoField.YEAR, 1873, 1873, 999999999, 999999999}, }; }
*** 103,113 **** { JapaneseEra.SHOWA, 2, 2, 29 }, { JapaneseEra.SHOWA, 64, 1, 8 }, { JapaneseEra.SHOWA, 65, 1, 1 }, { JapaneseEra.HEISEI, 1, 1, 7 }, { JapaneseEra.HEISEI, 1, 2, 29 }, ! { JapaneseEra.HEISEI, Year.MAX_VALUE, 12, 31 }, }; } @DataProvider(name="invalid_eraYear") Object[][] invalidEraYearData() { --- 107,119 ---- { JapaneseEra.SHOWA, 2, 2, 29 }, { JapaneseEra.SHOWA, 64, 1, 8 }, { JapaneseEra.SHOWA, 65, 1, 1 }, { JapaneseEra.HEISEI, 1, 1, 7 }, { JapaneseEra.HEISEI, 1, 2, 29 }, ! { JapaneseEra.HEISEI, 31, 5, 1 }, ! { JapaneseEra.of(3), 1, 4, 30 }, // NEWERA ! { JapaneseEra.of(3), Year.MAX_VALUE, 12, 31 }, // NEWERA }; } @DataProvider(name="invalid_eraYear") Object[][] invalidEraYearData() {
*** 122,132 **** { JapaneseEra.SHOWA, -1 }, { JapaneseEra.SHOWA, 0 }, { JapaneseEra.SHOWA, 65 }, { JapaneseEra.HEISEI, -1 }, { JapaneseEra.HEISEI, 0 }, ! { JapaneseEra.HEISEI, Year.MAX_VALUE }, }; } @DataProvider(name="invalid_day_year_data") Object[][] invalidDayYearData() { --- 128,141 ---- { JapaneseEra.SHOWA, -1 }, { JapaneseEra.SHOWA, 0 }, { JapaneseEra.SHOWA, 65 }, { JapaneseEra.HEISEI, -1 }, { JapaneseEra.HEISEI, 0 }, ! { JapaneseEra.HEISEI, 32 }, ! { JapaneseEra.of(3), -1 }, // NEWERA ! { JapaneseEra.of(3), 0 }, // NEWERA ! { JapaneseEra.of(3), Year.MAX_VALUE }, // NEWERA }; } @DataProvider(name="invalid_day_year_data") Object[][] invalidDayYearData() {
*** 139,148 **** --- 148,160 ---- { JapaneseEra.SHOWA, 1, 8 }, { JapaneseEra.SHOWA, 2, 366 }, { JapaneseEra.SHOWA, 64, 8 }, { JapaneseEra.HEISEI, 1, 360 }, { JapaneseEra.HEISEI, 2, 366 }, + { JapaneseEra.HEISEI, 31, 121 }, + { JapaneseEra.of(3), 1, 246 }, // NEWERA + { JapaneseEra.of(3), 2, 367 }, // NEWERA }; } @Test public void test_ofLocale() {
< prev index next >