8022770: java/time/tck/java/time/chrono/TCKChronology.java start failing
8022766: java/time/test/java/time/chrono/TestUmmAlQuraChronology.java failed.
Summary: TCKChronology: corrected display name to match update from JDK-8015986
Reviewed-by: alanb
--- a/jdk/test/java/time/tck/java/time/chrono/TCKChronology.java Tue Aug 13 11:16:37 2013 +0200
+++ b/jdk/test/java/time/tck/java/time/chrono/TCKChronology.java Fri Aug 16 11:28:15 2013 -0400
@@ -148,7 +148,7 @@
@DataProvider(name = "calendarDisplayName")
Object[][] data_of_calendarDisplayNames() {
return new Object[][] {
- {"Hijrah", "Hijrah-umalqura"},
+ {"Hijrah", "Islamic Umm al-Qura Calendar"},
{"ISO", "ISO"},
{"Japanese", "Japanese Calendar"},
{"Minguo", "Minguo Calendar"},
--- a/jdk/test/java/time/test/java/time/chrono/TestUmmAlQuraChronology.java Tue Aug 13 11:16:37 2013 +0200
+++ b/jdk/test/java/time/test/java/time/chrono/TestUmmAlQuraChronology.java Fri Aug 16 11:28:15 2013 -0400
@@ -438,13 +438,13 @@
// Test to verify the formatted dates
@Test(dataProvider="patternMonthNames")
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);
}
// Data provider for localized dates
@DataProvider(name="chronoDateTimes")
- Object[][] data_chronodatetimes() {
+ Object[][] data_chronodatetimes() {
return new Object[][] {
{1432, 12, 29, "Safar 1, 1434 AH"},
{1433, 1, 30, "Safar 30, 1434 AH"},
@@ -463,7 +463,7 @@
hdt = hdt.plus(1, ChronoUnit.HOURS);
hdt = hdt.plus(1, ChronoUnit.MINUTES);
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);
}