Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(371)

Unified Diff: components/drive/service/fake_drive_service_unittest.cc

Issue 2095553002: Make callers of FromUTC(Local)Exploded in components/ use new time API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fukino's comments Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..eae7f4353b5bdfc5e780f63358e6b29ce45017e8 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 modified_date_utc;
+ EXPECT_TRUE(base::Time::FromUTCExploded(kModifiedDate, &modified_date_utc));
fake_service_.CopyResource(
- kResourceId,
- kParentResourceId,
- "new title",
- base::Time::FromUTCExploded(kModifiedDate),
+ kResourceId, kParentResourceId, "new title", modified_date_utc,
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(modified_date_utc, 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 modified_date_utc;
+ base::Time viewed_date_utc;
+ EXPECT_TRUE(base::Time::FromUTCExploded(kModifiedDate, &modified_date_utc));
+ EXPECT_TRUE(base::Time::FromUTCExploded(kViewedDate, &viewed_date_utc));
+
fake_service_.UpdateResource(
- kResourceId, kParentResourceId, "new title",
- base::Time::FromUTCExploded(kModifiedDate),
- base::Time::FromUTCExploded(kViewedDate),
- google_apis::drive::Properties(),
+ kResourceId, kParentResourceId, "new title", modified_date_utc,
+ viewed_date_utc, 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(modified_date_utc, entry->modified_date());
+ EXPECT_EQ(viewed_date_utc, 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,
« no previous file with comments | « components/drive/resource_entry_conversion_unittest.cc ('k') | components/ntp_snippets/ntp_snippets_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698