8022770: java/time/tck/java/time/chrono/TCKChronology.java start failing

8022766: java/time/test/java/time/chrono/TestUmmAlQuraChronology.java failed

TCKChronology: corrected display name to match update from JDK-8015986

Reviewed-by: alanb
This commit is contained in:
Roger Riggs 2013-08-16 11:28:15 -04:00
parent e77f64d8dd
commit a7ac24961a
2 changed files with 4 additions and 4 deletions

View File

@ -148,7 +148,7 @@ public class TCKChronology {
@DataProvider(name = "calendarDisplayName") @DataProvider(name = "calendarDisplayName")
Object[][] data_of_calendarDisplayNames() { Object[][] data_of_calendarDisplayNames() {
return new Object[][] { return new Object[][] {
{"Hijrah", "Hijrah-umalqura"}, {"Hijrah", "Islamic Umm al-Qura Calendar"},
{"ISO", "ISO"}, {"ISO", "ISO"},
{"Japanese", "Japanese Calendar"}, {"Japanese", "Japanese Calendar"},
{"Minguo", "Minguo Calendar"}, {"Minguo", "Minguo Calendar"},

View File

@ -438,13 +438,13 @@ public class TestUmmAlQuraChronology {
// Test to verify the formatted dates // Test to verify the formatted dates
@Test(dataProvider="patternMonthNames") @Test(dataProvider="patternMonthNames")
public void test_ofPattern(int year, int month, int day, String expected) { public void test_ofPattern(int year, int month, int day, String expected) {
DateTimeFormatter test = DateTimeFormatter.ofPattern("dd G E MMMM yyyy"); DateTimeFormatter test = DateTimeFormatter.ofPattern("dd G E MMMM yyyy", Locale.US);
assertEquals(test.format(HijrahDate.of(year, month, day)), expected); assertEquals(test.format(HijrahDate.of(year, month, day)), expected);
} }
// Data provider for localized dates // Data provider for localized dates
@DataProvider(name="chronoDateTimes") @DataProvider(name="chronoDateTimes")
Object[][] data_chronodatetimes() { Object[][] data_chronodatetimes() {
return new Object[][] { return new Object[][] {
{1432, 12, 29, "Safar 1, 1434 AH"}, {1432, 12, 29, "Safar 1, 1434 AH"},
{1433, 1, 30, "Safar 30, 1434 AH"}, {1433, 1, 30, "Safar 30, 1434 AH"},
@ -463,7 +463,7 @@ public class TestUmmAlQuraChronology {
hdt = hdt.plus(1, ChronoUnit.HOURS); hdt = hdt.plus(1, ChronoUnit.HOURS);
hdt = hdt.plus(1, ChronoUnit.MINUTES); hdt = hdt.plus(1, ChronoUnit.MINUTES);
hdt = hdt.plus(1, ChronoUnit.SECONDS); hdt = hdt.plus(1, ChronoUnit.SECONDS);
DateTimeFormatter df = DateTimeFormatter.ofLocalizedDate(FormatStyle.LONG).withChronology(Chronology.of("Hijrah-umalqura")).withLocale(Locale.forLanguageTag("en-US")); DateTimeFormatter df = DateTimeFormatter.ofLocalizedDate(FormatStyle.LONG).withChronology(Chronology.of("Hijrah-umalqura")).withLocale(Locale.US);
assertEquals(df.format(hdt), expected); assertEquals(df.format(hdt), expected);
} }