darlinghq/darling-openjdk
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-openjdk.git synced 2024-12-03 18:11:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

8042131: DateTimeFormatterBuilder Mapped-values do not work for JapaneseDate

Browse Source 
Reviewed-by: rriggs, scolebourne
This commit is contained in:
Toshio Nakamura 2018-06-19 08:19:54 -07:00 committed by Naoto Sato
parent d571ea407c
commit a8506cb4e1
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java
View File

@ -792,6 +792,11 @@ public final class DateTimeFormatterBuilder {
Map<TextStyle, Map<Long, String>> map = Collections.singletonMap(TextStyle.FULL, copy);
final LocaleStore store = new LocaleStore(map);
DateTimeTextProvider provider = new DateTimeTextProvider() {
@Override
public String getText(Chronology chrono, TemporalField field,
long value, TextStyle style, Locale locale) {
return store.getText(value, style);
}
@Override
public String getText(TemporalField field, long value, TextStyle style, Locale locale) {
return store.getText(value, style);

31
test/jdk/java/time/test/java/time/format/TestDateTimeFormatterBuilderWithLocale.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2018, 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
@ -64,17 +64,23 @@
*/
package test.java.time.format;
import java.time.chrono.ChronoLocalDate;
import java.time.chrono.Chronology;
import java.time.chrono.IsoChronology;
import java.time.chrono.JapaneseChronology;
import java.time.chrono.JapaneseEra;
import java.time.chrono.MinguoChronology;
import java.time.chrono.ThaiBuddhistChronology;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeFormatterBuilder;
import java.time.format.FormatStyle;
import java.time.LocalDate;
import java.time.temporal.ChronoField;
import java.time.temporal.Temporal;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import static org.testng.Assert.assertEquals;
@ -114,6 +120,29 @@ public class TestDateTimeFormatterBuilderWithLocale {
assertEquals(test, expected);
}
//-----------------------------------------------------------------------
@DataProvider(name="mapTextLookup")
Object[][] data_mapTextLookup() {
return new Object[][] {
{IsoChronology.INSTANCE.date(1, 1, 1), Locale.ENGLISH},
{JapaneseChronology.INSTANCE.date(JapaneseEra.HEISEI, 1, 1, 8), Locale.ENGLISH},
{MinguoChronology.INSTANCE.date(1, 1, 1), Locale.ENGLISH},
{ThaiBuddhistChronology.INSTANCE.date(1, 1, 1), Locale.ENGLISH},
};
}
@Test(dataProvider="mapTextLookup")
public void test_appendText_mapTextLookup(ChronoLocalDate date, Locale locale) {
final String new1st = "1st";
Map<Long, String> yearMap = new HashMap<>();
yearMap.put(1L, new1st);
builder.appendText(ChronoField.YEAR_OF_ERA, yearMap);
String actual = date.format(builder.toFormatter(locale));
assertEquals(actual, new1st);
}
//-----------------------------------------------------------------------
@DataProvider(name="localePatterns")
Object[][] localizedDateTimePatterns() {