< prev index next >
test/jdk/java/time/tck/java/time/format/TCKOffsetPrinterParser.java
Print this page
*** 1,7 ****
/*
! * Copyright (c) 2012, 2016, 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.
--- 1,7 ----
/*
! * Copyright (c) 2012, 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.
*** 67,76 ****
--- 67,77 ----
import java.time.ZoneOffset;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeFormatterBuilder;
import java.time.format.TextStyle;
+ import java.util.Locale;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
*** 78,87 ****
--- 79,90 ----
* Test DateTimeFormatterBuilder.appendOffset().
*/
@Test
public class TCKOffsetPrinterParser {
+ private static final LocalDateTime DT_2012_06_30_12_30_40 = LocalDateTime.of(2012, 6, 30, 12, 30, 40);
+
private static final ZoneOffset OFFSET_UTC = ZoneOffset.UTC;
private static final ZoneOffset OFFSET_P0100 = ZoneOffset.ofHours(1);
private static final ZoneOffset OFFSET_P0123 = ZoneOffset.ofHoursMinutes(1, 23);
private static final ZoneOffset OFFSET_P0023 = ZoneOffset.ofHoursMinutes(0, 23);
private static final ZoneOffset OFFSET_P012345 = ZoneOffset.ofHoursMinutesSeconds(1, 23, 45);
*** 89,108 ****
private static final ZoneOffset OFFSET_M0100 = ZoneOffset.ofHours(-1);
private static final ZoneOffset OFFSET_M0123 = ZoneOffset.ofHoursMinutes(-1, -23);
private static final ZoneOffset OFFSET_M0023 = ZoneOffset.ofHoursMinutes(0, -23);
private static final ZoneOffset OFFSET_M012345 = ZoneOffset.ofHoursMinutesSeconds(-1, -23, -45);
private static final ZoneOffset OFFSET_M000045 = ZoneOffset.ofHoursMinutesSeconds(0, 0, -45);
- private static final LocalDateTime DT_2012_06_30_12_30_40 = LocalDateTime.of(2012, 6, 30, 12, 30, 40);
private static final ZoneOffset OFFSET_P1100 = ZoneOffset.ofHours(11);
private static final ZoneOffset OFFSET_P1123 = ZoneOffset.ofHoursMinutes(11, 23);
private static final ZoneOffset OFFSET_P1023 = ZoneOffset.ofHoursMinutes(10, 23);
private static final ZoneOffset OFFSET_P112345 = ZoneOffset.ofHoursMinutesSeconds(11, 23, 45);
private static final ZoneOffset OFFSET_P100045 = ZoneOffset.ofHoursMinutesSeconds(10, 0, 45);
private static final ZoneOffset OFFSET_M1100 = ZoneOffset.ofHours(-11);
private static final ZoneOffset OFFSET_M1123 = ZoneOffset.ofHoursMinutes(-11, -23);
private static final ZoneOffset OFFSET_M112345 = ZoneOffset.ofHoursMinutesSeconds(-11, -23, -45);
private DateTimeFormatterBuilder builder;
@BeforeMethod
public void setUp() {
builder = new DateTimeFormatterBuilder();
--- 92,125 ----
private static final ZoneOffset OFFSET_M0100 = ZoneOffset.ofHours(-1);
private static final ZoneOffset OFFSET_M0123 = ZoneOffset.ofHoursMinutes(-1, -23);
private static final ZoneOffset OFFSET_M0023 = ZoneOffset.ofHoursMinutes(0, -23);
private static final ZoneOffset OFFSET_M012345 = ZoneOffset.ofHoursMinutesSeconds(-1, -23, -45);
private static final ZoneOffset OFFSET_M000045 = ZoneOffset.ofHoursMinutesSeconds(0, 0, -45);
private static final ZoneOffset OFFSET_P1100 = ZoneOffset.ofHours(11);
private static final ZoneOffset OFFSET_P1123 = ZoneOffset.ofHoursMinutes(11, 23);
private static final ZoneOffset OFFSET_P1023 = ZoneOffset.ofHoursMinutes(10, 23);
private static final ZoneOffset OFFSET_P112345 = ZoneOffset.ofHoursMinutesSeconds(11, 23, 45);
private static final ZoneOffset OFFSET_P100045 = ZoneOffset.ofHoursMinutesSeconds(10, 0, 45);
private static final ZoneOffset OFFSET_M1100 = ZoneOffset.ofHours(-11);
private static final ZoneOffset OFFSET_M1123 = ZoneOffset.ofHoursMinutes(-11, -23);
private static final ZoneOffset OFFSET_M112345 = ZoneOffset.ofHoursMinutesSeconds(-11, -23, -45);
+
+ private static final Locale LOCALE_AM = new Locale("am");
+ private static final Locale LOCALE_AR = new Locale("ar");
+ private static final Locale LOCALE_BG = new Locale("bg");
+ private static final Locale LOCALE_CN = Locale.CHINESE;
+ private static final Locale LOCALE_EN = Locale.ENGLISH;
+ private static final Locale LOCALE_EO = new Locale("eo");
+ private static final Locale LOCALE_FR = Locale.FRANCE;
+ private static final Locale LOCALE_GA = new Locale("ga");
+ private static final Locale LOCALE_KM = new Locale("km");
+ private static final Locale LOCALE_ML = new Locale("ml");
+ private static final Locale LOCALE_MR = new Locale("mr");
+ private static final Locale LOCALE_SE = new Locale("se");
+ private static final Locale LOCALE_YO_BJ = new Locale("yo", "BJ");
+
private DateTimeFormatterBuilder builder;
@BeforeMethod
public void setUp() {
builder = new DateTimeFormatterBuilder();
*** 441,472 ****
}
@DataProvider(name="print_localized")
Object[][] data_print_localized() {
return new Object[][] {
! {TextStyle.FULL, DT_2012_06_30_12_30_40, OFFSET_UTC, "GMT"},
! {TextStyle.FULL, DT_2012_06_30_12_30_40, OFFSET_P0100, "GMT+01:00"},
! {TextStyle.FULL, DT_2012_06_30_12_30_40, OFFSET_P0123, "GMT+01:23"},
! {TextStyle.FULL, DT_2012_06_30_12_30_40, OFFSET_P0023, "GMT+00:23"},
! {TextStyle.FULL, DT_2012_06_30_12_30_40, OFFSET_P012345, "GMT+01:23:45"},
! {TextStyle.FULL, DT_2012_06_30_12_30_40, OFFSET_M000045, "GMT-00:00:45"},
! {TextStyle.FULL, DT_2012_06_30_12_30_40, OFFSET_M0100, "GMT-01:00"},
! {TextStyle.FULL, DT_2012_06_30_12_30_40, OFFSET_M0123, "GMT-01:23"},
! {TextStyle.FULL, DT_2012_06_30_12_30_40, OFFSET_M0023, "GMT-00:23"},
! {TextStyle.FULL, DT_2012_06_30_12_30_40, OFFSET_M012345, "GMT-01:23:45"},
! {TextStyle.FULL, DT_2012_06_30_12_30_40, OFFSET_M000045, "GMT-00:00:45"},
! {TextStyle.SHORT, DT_2012_06_30_12_30_40, OFFSET_UTC, "GMT"},
! {TextStyle.SHORT, DT_2012_06_30_12_30_40, OFFSET_P0100, "GMT+1"},
! {TextStyle.SHORT, DT_2012_06_30_12_30_40, OFFSET_P0123, "GMT+1:23"},
! {TextStyle.SHORT, DT_2012_06_30_12_30_40, OFFSET_P0023, "GMT+0:23"},
! {TextStyle.SHORT, DT_2012_06_30_12_30_40, OFFSET_P012345, "GMT+1:23:45"},
! {TextStyle.SHORT, DT_2012_06_30_12_30_40, OFFSET_M000045, "GMT-0:00:45"},
! {TextStyle.SHORT, DT_2012_06_30_12_30_40, OFFSET_M0100, "GMT-1"},
! {TextStyle.SHORT, DT_2012_06_30_12_30_40, OFFSET_M0123, "GMT-1:23"},
! {TextStyle.SHORT, DT_2012_06_30_12_30_40, OFFSET_M0023, "GMT-0:23"},
! {TextStyle.SHORT, DT_2012_06_30_12_30_40, OFFSET_M012345, "GMT-1:23:45"},
! {TextStyle.SHORT, DT_2012_06_30_12_30_40, OFFSET_M000045, "GMT-0:00:45"},
};
}
@Test(dataProvider="print")
public void test_print(String offsetPattern, String noOffset, LocalDateTime ldt, ZoneId zone, String expected) {
--- 458,502 ----
}
@DataProvider(name="print_localized")
Object[][] data_print_localized() {
return new Object[][] {
! {TextStyle.FULL, DT_2012_06_30_12_30_40, OFFSET_UTC, null, "GMT"},
! {TextStyle.FULL, DT_2012_06_30_12_30_40, OFFSET_P0100, null, "GMT+01:00"},
! {TextStyle.FULL, DT_2012_06_30_12_30_40, OFFSET_P0123, null, "GMT+01:23"},
! {TextStyle.FULL, DT_2012_06_30_12_30_40, OFFSET_P0023, null, "GMT+00:23"},
! {TextStyle.FULL, DT_2012_06_30_12_30_40, OFFSET_P012345, null, "GMT+01:23:45"},
! {TextStyle.FULL, DT_2012_06_30_12_30_40, OFFSET_M000045, null, "GMT-00:00:45"},
! {TextStyle.FULL, DT_2012_06_30_12_30_40, OFFSET_M0100, null, "GMT-01:00"},
! {TextStyle.FULL, DT_2012_06_30_12_30_40, OFFSET_M0123, null, "GMT-01:23"},
! {TextStyle.FULL, DT_2012_06_30_12_30_40, OFFSET_M0023, null, "GMT-00:23"},
! {TextStyle.FULL, DT_2012_06_30_12_30_40, OFFSET_M012345, null, "GMT-01:23:45"},
! {TextStyle.FULL, DT_2012_06_30_12_30_40, OFFSET_M000045, null, "GMT-00:00:45"},
! {TextStyle.SHORT, DT_2012_06_30_12_30_40, OFFSET_UTC, null, "GMT"},
! {TextStyle.SHORT, DT_2012_06_30_12_30_40, OFFSET_P0100, null, "GMT+1"},
! {TextStyle.SHORT, DT_2012_06_30_12_30_40, OFFSET_P0123, null, "GMT+1:23"},
! {TextStyle.SHORT, DT_2012_06_30_12_30_40, OFFSET_P0023, null, "GMT+0:23"},
! {TextStyle.SHORT, DT_2012_06_30_12_30_40, OFFSET_P012345, null, "GMT+1:23:45"},
! {TextStyle.SHORT, DT_2012_06_30_12_30_40, OFFSET_M000045, null, "GMT-0:00:45"},
! {TextStyle.SHORT, DT_2012_06_30_12_30_40, OFFSET_M0100, null, "GMT-1"},
! {TextStyle.SHORT, DT_2012_06_30_12_30_40, OFFSET_M0123, null, "GMT-1:23"},
! {TextStyle.SHORT, DT_2012_06_30_12_30_40, OFFSET_M0023, null, "GMT-0:23"},
! {TextStyle.SHORT, DT_2012_06_30_12_30_40, OFFSET_M012345, null, "GMT-1:23:45"},
! {TextStyle.SHORT, DT_2012_06_30_12_30_40, OFFSET_M000045, null, "GMT-0:00:45"},
! {TextStyle.SHORT, DT_2012_06_30_12_30_40, OFFSET_M0123, LOCALE_AM, "\u1302 \u12a4\u121d \u1272-1:23"},
! {TextStyle.FULL, DT_2012_06_30_12_30_40, OFFSET_M0100, LOCALE_AR, "\u063a\u0631\u064a\u0646\u062a\u0634-01:00"},
! {TextStyle.FULL, DT_2012_06_30_12_30_40, OFFSET_P012345, LOCALE_BG, "\u0413\u0440\u0438\u043d\u0443\u0438\u0447+01:23:45"},
! {TextStyle.FULL, DT_2012_06_30_12_30_40, OFFSET_M000045, LOCALE_CN, "GMT-00:00:45"},
! {TextStyle.FULL, DT_2012_06_30_12_30_40, OFFSET_P012345, LOCALE_EN, "GMT+01:23:45"},
! {TextStyle.SHORT, DT_2012_06_30_12_30_40, OFFSET_M012345, LOCALE_EO, "GMT-1:23:45"},
! {TextStyle.FULL, DT_2012_06_30_12_30_40, OFFSET_P000045, LOCALE_FR, "UTC+00:00:45"},
! {TextStyle.SHORT, DT_2012_06_30_12_30_40, OFFSET_M0100, LOCALE_GA, "MAG-1"},
! {TextStyle.SHORT, DT_2012_06_30_12_30_40, OFFSET_UTC, LOCALE_KM, "\u1798\u17c9\u17c4\u1784\u200b\u179f\u1780\u179b"},
! {TextStyle.FULL, DT_2012_06_30_12_30_40, OFFSET_UTC, LOCALE_ML, "\u0d1c\u0d3f\u0d0e\u0d02\u0d1f\u0d3f"},
! {TextStyle.FULL, DT_2012_06_30_12_30_40, OFFSET_P012345, LOCALE_MR, "[GMT]+01:23:45"},
! {TextStyle.SHORT, DT_2012_06_30_12_30_40, OFFSET_P012345, LOCALE_SE, "UTC+1:23:45"},
! {TextStyle.FULL, DT_2012_06_30_12_30_40, OFFSET_M0100, LOCALE_YO_BJ, "WAT-01:00"}
};
}
@Test(dataProvider="print")
public void test_print(String offsetPattern, String noOffset, LocalDateTime ldt, ZoneId zone, String expected) {
*** 550,590 ****
assertEquals(output, expected);
}
}
@Test(dataProvider="print_localized")
! public void test_print_localized(TextStyle style, LocalDateTime ldt, ZoneOffset offset, String expected) {
OffsetDateTime odt = OffsetDateTime.of(ldt, offset);
ZonedDateTime zdt = ldt.atZone(offset);
! DateTimeFormatter f = new DateTimeFormatterBuilder().appendLocalizedOffset(style)
! .toFormatter();
assertEquals(f.format(odt), expected);
assertEquals(f.format(zdt), expected);
assertEquals(f.parse(expected, ZoneOffset::from), offset);
if (style == TextStyle.FULL) {
! f = new DateTimeFormatterBuilder().appendPattern("ZZZZ")
! .toFormatter();
assertEquals(f.format(odt), expected);
assertEquals(f.format(zdt), expected);
assertEquals(f.parse(expected, ZoneOffset::from), offset);
! f = new DateTimeFormatterBuilder().appendPattern("OOOO")
! .toFormatter();
assertEquals(f.format(odt), expected);
assertEquals(f.format(zdt), expected);
assertEquals(f.parse(expected, ZoneOffset::from), offset);
}
if (style == TextStyle.SHORT) {
! f = new DateTimeFormatterBuilder().appendPattern("O")
! .toFormatter();
assertEquals(f.format(odt), expected);
assertEquals(f.format(zdt), expected);
assertEquals(f.parse(expected, ZoneOffset::from), offset);
}
}
//-----------------------------------------------------------------------
@Test(expectedExceptions=IllegalArgumentException.class)
public void test_print_pattern_X6rejected() {
--- 580,622 ----
assertEquals(output, expected);
}
}
@Test(dataProvider="print_localized")
! public void test_print_localized(TextStyle style, LocalDateTime ldt, ZoneOffset offset, Locale locale, String expected) {
!
OffsetDateTime odt = OffsetDateTime.of(ldt, offset);
ZonedDateTime zdt = ldt.atZone(offset);
! builder = new DateTimeFormatterBuilder().appendLocalizedOffset(style);
! DateTimeFormatter f = (locale != null) ? builder.toFormatter(locale) : builder.toFormatter();
assertEquals(f.format(odt), expected);
assertEquals(f.format(zdt), expected);
assertEquals(f.parse(expected, ZoneOffset::from), offset);
if (style == TextStyle.FULL) {
! builder = new DateTimeFormatterBuilder().appendPattern("ZZZZ");
! f = (locale != null) ? builder.toFormatter(locale) : builder.toFormatter();
assertEquals(f.format(odt), expected);
assertEquals(f.format(zdt), expected);
assertEquals(f.parse(expected, ZoneOffset::from), offset);
! builder = new DateTimeFormatterBuilder().appendPattern("OOOO");
! f = (locale != null) ? builder.toFormatter(locale) : builder.toFormatter();
assertEquals(f.format(odt), expected);
assertEquals(f.format(zdt), expected);
assertEquals(f.parse(expected, ZoneOffset::from), offset);
}
if (style == TextStyle.SHORT) {
! builder = new DateTimeFormatterBuilder().appendPattern("O");
! f = (locale != null) ? builder.toFormatter(locale) : builder.toFormatter();
assertEquals(f.format(odt), expected);
assertEquals(f.format(zdt), expected);
assertEquals(f.parse(expected, ZoneOffset::from), offset);
}
+
}
//-----------------------------------------------------------------------
@Test(expectedExceptions=IllegalArgumentException.class)
public void test_print_pattern_X6rejected() {
< prev index next >