Stop using hard-codeed json files in drive::FileSystemTest.ChangeFeed* (part 1).

chrome/browser/chromeos/drive/file_system_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/drive/file_system.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 637 matching lines @@
   ASSERT_TRUE(
       LoadChangeFeed("chromeos/gdata/delta_file_deleted_in_directory.json"));
   EXPECT_TRUE(
       EntryExists(base::FilePath(FILE_PATH_LITERAL("drive/root/Directory 1"))));
   EXPECT_FALSE(EntryExists(base::FilePath(
       FILE_PATH_LITERAL("drive/root/Directory 1/Added file.gdoc"))));
 }
 
 TEST_F(FileSystemTest, ChangeFeed_AddFileToNewDirectory) {
   ASSERT_TRUE(LoadRootFeedDocument());
-  // Add file to a new directory.
+  ASSERT_FALSE(EntryExists(base::FilePath(
+      FILE_PATH_LITERAL("drive/root/New Directory/New File.txt"))));
+
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
       Eq(base::FilePath(FILE_PATH_LITERAL("drive/root"))))).Times(1);
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
       Eq(base::FilePath(FILE_PATH_LITERAL("drive/root/New Directory")))))
       .Times(1);
 
-  ASSERT_TRUE(
-      LoadChangeFeed("chromeos/gdata/delta_file_added_in_new_directory.json"));

[satorux1, 2013/05/28 05:01:33]

Here, we were indirectly testing the ChangeListProcessor. The delta_* files
would be useful for testing ChangeListProcessor

Could you add unit tests for ChangeListProcessor in a separate patch? :)

[kinaba, 2013/05/28 06:20:27]

We are still testing ChangeListProcessor indirectly here (by the feed
generated from FakeDriveService). Actually the coverage is strictly
increasing since the new code indirectly uses ChangeListLoader as well.

But either yet, it sounds good to utilize delta_*_.json for separately
testing ChangeListProcessor. Reverted the file removal and
added new tests: https://codereview.chromium.org/15939005/.

+  // This adds "drive/root/New Directory" and then
+  // "drive/root/New Directory/New File.txt" on the server.
+  google_apis::GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
+  scoped_ptr<google_apis::ResourceEntry> entry;
+  fake_drive_service_->AddNewDirectory(
+      fake_drive_service_->GetRootResourceId(),
+      "New Directory",
+      google_apis::test_util::CreateCopyResultCallback(&error, &entry));
+  google_apis::test_util::RunBlockingPoolTask();
+  ASSERT_EQ(google_apis::HTTP_CREATED, error);
 
+  error = google_apis::GDATA_OTHER_ERROR;
+  fake_drive_service_->AddNewFile(
+      "text/plain",
+      "hello world",
+      entry->resource_id(),
+      "New File.txt",
+      false,
+      google_apis::test_util::CreateCopyResultCallback(&error, &entry));
+  google_apis::test_util::RunBlockingPoolTask();
+  ASSERT_EQ(google_apis::HTTP_CREATED, error);
+
+  // Load the change list.
+  file_system_->CheckForUpdates();
+  google_apis::test_util::RunBlockingPoolTask();
+
+  // Verify that the update is reflected.
   EXPECT_TRUE(
       EntryExists(base::FilePath(
           FILE_PATH_LITERAL("drive/root/New Directory"))));
   EXPECT_TRUE(EntryExists(base::FilePath(
-      FILE_PATH_LITERAL("drive/root/New Directory/File in new dir.gdoc"))));
+      FILE_PATH_LITERAL("drive/root/New Directory/New File.txt"))));
 }
 
 TEST_F(FileSystemTest, ChangeFeed_AddFileToNewButDeletedDirectory) {
   ASSERT_TRUE(LoadRootFeedDocument());
 
   // 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.
   ASSERT_TRUE(LoadChangeFeed(
       "chromeos/gdata/delta_file_added_in_new_but_deleted_directory.json"));
 }
 
 TEST_F(FileSystemTest, ChangeFeed_DirectoryMovedFromRootToDirectory) {
   ASSERT_TRUE(LoadRootFeedDocument());
+  ASSERT_TRUE(EntryExists(base::FilePath(FILE_PATH_LITERAL(
+      "drive/root/Directory 1"))));
 
-  EXPECT_TRUE(EntryExists(base::FilePath(FILE_PATH_LITERAL(
-      "drive/root/Directory 2 excludeDir-test"))));
-  EXPECT_TRUE(EntryExists(base::FilePath(FILE_PATH_LITERAL(
-      "drive/root/Directory 1"))));
-  EXPECT_TRUE(EntryExists(base::FilePath(FILE_PATH_LITERAL(
-      "drive/root/Directory 1/SubDirectory File 1.txt"))));
-  EXPECT_TRUE(EntryExists(base::FilePath(FILE_PATH_LITERAL(
-      "drive/root/Directory 1/Sub Directory Folder"))));
-  EXPECT_TRUE(EntryExists(base::FilePath(FILE_PATH_LITERAL(
-      "drive/root/Directory 1/Sub Directory Folder/"
-      "Sub Sub Directory Folder"))));
-
-  // This will move "Directory 1" from "drive/root/" to
-  // "drive/root/Directory 2/".
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
       Eq(base::FilePath(FILE_PATH_LITERAL("drive/root"))))).Times(1);
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
       Eq(base::FilePath(FILE_PATH_LITERAL("drive/root/Directory 1")))))
       .Times(1);
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
       Eq(base::FilePath(FILE_PATH_LITERAL(
           "drive/root/Directory 2 excludeDir-test"))))).Times(1);
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
       Eq(base::FilePath(FILE_PATH_LITERAL(
           "drive/root/Directory 2 excludeDir-test/Directory 1"))))).Times(1);
-  ASSERT_TRUE(LoadChangeFeed(
-      "chromeos/gdata/delta_dir_moved_from_root_to_directory.json"));
 
-  EXPECT_TRUE(EntryExists(base::FilePath(FILE_PATH_LITERAL(
-      "drive/root/Directory 2 excludeDir-test"))));
+  // This will move "Directory 1" from "drive/root/" to
+  // "drive/root/Directory 2 excludeDir-test/" on the server.
+  google_apis::GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
+  fake_drive_service_->AddResourceToDirectory(
+      "folder:sub_dir_folder_2_self_link",
+      "folder:1_folder_resource_id",
+      google_apis::test_util::CreateCopyResultCallback(&error));
+  google_apis::test_util::RunBlockingPoolTask();
+  ASSERT_EQ(google_apis::HTTP_SUCCESS, error);
+
+  error = google_apis::GDATA_OTHER_ERROR;
+  fake_drive_service_->RemoveResourceFromDirectory(
+      fake_drive_service_->GetRootResourceId(),
+      "folder:1_folder_resource_id",
+      google_apis::test_util::CreateCopyResultCallback(&error));
+  google_apis::test_util::RunBlockingPoolTask();
+  ASSERT_EQ(google_apis::HTTP_SUCCESS, error);
+
+  // Load the change list.
+  file_system_->CheckForUpdates();
+  google_apis::test_util::RunBlockingPoolTask();
+
+  // Verify that the update is reflected.
   EXPECT_FALSE(EntryExists(base::FilePath(FILE_PATH_LITERAL(
       "drive/root/Directory 1"))));
   EXPECT_TRUE(EntryExists(base::FilePath(FILE_PATH_LITERAL(
       "drive/root/Directory 2 excludeDir-test/Directory 1"))));
   EXPECT_TRUE(EntryExists(base::FilePath(FILE_PATH_LITERAL(
       "drive/root/Directory 2 excludeDir-test/Directory 1/"
       "SubDirectory File 1.txt"))));
   EXPECT_TRUE(EntryExists(base::FilePath(FILE_PATH_LITERAL(
       "drive/root/Directory 2 excludeDir-test/Directory 1/"
       "Sub Directory Folder"))));
   EXPECT_TRUE(EntryExists(base::FilePath(FILE_PATH_LITERAL(
       "drive/root/Directory 2 excludeDir-test/Directory 1/Sub Directory Folder/"
       "Sub Sub Directory Folder"))));
 }
 
 TEST_F(FileSystemTest, ChangeFeed_FileMovedFromDirectoryToRoot) {
   ASSERT_TRUE(LoadRootFeedDocument());
-
-  EXPECT_TRUE(EntryExists(base::FilePath(FILE_PATH_LITERAL(
-      "drive/root/Directory 1"))));
-  EXPECT_TRUE(EntryExists(base::FilePath(FILE_PATH_LITERAL(
-      "drive/root/Directory 1/Sub Directory Folder"))));
-  EXPECT_TRUE(EntryExists(base::FilePath(FILE_PATH_LITERAL(
-      "drive/root/Directory 1/Sub Directory Folder/"
-      "Sub Sub Directory Folder"))));
-  EXPECT_TRUE(EntryExists(base::FilePath(FILE_PATH_LITERAL(
+  ASSERT_TRUE(EntryExists(base::FilePath(FILE_PATH_LITERAL(
       "drive/root/Directory 1/SubDirectory File 1.txt"))));
 
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
       Eq(base::FilePath(FILE_PATH_LITERAL("drive/root"))))).Times(1);
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
       Eq(base::FilePath(FILE_PATH_LITERAL("drive/root/Directory 1")))))
       .Times(1);
-  ASSERT_TRUE(LoadChangeFeed(
-      "chromeos/gdata/delta_file_moved_from_directory_to_root.json"));
 
-  EXPECT_TRUE(EntryExists(base::FilePath(FILE_PATH_LITERAL(
-      "drive/root/Directory 1"))));
-  EXPECT_TRUE(EntryExists(base::FilePath(FILE_PATH_LITERAL(
-      "drive/root/Directory 1/Sub Directory Folder"))));
-  EXPECT_TRUE(EntryExists(base::FilePath(FILE_PATH_LITERAL(
-      "drive/root/Directory 1/Sub Directory Folder/"
-      "Sub Sub Directory Folder"))));
+  // This will move "drive/root/Directory 1/SubDirectory File 1.txt"
+  // to "drive/root/SubDirectory File 1.txt" on the server.
+  google_apis::GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
+  fake_drive_service_->AddResourceToDirectory(
+      fake_drive_service_->GetRootResourceId(),
+      "file:subdirectory_file_1_id",
+      google_apis::test_util::CreateCopyResultCallback(&error));
+  google_apis::test_util::RunBlockingPoolTask();
+  ASSERT_EQ(google_apis::HTTP_SUCCESS, error);
+
+  error = google_apis::GDATA_OTHER_ERROR;
+  fake_drive_service_->RemoveResourceFromDirectory(
+      "folder:1_folder_resource_id",
+      "file:subdirectory_file_1_id",
+      google_apis::test_util::CreateCopyResultCallback(&error));
+  google_apis::test_util::RunBlockingPoolTask();
+  ASSERT_EQ(google_apis::HTTP_SUCCESS, error);
+
+  // Load the change list.
+  file_system_->CheckForUpdates();
+  google_apis::test_util::RunBlockingPoolTask();
+
+  // Verify that the update is reflected.
   EXPECT_FALSE(EntryExists(base::FilePath(FILE_PATH_LITERAL(
       "drive/root/Directory 1/SubDirectory File 1.txt"))));
   EXPECT_TRUE(EntryExists(base::FilePath(FILE_PATH_LITERAL(
       "drive/root/SubDirectory File 1.txt"))));
 }
 
 TEST_F(FileSystemTest, ChangeFeed_FileRenamedInDirectory) {
   ASSERT_TRUE(LoadRootFeedDocument());
-
-  EXPECT_TRUE(EntryExists(base::FilePath(FILE_PATH_LITERAL(
-      "drive/root/Directory 1"))));
-  EXPECT_TRUE(EntryExists(base::FilePath(FILE_PATH_LITERAL(
+  ASSERT_TRUE(EntryExists(base::FilePath(FILE_PATH_LITERAL(
       "drive/root/Directory 1/SubDirectory File 1.txt"))));
 
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
-      Eq(base::FilePath(FILE_PATH_LITERAL("drive/root"))))).Times(1);
-  EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
       Eq(base::FilePath(FILE_PATH_LITERAL("drive/root/Directory 1")))))
       .Times(1);
-  ASSERT_TRUE(LoadChangeFeed(
-      "chromeos/gdata/delta_file_renamed_in_directory.json"));
 
-  EXPECT_TRUE(EntryExists(base::FilePath(FILE_PATH_LITERAL(
-      "drive/root/Directory 1"))));
+  // Rename on the server.
+  google_apis::GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
+  fake_drive_service_->RenameResource(
+      "file:subdirectory_file_1_id",
+      "New SubDirectory File 1.txt",
+      google_apis::test_util::CreateCopyResultCallback(&error));
+  google_apis::test_util::RunBlockingPoolTask();
+  ASSERT_EQ(google_apis::HTTP_SUCCESS, error);
+
+  // Load the change list.
+  file_system_->CheckForUpdates();
+  google_apis::test_util::RunBlockingPoolTask();
+
+  // Verify that the update is reflected.
   EXPECT_FALSE(EntryExists(base::FilePath(FILE_PATH_LITERAL(
       "drive/root/Directory 1/SubDirectory File 1.txt"))));
   EXPECT_TRUE(EntryExists(base::FilePath(FILE_PATH_LITERAL(
       "drive/root/Directory 1/New SubDirectory File 1.txt"))));
 }
 
 TEST_F(FileSystemTest, CachedFeedLoadingThenServerFeedLoading) {
   ASSERT_TRUE(SetUpTestFileSystem(USE_SERVER_TIMESTAMP));
 
   // Kicks loading of cached file system and query for server update.
@@ skipping 976 matching lines @@
       entry->resource_id(),
       entry->file_specific_info().file_md5(),
       google_apis::test_util::CreateCopyResultCallback(&success, &cache_entry));
   google_apis::test_util::RunBlockingPoolTask();
 
   EXPECT_TRUE(success);
   EXPECT_FALSE(cache_entry.is_mounted());
 }
 
 }   // namespace drive