Support for seconds and milliseconds in the time input dialog.

C++ reformatting by "git cl format". 

Previously LGTM in https://codereview.chromium.org/21907003/

TBR=jochen,bulach,palmer
BUG=164563
TEST=RendererDateTimePickerTest.*

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

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

1 files changed, 67 insertions, 13 deletions

diff --git a/content/renderer/date_time_formatter_unittest.cc b/content/renderer/date_time_formatter_unittest.cc
index 5b61b71..0d8b07f 100644
--- a/content/renderer/date_time_formatter_unittest.cc
+++ b/content/renderer/date_time_formatter_unittest.cc
@@ -73,6 +73,42 @@ TEST(RendererDateTimePickerTest, TestParserValidStringInputs) {
   EXPECT_EQ(2013, sut4.GetWeekYear());
   EXPECT_EQ(15, sut4.GetWeek());
   EXPECT_EQ(ui::TEXT_INPUT_TYPE_WEEK, sut4.GetType());
+
+  params.currentValue = "12:15";
+  params.type = WebKit::WebDateTimeInputTypeTime;
+  DateTimeFormatter sut5(params);
+  EXPECT_EQ(12, sut5.GetHour());
+  EXPECT_EQ(15, sut5.GetMinute());
+  EXPECT_EQ(0, sut5.GetSecond());
+  EXPECT_EQ(0, sut5.GetMilli());
+  EXPECT_EQ(ui::TEXT_INPUT_TYPE_TIME, sut5.GetType());
+
+  params.currentValue = "12:15:02";
+  params.type = WebKit::WebDateTimeInputTypeTime;
+  DateTimeFormatter sut6(params);
+  EXPECT_EQ(12, sut6.GetHour());
+  EXPECT_EQ(15, sut6.GetMinute());
+  EXPECT_EQ(02, sut6.GetSecond());
+  EXPECT_EQ(0, sut6.GetMilli());
+  EXPECT_EQ(ui::TEXT_INPUT_TYPE_TIME, sut6.GetType());
+
+  params.currentValue = "12:15:02.1";
+  params.type = WebKit::WebDateTimeInputTypeTime;
+  DateTimeFormatter sut7(params);
+  EXPECT_EQ(12, sut7.GetHour());
+  EXPECT_EQ(15, sut7.GetMinute());
+  EXPECT_EQ(02, sut7.GetSecond());
+  EXPECT_EQ(100, sut7.GetMilli());
+  EXPECT_EQ(ui::TEXT_INPUT_TYPE_TIME, sut7.GetType());
+
+  params.currentValue = "12:15:02.123";
+  params.type = WebKit::WebDateTimeInputTypeTime;
+  DateTimeFormatter sut8(params);
+  EXPECT_EQ(12, sut8.GetHour());
+  EXPECT_EQ(15, sut8.GetMinute());
+  EXPECT_EQ(02, sut8.GetSecond());
+  EXPECT_EQ(123, sut8.GetMilli());
+  EXPECT_EQ(ui::TEXT_INPUT_TYPE_TIME, sut8.GetType());
 }
 
 
@@ -130,42 +166,60 @@ TEST(RendererDateTimePickerTest, TestParserInvalidStringInputs) {
 
 
 TEST(RendererDateTimePickerTest, TestParserValidDateInputs) {
-  DateTimeFormatter sut(ui::TEXT_INPUT_TYPE_MONTH, 2012, 11, 1, 0, 0, 0, 0, 0);
+  DateTimeFormatter sut(
+      ui::TEXT_INPUT_TYPE_MONTH, 2012, 11, 1, 0, 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, 0, 0);
+  DateTimeFormatter sut2(
+      ui::TEXT_INPUT_TYPE_DATE_TIME_LOCAL, 2013, 3, 23, 15, 47, 0, 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);
+  DateTimeFormatter sut3(
+      ui::TEXT_INPUT_TYPE_WEEK, 0, 0, 0, 0, 0, 0, 0, 2012, 2);
   EXPECT_EQ("2012-W02", sut3.GetFormattedValue());
 }
 
+TEST(RendererDateTimePickerTest, TestParserValidTimeInputs) {
+  DateTimeFormatter sut(
+      ui::TEXT_INPUT_TYPE_TIME, 0, 0, 0, 12, 15, 0, 0, 0, 0);
+  EXPECT_EQ("12:15", sut.GetFormattedValue());
+
+  DateTimeFormatter sut2(
+      ui::TEXT_INPUT_TYPE_TIME, 0, 0, 0, 12, 15, 02, 0, 0, 0);
+  EXPECT_EQ("12:15:02", sut2.GetFormattedValue());
+
+  DateTimeFormatter sut3(
+      ui::TEXT_INPUT_TYPE_TIME, 0, 0, 0, 12, 15, 02, 123, 0, 0);
+  EXPECT_EQ("12:15:02.123", sut3.GetFormattedValue());
+}
+
 TEST(RendererDateTimePickerTest, TestParserInvalidDateInputs) {
-  DateTimeFormatter sut(ui::TEXT_INPUT_TYPE_WEEK, 0, 0, 0, 0, 0, 0, 0, 0);
+  DateTimeFormatter sut(ui::TEXT_INPUT_TYPE_WEEK, 0, 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, 0, 0);
+  DateTimeFormatter sut2(
+      ui::TEXT_INPUT_TYPE_NONE, 2013, 3, 23, 0, 0, 0, 0, 0, 0);
   EXPECT_EQ("", sut2.GetFormattedValue());
 
-  DateTimeFormatter sut3(ui::TEXT_INPUT_TYPE_NONE, 2013, 14, 32, 0, 0, 0, 0, 0);
+  DateTimeFormatter sut3(
+      ui::TEXT_INPUT_TYPE_NONE, 2013, 14, 32, 0, 0, 0, 0, 0, 0);
   EXPECT_EQ("", sut3.GetFormattedValue());
 
-  DateTimeFormatter sut4(ui::TEXT_INPUT_TYPE_DATE, 0, 0, 0, 0, 0, 0, 0, 0);
+  DateTimeFormatter sut4(ui::TEXT_INPUT_TYPE_DATE, 0, 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, 0, 0);
+  DateTimeFormatter sut5(ui::TEXT_INPUT_TYPE_TIME, 0, 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, 0, 0);
+  DateTimeFormatter sut6(
+      ui::TEXT_INPUT_TYPE_PASSWORD, 23, 0, 0, 0, 5, 0, 0, 0, 0);
   EXPECT_EQ("", sut6.GetFormattedValue());
 
-  DateTimeFormatter sut7(ui::TEXT_INPUT_TYPE_MAX, 23, 0, 0, 0, 5, 0, 0, 0);
+  DateTimeFormatter sut7(ui::TEXT_INPUT_TYPE_MAX, 23, 0, 0, 0, 5, 0, 0, 0, 0);
   EXPECT_EQ("", sut7.GetFormattedValue());
 
   DateTimeFormatter sut8(
-      static_cast<ui::TextInputType>(10000), 23, 0, 0, 0, 5, 0, 0, 0);
+      static_cast<ui::TextInputType>(10000), 23, 0, 0, 0, 5, 0, 0, 0, 0);
   EXPECT_EQ("", sut8.GetFormattedValue());
 }
 } // namespace content