Index: google_apis/drive/drive_api_requests_unittest.cc |
diff --git a/google_apis/drive/drive_api_requests_unittest.cc b/google_apis/drive/drive_api_requests_unittest.cc |
index 67a78e043d151fc0c84edc76e658ab8714c23331..58e9a82beb4c2029d559af40fee91783460c9760 100644 |
--- a/google_apis/drive/drive_api_requests_unittest.cc |
+++ b/google_apis/drive/drive_api_requests_unittest.cc |
@@ -565,10 +565,18 @@ TEST_F(DriveApiRequestsTest, FilesInsertRequest) { |
&run_loop, |
test_util::CreateCopyResultCallback(&error, &file_resource))); |
request->set_visibility(drive::FILE_VISIBILITY_PRIVATE); |
- request->set_last_viewed_by_me_date( |
- base::Time::FromUTCExploded(kLastViewedByMeDate)); |
+ |
+ base::Time LastViewedByMeDateUTC; |
hidehiko
2016/07/05 17:31:14
base::Time last_viewed_by_me_date_utc;
to follow
hidehiko
2016/10/25 16:37:05
ping.
maksims (do not use this acc)
2016/10/26 11:55:27
Done.
|
+ EXPECT_TRUE(base::Time::FromUTCExploded(kLastViewedByMeDate, |
hidehiko
2016/07/05 17:31:14
Could you use ASSERT_TRUE? Ditto for below.
hidehiko
2016/10/25 16:37:05
ping.
maksims (do not use this acc)
2016/10/26 11:55:27
Done.
|
+ &LastViewedByMeDateUTC)); |
+ |
hidehiko
2016/07/05 17:31:14
nit: could you remove this empty line? L573 looks
hidehiko
2016/10/25 16:37:05
ping.
|
+ request->set_last_viewed_by_me_date(LastViewedByMeDateUTC); |
request->set_mime_type("application/vnd.google-apps.folder"); |
- request->set_modified_date(base::Time::FromUTCExploded(kModifiedDate)); |
+ |
+ base::Time ModifiedDateUTC; |
+ EXPECT_TRUE(base::Time::FromUTCExploded(kModifiedDate, &ModifiedDateUTC)); |
+ |
+ request->set_modified_date(ModifiedDateUTC); |
request->add_parent("root"); |
request->set_title("new directory"); |
request->set_properties(testing_properties_); |
@@ -630,9 +638,17 @@ TEST_F(DriveApiRequestsTest, FilesPatchRequest) { |
request->set_update_viewed_date(false); |
request->set_title("new title"); |
- request->set_modified_date(base::Time::FromUTCExploded(kModifiedDate)); |
- request->set_last_viewed_by_me_date( |
- base::Time::FromUTCExploded(kLastViewedByMeDate)); |
+ |
+ base::Time ModifiedDateUTC; |
+ EXPECT_TRUE(base::Time::FromUTCExploded(kModifiedDate, &ModifiedDateUTC)); |
+ |
+ request->set_modified_date(ModifiedDateUTC); |
+ |
+ base::Time LastViewedByMeDateUTC; |
+ EXPECT_TRUE(base::Time::FromUTCExploded(kLastViewedByMeDate, |
+ &LastViewedByMeDateUTC)); |
+ |
+ request->set_last_viewed_by_me_date(LastViewedByMeDateUTC); |
request->add_parent("parent_resource_id"); |
request->set_properties(testing_properties_); |
@@ -826,7 +842,11 @@ TEST_F(DriveApiRequestsTest, FilesCopyRequest) { |
test_util::CreateCopyResultCallback(&error, &file_resource))); |
request->set_visibility(drive::FILE_VISIBILITY_PRIVATE); |
request->set_file_id("resource_id"); |
- request->set_modified_date(base::Time::FromUTCExploded(kModifiedDate)); |
+ |
+ base::Time ModifiedDateUTC; |
+ EXPECT_TRUE(base::Time::FromUTCExploded(kModifiedDate, &ModifiedDateUTC)); |
+ |
+ request->set_modified_date(ModifiedDateUTC); |
request->add_parent("parent_resource_id"); |
request->set_title("new title"); |
request_sender_->StartRequestWithAuthRetry(request); |
@@ -1443,9 +1463,17 @@ TEST_F(DriveApiRequestsTest, UploadNewFileWithMetadataRequest) { |
test_util::CreateQuitCallback( |
&run_loop, |
test_util::CreateCopyResultCallback(&error, &upload_url))); |
- request->set_modified_date(base::Time::FromUTCExploded(kModifiedDate)); |
- request->set_last_viewed_by_me_date( |
- base::Time::FromUTCExploded(kLastViewedByMeDate)); |
+ |
+ base::Time ModifiedDateUTC; |
+ EXPECT_TRUE(base::Time::FromUTCExploded(kModifiedDate, &ModifiedDateUTC)); |
+ |
+ request->set_modified_date(ModifiedDateUTC); |
+ |
+ base::Time LastViewedByMeDateUTC; |
+ EXPECT_TRUE(base::Time::FromUTCExploded(kLastViewedByMeDate, |
+ &LastViewedByMeDateUTC)); |
+ |
+ request->set_last_viewed_by_me_date(LastViewedByMeDateUTC); |
request_sender_->StartRequestWithAuthRetry(request); |
run_loop.Run(); |
} |
@@ -1820,9 +1848,17 @@ TEST_F(DriveApiRequestsTest, UploadExistingFileWithMetadataRequest) { |
test_util::CreateCopyResultCallback(&error, &upload_url))); |
request->set_parent_resource_id("new_parent_resource_id"); |
request->set_title("new file title"); |
- request->set_modified_date(base::Time::FromUTCExploded(kModifiedDate)); |
- request->set_last_viewed_by_me_date( |
- base::Time::FromUTCExploded(kLastViewedByMeDate)); |
+ |
+ base::Time ModifiedDateUTC; |
+ EXPECT_TRUE(base::Time::FromUTCExploded(kModifiedDate, &ModifiedDateUTC)); |
+ |
+ request->set_modified_date(ModifiedDateUTC); |
+ |
+ base::Time LastViewedByMeDateUTC; |
+ EXPECT_TRUE(base::Time::FromUTCExploded(kLastViewedByMeDate, |
+ &LastViewedByMeDateUTC)); |
+ |
+ request->set_last_viewed_by_me_date(LastViewedByMeDateUTC); |
request_sender_->StartRequestWithAuthRetry(request); |
run_loop.Run(); |