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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc

Issue 384543004: Get rid of DriveEntryKind. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and drop an unit test for glink file. Created 6 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
« chrome/browser/drive/drive_api_util.cc ('K') | « chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.cc ('k') | chrome/browser/sync_file_system/drive_backend/metadata_database.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc b/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc
index 4782098492db5d47a30dca4be93a8c26a3aeefaa..d84edb777e9d3153485aca26bcd75349e8bfef30 100644
--- a/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc
@@ -221,9 +221,10 @@ class LocalToRemoteSyncerTest : public testing::Test {
return entries[0]->resource_id();
}
- void VerifyTitleUniqueness(const std::string& parent_folder_id,
- const std::string& title,
- google_apis::DriveEntryKind kind) {
+ void VerifyTitleUniqueness(
+ const std::string& parent_folder_id,
+ const std::string& title,
+ google_apis::ResourceEntry::ResourceEntryKind kind) {
ScopedVector<google_apis::ResourceEntry> entries;
EXPECT_EQ(google_apis::HTTP_SUCCESS,
fake_drive_helper_->SearchByTitle(
@@ -278,9 +279,12 @@ TEST_F(LocalToRemoteSyncerTest, CreateFile) {
std::string folder_id = GetFileIDForParentAndTitle(app_root, "folder");
ASSERT_FALSE(folder_id.empty());
- VerifyTitleUniqueness(app_root, "file1", google_apis::ENTRY_KIND_FILE);
- VerifyTitleUniqueness(app_root, "folder", google_apis::ENTRY_KIND_FOLDER);
- VerifyTitleUniqueness(folder_id, "file2", google_apis::ENTRY_KIND_FILE);
+ VerifyTitleUniqueness(
+ app_root, "file1", google_apis::ResourceEntry::ENTRY_KIND_FILE);
+ VerifyTitleUniqueness(
+ app_root, "folder", google_apis::ResourceEntry::ENTRY_KIND_FOLDER);
+ VerifyTitleUniqueness(
+ folder_id, "file2", google_apis::ResourceEntry::ENTRY_KIND_FILE);
}
TEST_F(LocalToRemoteSyncerTest, CreateFileOnMissingPath) {
@@ -309,9 +313,12 @@ TEST_F(LocalToRemoteSyncerTest, CreateFileOnMissingPath) {
std::string folder_id2 = GetFileIDForParentAndTitle(folder_id1, "folder2");
ASSERT_FALSE(folder_id2.empty());
- VerifyTitleUniqueness(app_root, "folder1", google_apis::ENTRY_KIND_FOLDER);
- VerifyTitleUniqueness(folder_id1, "folder2", google_apis::ENTRY_KIND_FOLDER);
- VerifyTitleUniqueness(folder_id2, "file", google_apis::ENTRY_KIND_FILE);
+ VerifyTitleUniqueness(
+ app_root, "folder1", google_apis::ResourceEntry::ENTRY_KIND_FOLDER);
+ VerifyTitleUniqueness(
+ folder_id1, "folder2", google_apis::ResourceEntry::ENTRY_KIND_FOLDER);
+ VerifyTitleUniqueness(
+ folder_id2, "file", google_apis::ResourceEntry::ENTRY_KIND_FILE);
}
TEST_F(LocalToRemoteSyncerTest, DeleteFile) {
@@ -330,8 +337,10 @@ TEST_F(LocalToRemoteSyncerTest, DeleteFile) {
SYNC_FILE_TYPE_DIRECTORY),
URL(kOrigin, "folder")));
- VerifyTitleUniqueness(app_root, "file", google_apis::ENTRY_KIND_FILE);
- VerifyTitleUniqueness(app_root, "folder", google_apis::ENTRY_KIND_FOLDER);
+ VerifyTitleUniqueness(
+ app_root, "file", google_apis::ResourceEntry::ENTRY_KIND_FILE);
+ VerifyTitleUniqueness(
+ app_root, "folder", google_apis::ResourceEntry::ENTRY_KIND_FOLDER);
EXPECT_EQ(SYNC_STATUS_OK, RunLocalToRemoteSyncer(
FileChange(FileChange::FILE_CHANGE_DELETE,
@@ -364,8 +373,8 @@ TEST_F(LocalToRemoteSyncerTest, Conflict_CreateFileOnFolder) {
ScopedVector<google_apis::ResourceEntry> entries =
GetResourceEntriesForParentAndTitle(app_root, "foo");
ASSERT_EQ(2u, entries.size());
- EXPECT_EQ(google_apis::ENTRY_KIND_FOLDER, entries[0]->kind());
- EXPECT_EQ(google_apis::ENTRY_KIND_FILE, entries[1]->kind());
+ EXPECT_EQ(google_apis::ResourceEntry::ENTRY_KIND_FOLDER, entries[0]->kind());
+ EXPECT_EQ(google_apis::ResourceEntry::ENTRY_KIND_FILE, entries[1]->kind());
}
TEST_F(LocalToRemoteSyncerTest, Conflict_CreateFolderOnFile) {
@@ -387,8 +396,8 @@ TEST_F(LocalToRemoteSyncerTest, Conflict_CreateFolderOnFile) {
ScopedVector<google_apis::ResourceEntry> entries =
GetResourceEntriesForParentAndTitle(app_root, "foo");
ASSERT_EQ(2u, entries.size());
- EXPECT_EQ(google_apis::ENTRY_KIND_FILE, entries[0]->kind());
- EXPECT_EQ(google_apis::ENTRY_KIND_FOLDER, entries[1]->kind());
+ EXPECT_EQ(google_apis::ResourceEntry::ENTRY_KIND_FILE, entries[0]->kind());
+ EXPECT_EQ(google_apis::ResourceEntry::ENTRY_KIND_FOLDER, entries[1]->kind());
}
TEST_F(LocalToRemoteSyncerTest, Conflict_CreateFileOnFile) {
@@ -410,8 +419,8 @@ TEST_F(LocalToRemoteSyncerTest, Conflict_CreateFileOnFile) {
ScopedVector<google_apis::ResourceEntry> entries =
GetResourceEntriesForParentAndTitle(app_root, "foo");
ASSERT_EQ(2u, entries.size());
- EXPECT_EQ(google_apis::ENTRY_KIND_FILE, entries[0]->kind());
- EXPECT_EQ(google_apis::ENTRY_KIND_FILE, entries[1]->kind());
+ EXPECT_EQ(google_apis::ResourceEntry::ENTRY_KIND_FILE, entries[0]->kind());
+ EXPECT_EQ(google_apis::ResourceEntry::ENTRY_KIND_FILE, entries[1]->kind());
}
TEST_F(LocalToRemoteSyncerTest, Conflict_UpdateDeleteOnFile) {
@@ -448,7 +457,7 @@ TEST_F(LocalToRemoteSyncerTest, Conflict_UpdateDeleteOnFile) {
ScopedVector<google_apis::ResourceEntry> entries =
GetResourceEntriesForParentAndTitle(app_root, "foo");
ASSERT_EQ(1u, entries.size());
- EXPECT_EQ(google_apis::ENTRY_KIND_FILE, entries[0]->kind());
+ EXPECT_EQ(google_apis::ResourceEntry::ENTRY_KIND_FILE, entries[0]->kind());
EXPECT_TRUE(!entries[0]->deleted());
EXPECT_NE(file_id, entries[0]->resource_id());
}
@@ -484,7 +493,7 @@ TEST_F(LocalToRemoteSyncerTest, Conflict_CreateDeleteOnFile) {
ScopedVector<google_apis::ResourceEntry> entries =
GetResourceEntriesForParentAndTitle(app_root, "foo");
ASSERT_EQ(1u, entries.size());
- EXPECT_EQ(google_apis::ENTRY_KIND_FILE, entries[0]->kind());
+ EXPECT_EQ(google_apis::ResourceEntry::ENTRY_KIND_FILE, entries[0]->kind());
EXPECT_TRUE(!entries[0]->deleted());
EXPECT_NE(file_id, entries[0]->resource_id());
}
@@ -506,8 +515,8 @@ TEST_F(LocalToRemoteSyncerTest, Conflict_CreateFolderOnFolder) {
ScopedVector<google_apis::ResourceEntry> entries =
GetResourceEntriesForParentAndTitle(app_root, "foo");
ASSERT_EQ(2u, entries.size());
- EXPECT_EQ(google_apis::ENTRY_KIND_FOLDER, entries[0]->kind());
- EXPECT_EQ(google_apis::ENTRY_KIND_FOLDER, entries[1]->kind());
+ EXPECT_EQ(google_apis::ResourceEntry::ENTRY_KIND_FOLDER, entries[0]->kind());
+ EXPECT_EQ(google_apis::ResourceEntry::ENTRY_KIND_FOLDER, entries[1]->kind());
EXPECT_TRUE(!entries[0]->deleted());
EXPECT_TRUE(!entries[1]->deleted());
EXPECT_TRUE(folder_id == entries[0]->resource_id() ||
« chrome/browser/drive/drive_api_util.cc ('K') | « chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.cc ('k') | chrome/browser/sync_file_system/drive_backend/metadata_database.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698