--- old/test/java/time/tck/java/time/format/TCKLocalizedFieldPrinter.java 2013-04-11 23:17:43.000000000 -0700 +++ new/test/java/time/tck/java/time/format/TCKLocalizedFieldPrinter.java 2013-04-11 23:17:43.000000000 -0700 @@ -59,22 +59,22 @@ */ package tck.java.time.format; -import java.time.format.*; - import static org.testng.Assert.assertEquals; -import static org.testng.Assert.fail; import java.time.LocalDate; - -import test.java.time.format.AbstractTestPrinterParser; +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeFormatterBuilder; +import java.time.temporal.WeekFields; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; +import test.java.time.format.AbstractTestPrinterParser; + /** * Test LocalizedFieldPrinterParser. */ -@Test(groups={"tck"}) +@Test public class TCKLocalizedFieldPrinter extends AbstractTestPrinterParser { //----------------------------------------------------------------------- @@ -82,17 +82,17 @@ Object[][] provider_pad() { return new Object[][] { {"e", "6"}, - {"w", "3"}, - {"W", "29"}, - {"WW", "29"}, - {"'Date: 'y-MM-d', week-of-month: 'w', week-of-year: 'W", + {"W", "3"}, + {"w", "29"}, + {"ww", "29"}, + {"'Date: 'y-MM-d', week-of-month: 'W', week-of-year: 'w", "Date: 2012-07-20, week-of-month: 3, week-of-year: 29"}, }; } //----------------------------------------------------------------------- - @Test(dataProvider="Patterns",groups={"tck"}) + @Test(dataProvider="Patterns") public void test_localizedDayOfWeek(String pattern, String expected) { DateTimeFormatterBuilder b = new DateTimeFormatterBuilder().appendPattern(pattern); @@ -102,4 +102,28 @@ assertEquals(result, expected, "Wrong output for pattern '" + pattern + "'."); } + //----------------------------------------------------------------------- + @DataProvider(name="LocalWeekBasedYearPatterns") + Object[][] provider_patternLocalWeekBasedYearDate() { + return new Object[][] { + {"e w Y", "6 29 2012", LocalDate.of(2012, 7, 20)}, + {"'Date: 'Y', day-of-week: 'e', week-of-year: 'w", + "Date: 2012, day-of-week: 6, week-of-year: 29", LocalDate.of(2012, 7, 20)}, + {"Y-ww-ee", "2008-01-01", LocalDate.of(2007, 12, 30)}, + {"Y-w-e", "2008-52-1", LocalDate.of(2008, 12, 21)}, + {"Y-w-e", "2008-52-7", LocalDate.of(2008, 12, 27)}, + {"Y-ww-e", "2009-01-1", LocalDate.of(2008, 12, 28)}, + {"Y-w-e", "2009-1-4", LocalDate.of(2008, 12, 31)}, + {"Y-w-e", "2009-1-5", LocalDate.of(2009, 1, 1)}, + {"YYYYYYYYY-w-e", "000002009-1-5", LocalDate.of(2009, 1, 1)}, + }; + } + + @Test(dataProvider = "LocalWeekBasedYearPatterns") + public void test_print_WeekBasedYear(String pattern, String expectedText, LocalDate date) { + DateTimeFormatter dtf = DateTimeFormatter.ofPattern(pattern, locale); + String result = dtf.format(date); + WeekFields weekDef = WeekFields.of(locale); + assertEquals(result, expectedText, "Incorrect formatting for " + pattern + ", weekDef: " + weekDef); + } }