Chromium Code Reviews| 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 f249a6eb994b7399ccaba527b32bfebc7bf0225c..43cb6eae4ce0b7863d7e0d18898928df3efa1a20 100644 |
| --- a/google_apis/drive/drive_api_requests_unittest.cc |
| +++ b/google_apis/drive/drive_api_requests_unittest.cc |
| @@ -567,10 +567,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; |
| + EXPECT_TRUE(base::Time::FromUTCExploded(kLastViewedByMeDate, |
| + &LastViewedByMeDateUTC)); |
| + |
| + 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_); |
| @@ -632,14 +640,22 @@ 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)); |
| - request->add_parent("parent_resource_id"); |
| + base::Time ModifiedDateUTC; |
| + base::Time::FromUTCExploded(kLastViewedByMeDate); |
|
hidehiko
2016/10/25 16:37:05
Please fix the indent.
maksims (do not use this acc)
2016/10/26 11:55:27
Done.
|
| + EXPECT_TRUE(base::Time::FromUTCExploded(kModifiedDate, &ModifiedDateUTC)); |
| - request->set_properties(testing_properties_); |
| - request_sender_->StartRequestWithAuthRetry(std::move(request)); |
| - run_loop.Run(); |
| + 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_); |
| + request_sender_->StartRequestWithAuthRetry(std::move(request)); |
| + run_loop.Run(); |
| } |
| EXPECT_EQ(HTTP_SUCCESS, error); |
| @@ -829,7 +845,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(std::move(request)); |
| @@ -1424,9 +1444,16 @@ 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(std::move(request)); |
| run_loop.Run(); |
| } |
| @@ -1782,9 +1809,16 @@ TEST_F(DriveApiRequestsTest, UploadExistingFileWithMetadataRequest) { |
| &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(std::move(request)); |
| run_loop.Run(); |