Add tests for From / In converions and LocalMidnight. Add InMinutes().

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

4 files changed, 43 insertions, 2 deletions

diff --git a/base/pr_time_test.cc b/base/pr_time_test.cc
index 8a0ed5a..ad8e135 100644
--- a/base/pr_time_test.cc
+++ b/base/pr_time_test.cc
@@ -257,3 +257,8 @@ TEST_F(PRTimeTest, ParseTimeTestEpoch1960) {
                                    &parsed_time));
   EXPECT_EQ(-300003599, parsed_time.ToTimeT());
 }
+
+TEST_F(PRTimeTest, ParseTimeTestEmpty) {
+  Time parsed_time;
+  EXPECT_FALSE(Time::FromString(L"", &parsed_time));
+}
diff --git a/base/time.cc b/base/time.cc
index aa915e6..eef76b3 100644
--- a/base/time.cc
+++ b/base/time.cc
@@ -80,6 +80,10 @@ int TimeDelta::InHours() const {
   return static_cast<int>(delta_ / Time::kMicrosecondsPerHour);
 }
 
+int TimeDelta::InMinutes() const {
+  return static_cast<int>(delta_ / Time::kMicrosecondsPerMinute);
+}
+
 double TimeDelta::InSecondsF() const {
   return static_cast<double>(delta_) / Time::kMicrosecondsPerSecond;
 }
diff --git a/base/time.h b/base/time.h
index 1a0d504..dd49536 100644
--- a/base/time.h
+++ b/base/time.h
@@ -90,6 +90,7 @@ class TimeDelta {
   // point value, the "regular" versions return a rounded-down value.
   int InDays() const;
   int InHours() const;
+  int InMinutes() const;
   double InSecondsF() const;
   int64 InSeconds() const;
   double InMillisecondsF() const;
diff --git a/base/time_unittest.cc b/base/time_unittest.cc
index 829c579..b02451e 100644
--- a/base/time_unittest.cc
+++ b/base/time_unittest.cc
@@ -70,14 +70,19 @@ TEST(Time, TimeT) {
   time_t now_t_2 = our_time_2.ToTimeT();
   EXPECT_EQ(now_t_1, now_t_2);
 
+  EXPECT_EQ(10, Time().FromTimeT(10).ToTimeT());
+  EXPECT_EQ(10.0, Time().FromTimeT(10).ToDoubleT());
+
   // Conversions of 0 should stay 0.
   EXPECT_EQ(0, Time().ToTimeT());
   EXPECT_EQ(0, Time::FromTimeT(0).ToInternalValue());
 }
 
 TEST(Time, ZeroIsSymmetric) {
-  Time zeroTime(Time::FromTimeT(0));
-  EXPECT_EQ(0, zeroTime.ToTimeT());
+  Time zero_time(Time::FromTimeT(0));
+  EXPECT_EQ(0, zero_time.ToTimeT());
+
+  EXPECT_EQ(0.0, zero_time.ToDoubleT());
 }
 
 TEST(Time, LocalExplode) {
@@ -101,6 +106,15 @@ TEST(Time, UTCExplode) {
   EXPECT_TRUE((a - b) < TimeDelta::FromMilliseconds(1));
 }
 
+TEST(Time, LocalMidnight) {
+  Time::Exploded exploded;
+  Time::Now().LocalMidnight().LocalExplode(&exploded);
+  EXPECT_EQ(0, exploded.hour);
+  EXPECT_EQ(0, exploded.minute);
+  EXPECT_EQ(0, exploded.second);
+  EXPECT_EQ(0, exploded.millisecond);
+}
+
 TEST(TimeTicks, Deltas) {
   TimeTicks ticks_start = TimeTicks::Now();
   PlatformThread::Sleep(10);
@@ -111,6 +125,23 @@ TEST(TimeTicks, Deltas) {
   EXPECT_EQ(delta.InSeconds(), 0);
 }
 
+TEST(TimeDelta, FromAndIn) {
+  EXPECT_TRUE(TimeDelta::FromDays(2) == TimeDelta::FromHours(48));
+  EXPECT_TRUE(TimeDelta::FromHours(3) == TimeDelta::FromMinutes(180));
+  EXPECT_TRUE(TimeDelta::FromMinutes(2) == TimeDelta::FromSeconds(120));
+  EXPECT_TRUE(TimeDelta::FromSeconds(2) == TimeDelta::FromMilliseconds(2000));
+  EXPECT_TRUE(TimeDelta::FromMilliseconds(2) ==
+              TimeDelta::FromMicroseconds(2000));
+  EXPECT_EQ(13, TimeDelta::FromDays(13).InDays());
+  EXPECT_EQ(13, TimeDelta::FromHours(13).InHours());
+  EXPECT_EQ(13, TimeDelta::FromMinutes(13).InMinutes());
+  EXPECT_EQ(13, TimeDelta::FromSeconds(13).InSeconds());
+  EXPECT_EQ(13.0, TimeDelta::FromSeconds(13).InSecondsF());
+  EXPECT_EQ(13, TimeDelta::FromMilliseconds(13).InMilliseconds());
+  EXPECT_EQ(13.0, TimeDelta::FromMilliseconds(13).InMillisecondsF());
+  EXPECT_EQ(13, TimeDelta::FromMicroseconds(13).InMicroseconds());
+}
+
 #if defined(OS_WIN)
 
 // TODO(pinkerton): Need to find a way to mock this for non-windows.