| Index: chrome/browser/chromeos/drive/drive_file_system_unittest.cc
|
| ===================================================================
|
| --- chrome/browser/chromeos/drive/drive_file_system_unittest.cc (revision 167238)
|
| +++ chrome/browser/chromeos/drive/drive_file_system_unittest.cc (working copy)
|
| @@ -1026,7 +1026,6 @@
|
| EntryExists(FilePath(FILE_PATH_LITERAL("drive/Added file.gdoc"))));
|
| }
|
|
|
| -
|
| TEST_F(DriveFileSystemTest, ChangeFeed_AddAndDeleteFileFromExistingDirectory) {
|
| int latest_changelog = 0;
|
| ASSERT_TRUE(LoadRootFeedDocument("gdata/root_feed.json"));
|
| @@ -1039,6 +1038,13 @@
|
| Eq(FilePath(FILE_PATH_LITERAL("drive"))))).Times(1);
|
| EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
|
| Eq(FilePath(FILE_PATH_LITERAL("drive/Directory 1"))))).Times(1);
|
| + EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(Eq(FilePath(
|
| + FILE_PATH_LITERAL("drive/Directory 1/Sub Directory Folder")))))
|
| + .Times(1);
|
| + EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(Eq(FilePath(
|
| + FILE_PATH_LITERAL(
|
| + "drive/Directory 1/Sub Directory Folder/Sub Sub Directory Folder")))))
|
| + .Times(1);
|
| ASSERT_TRUE(LoadChangeFeed("gdata/delta_file_added_in_directory.json",
|
| ++latest_changelog));
|
| EXPECT_TRUE(EntryExists(FilePath(
|
| @@ -1077,7 +1083,7 @@
|
| int latest_changelog = 0;
|
| ASSERT_TRUE(LoadRootFeedDocument("gdata/root_feed.json"));
|
|
|
| - // This feed contains thw following updates:
|
| + // This feed contains the following updates:
|
| // 1) A new PDF file is added to a new directory
|
| // 2) but the new directory is marked "deleted" (i.e. moved to Trash)
|
| // Hence, the PDF file should be just ignored.
|
| @@ -1111,6 +1117,13 @@
|
| EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
|
| Eq(FilePath(FILE_PATH_LITERAL("drive/Directory 2/Directory 1")))))
|
| .Times(1);
|
| + EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(Eq(FilePath(
|
| + FILE_PATH_LITERAL("drive/Directory 1/Sub Directory Folder")))))
|
| + .Times(1);
|
| + EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(Eq(FilePath(
|
| + FILE_PATH_LITERAL(
|
| + "drive/Directory 1/Sub Directory Folder/Sub Sub Directory Folder")))))
|
| + .Times(1);
|
| ASSERT_TRUE(LoadChangeFeed(
|
| "gdata/delta_dir_moved_from_root_to_directory.json",
|
| ++latest_changelog));
|
| @@ -1147,6 +1160,13 @@
|
| Eq(FilePath(FILE_PATH_LITERAL("drive"))))).Times(1);
|
| EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
|
| Eq(FilePath(FILE_PATH_LITERAL("drive/Directory 1"))))).Times(1);
|
| + EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(Eq(FilePath(
|
| + FILE_PATH_LITERAL("drive/Directory 1/Sub Directory Folder")))))
|
| + .Times(1);
|
| + EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(Eq(FilePath(
|
| + FILE_PATH_LITERAL(
|
| + "drive/Directory 1/Sub Directory Folder/Sub Sub Directory Folder")))))
|
| + .Times(1);
|
| ASSERT_TRUE(LoadChangeFeed(
|
| "gdata/delta_file_moved_from_directory_to_root.json",
|
| ++latest_changelog));
|
| @@ -1176,6 +1196,13 @@
|
| Eq(FilePath(FILE_PATH_LITERAL("drive"))))).Times(1);
|
| EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
|
| Eq(FilePath(FILE_PATH_LITERAL("drive/Directory 1"))))).Times(1);
|
| + EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(Eq(FilePath(
|
| + FILE_PATH_LITERAL("drive/Directory 1/Sub Directory Folder")))))
|
| + .Times(1);
|
| + EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(Eq(FilePath(
|
| + FILE_PATH_LITERAL(
|
| + "drive/Directory 1/Sub Directory Folder/Sub Sub Directory Folder")))))
|
| + .Times(1);
|
| ASSERT_TRUE(LoadChangeFeed("gdata/delta_file_renamed_in_directory.json",
|
| ++latest_changelog));
|
|
|
|
|