| Index: google_apis/drive/time_util_unittest.cc
|
| diff --git a/google_apis/drive/time_util_unittest.cc b/google_apis/drive/time_util_unittest.cc
|
| index 6d3abf6717c54647c86a4393793d35d4decf28a8..1ab447e3b511043f64192530ce3d79f1f81d6533 100644
|
| --- a/google_apis/drive/time_util_unittest.cc
|
| +++ b/google_apis/drive/time_util_unittest.cc
|
| @@ -22,7 +22,8 @@ std::string FormatTime(const base::Time& time) {
|
| TEST(TimeUtilTest, GetTimeFromStringLocalTimezone) {
|
| // Creates local time objects from exploded structure.
|
| base::Time::Exploded exploded = {2013, 1, 0, 15, 17, 11, 35, 374};
|
| - base::Time local_time = base::Time::FromLocalExploded(exploded);
|
| + base::Time local_time;
|
| + EXPECT_TRUE(base::Time::FromLocalExploded(exploded, &local_time));
|
|
|
| // Creates local time object, parsing time string. Note that if there is
|
| // not timezone suffix, GetTimeFromString() will handle this as local time
|
| @@ -55,30 +56,33 @@ TEST(TimeUtilTest, GetTimeFromStringNonTrivialTimezones) {
|
|
|
| TEST(TimeUtilTest, GetTimeFromStringBasic) {
|
| base::Time test_time;
|
| + base::Time out_time;
|
|
|
| // Test that the special timezone "Z" (UTC) is handled.
|
| base::Time::Exploded target_time1 = {2005, 1, 0, 7, 8, 2, 0, 0};
|
| EXPECT_TRUE(GetTimeFromString("2005-01-07T08:02:00Z", &test_time));
|
| - EXPECT_EQ(FormatTime(base::Time::FromUTCExploded(target_time1)),
|
| - FormatTime(test_time));
|
| +
|
| + EXPECT_TRUE(base::Time::FromUTCExploded(target_time1, &out_time));
|
| + EXPECT_EQ(FormatTime(out_time), FormatTime(test_time));
|
|
|
| // Test that a simple timezone "-08:00" is handled
|
| // 17:57 - 8 hours = 09:57
|
| base::Time::Exploded target_time2 = {2005, 8, 0, 9, 17, 57, 0, 0};
|
| EXPECT_TRUE(GetTimeFromString("2005-08-09T09:57:00-08:00", &test_time));
|
| - EXPECT_EQ(FormatTime(base::Time::FromUTCExploded(target_time2)),
|
| - FormatTime(test_time));
|
| + EXPECT_TRUE(base::Time::FromUTCExploded(target_time2, &out_time));
|
| + EXPECT_EQ(FormatTime(out_time), FormatTime(test_time));
|
|
|
| // Test that milliseconds (.123) are handled.
|
| base::Time::Exploded target_time3 = {2005, 1, 0, 7, 8, 2, 0, 123};
|
| EXPECT_TRUE(GetTimeFromString("2005-01-07T08:02:00.123Z", &test_time));
|
| - EXPECT_EQ(FormatTime(base::Time::FromUTCExploded(target_time3)),
|
| - FormatTime(test_time));
|
| + EXPECT_TRUE(base::Time::FromUTCExploded(target_time3, &out_time));
|
| + EXPECT_EQ(FormatTime(out_time), FormatTime(test_time));
|
| }
|
|
|
| TEST(TimeUtilTest, FormatTimeAsString) {
|
| base::Time::Exploded exploded_time = {2012, 7, 0, 19, 15, 59, 13, 123};
|
| - base::Time time = base::Time::FromUTCExploded(exploded_time);
|
| + base::Time time;
|
| + EXPECT_TRUE(base::Time::FromUTCExploded(exploded_time, &time));
|
| EXPECT_EQ("2012-07-19T15:59:13.123Z", FormatTimeAsString(time));
|
|
|
| EXPECT_EQ("null", FormatTimeAsString(base::Time()));
|
| @@ -86,7 +90,8 @@ TEST(TimeUtilTest, FormatTimeAsString) {
|
|
|
| TEST(TimeUtilTest, FormatTimeAsStringLocalTime) {
|
| base::Time::Exploded exploded_time = {2012, 7, 0, 19, 15, 59, 13, 123};
|
| - base::Time time = base::Time::FromLocalExploded(exploded_time);
|
| + base::Time time;
|
| + EXPECT_TRUE(base::Time::FromLocalExploded(exploded_time, &time));
|
| EXPECT_EQ("2012-07-19T15:59:13.123", FormatTimeAsStringLocaltime(time));
|
|
|
| EXPECT_EQ("null", FormatTimeAsStringLocaltime(base::Time()));
|
|
|