Week picker for android

This adds support for <input type=week> on Android.

ViewHostMsg_DateTimeDialogValue_Params: Adding members for week_year and week. Adding week_year separately from year to avoid confusion.
WeekPicker.getWeekYearForDate(): Calendar.get(Calendar.YEAR) returns the year for the day and not the ISO week year. This returns the ISO week year.

BUG=135938

Review URL: https://chromiumcodereview.appspot.com/15057004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207444 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 32 insertions, 10 deletions

diff --git a/content/renderer/date_time_formatter_unittest.cc b/content/renderer/date_time_formatter_unittest.cc
index b75b7c5..b5afc1c 100644
--- a/content/renderer/date_time_formatter_unittest.cc
+++ b/content/renderer/date_time_formatter_unittest.cc
@@ -31,6 +31,8 @@ TEST(RendererDateTimePickerTest, TestParserValidStringInputs) {
   EXPECT_EQ(0, sut.GetHour());
   EXPECT_EQ(0, sut.GetMinute());
   EXPECT_EQ(0, sut.GetSecond());
+  EXPECT_EQ(2010, sut.GetWeekYear());
+  EXPECT_EQ(26, sut.GetWeek());
   EXPECT_EQ(ui::TEXT_INPUT_TYPE_MONTH, sut.GetType());
 
   params.currentValue = "2012-05-25";
@@ -42,6 +44,8 @@ TEST(RendererDateTimePickerTest, TestParserValidStringInputs) {
   EXPECT_EQ(0, sut2.GetHour());
   EXPECT_EQ(0, sut2.GetMinute());
   EXPECT_EQ(0, sut2.GetSecond());
+  EXPECT_EQ(2012, sut2.GetWeekYear());
+  EXPECT_EQ(21, sut2.GetWeek());
   EXPECT_EQ(ui::TEXT_INPUT_TYPE_DATE, sut2.GetType());
 
   params.currentValue = "2013-05-21T12:15";
@@ -53,7 +57,22 @@ TEST(RendererDateTimePickerTest, TestParserValidStringInputs) {
   EXPECT_EQ(12, sut3.GetHour());
   EXPECT_EQ(15, sut3.GetMinute());
   EXPECT_EQ(0, sut3.GetSecond());
+  EXPECT_EQ(2013, sut3.GetWeekYear());
+  EXPECT_EQ(21, sut3.GetWeek());
   EXPECT_EQ(ui::TEXT_INPUT_TYPE_DATE_TIME_LOCAL, sut3.GetType());
+
+  params.currentValue = "2013-W15";
+  params.type = WebKit::WebDateTimeInputTypeWeek;
+  DateTimeFormatter sut4(params);
+  EXPECT_EQ(2013, sut4.GetYear());
+  EXPECT_EQ(3, sut4.GetMonth());
+  EXPECT_EQ(7, sut4.GetDay());
+  EXPECT_EQ(0, sut4.GetHour());
+  EXPECT_EQ(0, sut4.GetMinute());
+  EXPECT_EQ(0, sut4.GetSecond());
+  EXPECT_EQ(2013, sut4.GetWeekYear());
+  EXPECT_EQ(15, sut4.GetWeek());
+  EXPECT_EQ(ui::TEXT_INPUT_TYPE_WEEK, sut4.GetType());
 }
 
 
@@ -111,39 +130,42 @@ TEST(RendererDateTimePickerTest, TestParserInvalidStringInputs) {
 
 
 TEST(RendererDateTimePickerTest, TestParserValidDateInputs) {
-  DateTimeFormatter sut(ui::TEXT_INPUT_TYPE_MONTH, 2012, 11, 1, 0, 0, 0);
+  DateTimeFormatter sut(ui::TEXT_INPUT_TYPE_MONTH, 2012, 11, 1, 0, 0, 0, 0, 0);
   EXPECT_EQ("2012-12", sut.GetFormattedValue());
 
 
   DateTimeFormatter sut2(ui::TEXT_INPUT_TYPE_DATE_TIME_LOCAL,
-                         2013, 3, 23, 15, 47, 0);
+                         2013, 3, 23, 15, 47, 0, 0, 0);
   EXPECT_EQ("2013-04-23T15:47", sut2.GetFormattedValue());
+
+  DateTimeFormatter sut3(ui::TEXT_INPUT_TYPE_WEEK, 0, 0, 0, 0, 0, 0, 2012, 2);
+  EXPECT_EQ("2012-W02", sut3.GetFormattedValue());
 }
 
 TEST(RendererDateTimePickerTest, TestParserInvalidDateInputs) {
-  DateTimeFormatter sut(ui::TEXT_INPUT_TYPE_WEEK, 2012, 2, 0, 0, 0, 0);
+  DateTimeFormatter sut(ui::TEXT_INPUT_TYPE_WEEK, 0, 0, 0, 0, 0, 0, 0, 0);
   EXPECT_EQ("", sut.GetFormattedValue());
 
-  DateTimeFormatter sut2(ui::TEXT_INPUT_TYPE_NONE, 2013, 3, 23, 0, 0, 0);
+  DateTimeFormatter sut2(ui::TEXT_INPUT_TYPE_NONE, 2013, 3, 23, 0, 0, 0, 0, 0);
   EXPECT_EQ("", sut2.GetFormattedValue());
 
-  DateTimeFormatter sut3(ui::TEXT_INPUT_TYPE_NONE, 2013, 14, 32, 0, 0, 0);
+  DateTimeFormatter sut3(ui::TEXT_INPUT_TYPE_NONE, 2013, 14, 32, 0, 0, 0, 0, 0);
   EXPECT_EQ("", sut3.GetFormattedValue());
 
-  DateTimeFormatter sut4(ui::TEXT_INPUT_TYPE_DATE, 0, 0, 0, 0, 0, 0);
+  DateTimeFormatter sut4(ui::TEXT_INPUT_TYPE_DATE, 0, 0, 0, 0, 0, 0, 0, 0);
   EXPECT_EQ("", sut4.GetFormattedValue());
 
-  DateTimeFormatter sut5(ui::TEXT_INPUT_TYPE_TIME, 0, 0, 0, 0, 0, 0);
+  DateTimeFormatter sut5(ui::TEXT_INPUT_TYPE_TIME, 0, 0, 0, 0, 0, 0, 0, 0);
   EXPECT_EQ("", sut5.GetFormattedValue());
 
-  DateTimeFormatter sut6(ui::TEXT_INPUT_TYPE_PASSWORD, 23, 0, 0, 0, 5, 0);
+  DateTimeFormatter sut6(ui::TEXT_INPUT_TYPE_PASSWORD, 23, 0, 0, 0, 5, 0, 0, 0);
   EXPECT_EQ("", sut6.GetFormattedValue());
 
-  DateTimeFormatter sut7(ui::TEXT_INPUT_TYPE_MAX, 23, 0, 0, 0, 5, 0);
+  DateTimeFormatter sut7(ui::TEXT_INPUT_TYPE_MAX, 23, 0, 0, 0, 5, 0, 0, 0);
   EXPECT_EQ("", sut7.GetFormattedValue());
 
   DateTimeFormatter sut8(
-      static_cast<ui::TextInputType>(10000), 23, 0, 0, 0, 5, 0);
+      static_cast<ui::TextInputType>(10000), 23, 0, 0, 0, 5, 0, 0, 0);
   EXPECT_EQ("", sut8.GetFormattedValue());
 }
 } // namespace content