Chromium Code Reviews| Index: components/drive/service/fake_drive_service_unittest.cc |
| diff --git a/components/drive/service/fake_drive_service_unittest.cc b/components/drive/service/fake_drive_service_unittest.cc |
| index bc6667a30498f21d84ae05a3fc7522b9844def6d..27d6ef2b518732f817e7bffdacb5a94601db5628 100644 |
| --- a/components/drive/service/fake_drive_service_unittest.cc |
| +++ b/components/drive/service/fake_drive_service_unittest.cc |
| @@ -1066,11 +1066,10 @@ TEST_F(FakeDriveServiceTest, CopyResource) { |
| const std::string kParentResourceId = "2_folder_resource_id"; |
| DriveApiErrorCode error = DRIVE_OTHER_ERROR; |
| std::unique_ptr<FileResource> entry; |
| + base::Time ModifiedDateUTC; |
|
fukino
2016/07/06 11:14:23
base::Time modified_date_utc;
to follow the style
maksims (do not use this acc)
2016/07/06 12:00:20
Done.
|
| + EXPECT_TRUE(base::Time::FromUTCExploded(kModifiedDate, &ModifiedDateUTC)); |
| fake_service_.CopyResource( |
| - kResourceId, |
| - kParentResourceId, |
| - "new title", |
| - base::Time::FromUTCExploded(kModifiedDate), |
| + kResourceId, kParentResourceId, "new title", ModifiedDateUTC, |
| test_util::CreateCopyResultCallback(&error, &entry)); |
| base::RunLoop().RunUntilIdle(); |
| @@ -1079,7 +1078,7 @@ TEST_F(FakeDriveServiceTest, CopyResource) { |
| // The copied entry should have the new resource ID and the title. |
| EXPECT_NE(kResourceId, entry->file_id()); |
| EXPECT_EQ("new title", entry->title()); |
| - EXPECT_EQ(base::Time::FromUTCExploded(kModifiedDate), entry->modified_date()); |
| + EXPECT_EQ(ModifiedDateUTC, entry->modified_date()); |
| EXPECT_TRUE(HasParent(entry->file_id(), kParentResourceId)); |
| // Should be incremented as a new hosted document was created. |
| EXPECT_EQ(old_largest_change_id + 1, |
| @@ -1163,11 +1162,14 @@ TEST_F(FakeDriveServiceTest, UpdateResource) { |
| const std::string kParentResourceId = "2_folder_resource_id"; |
| DriveApiErrorCode error = DRIVE_OTHER_ERROR; |
| std::unique_ptr<FileResource> entry; |
| + base::Time ModifiedDateUTC; |
|
fukino
2016/07/06 11:14:23
ditto
maksims (do not use this acc)
2016/07/06 12:00:20
Done.
|
| + base::Time ViewedDateUTC; |
|
fukino
2016/07/06 11:14:23
ditto
maksims (do not use this acc)
2016/07/06 12:00:20
Done.
|
| + EXPECT_TRUE(base::Time::FromUTCExploded(kModifiedDate, &ModifiedDateUTC)); |
| + EXPECT_TRUE(base::Time::FromUTCExploded(kViewedDate, &ViewedDateUTC)); |
| + |
| fake_service_.UpdateResource( |
| - kResourceId, kParentResourceId, "new title", |
| - base::Time::FromUTCExploded(kModifiedDate), |
| - base::Time::FromUTCExploded(kViewedDate), |
| - google_apis::drive::Properties(), |
| + kResourceId, kParentResourceId, "new title", ModifiedDateUTC, |
| + ViewedDateUTC, google_apis::drive::Properties(), |
| test_util::CreateCopyResultCallback(&error, &entry)); |
| base::RunLoop().RunUntilIdle(); |
| @@ -1176,10 +1178,8 @@ TEST_F(FakeDriveServiceTest, UpdateResource) { |
| // The updated entry should have the new title. |
| EXPECT_EQ(kResourceId, entry->file_id()); |
| EXPECT_EQ("new title", entry->title()); |
| - EXPECT_EQ(base::Time::FromUTCExploded(kModifiedDate), |
| - entry->modified_date()); |
| - EXPECT_EQ(base::Time::FromUTCExploded(kViewedDate), |
| - entry->last_viewed_by_me_date()); |
| + EXPECT_EQ(ModifiedDateUTC, entry->modified_date()); |
| + EXPECT_EQ(ViewedDateUTC, entry->last_viewed_by_me_date()); |
| EXPECT_TRUE(HasParent(kResourceId, kParentResourceId)); |
| // Should be incremented as a new hosted document was created. |
| EXPECT_EQ(old_largest_change_id + 1, |