drive: Respect is_recursive parameter in RemoveOperation.

chrome/browser/chromeos/drive/file_system/remove_operation_unittest.cc

Index: chrome/browser/chromeos/drive/file_system/remove_operation_unittest.cc
diff --git a/chrome/browser/chromeos/drive/file_system/remove_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/remove_operation_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..970df0966c082e62c2d7d1a3ce93b57cbc62c541
--- /dev/null
+++ b/chrome/browser/chromeos/drive/file_system/remove_operation_unittest.cc
@@ -0,0 +1,115 @@
+// Copyright 2013 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/remove_operation.h"
+
+#include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
+#include "chrome/browser/google_apis/fake_drive_service.h"
+#include "chrome/browser/google_apis/gdata_wapi_parser.h"
+#include "chrome/browser/google_apis/test_util.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace drive {
+namespace file_system {
+
+typedef OperationTestBase RemoveOperationTest;
+
+TEST_F(RemoveOperationTest, RemoveFile) {
+  RemoveOperation operation(observer(), scheduler(), metadata(), cache());
+
+  base::FilePath my_drive(FILE_PATH_LITERAL("drive/root"));
+  base::FilePath nonexisting_file(
+      FILE_PATH_LITERAL("drive/root/Dummy file.txt"));
+  base::FilePath file_in_root(FILE_PATH_LITERAL("drive/root/File 1.txt"));
+  base::FilePath file_in_subdir(
+      FILE_PATH_LITERAL("drive/root/Directory 1/SubDirectory File 1.txt"));
+
+  // Remove a file in root.
+  ResourceEntry entry;
+  FileError error = FILE_ERROR_FAILED;
+  ASSERT_EQ(FILE_ERROR_OK, GetLocalResourceEntry(file_in_root, &entry));
+  operation.Remove(file_in_root,
+                   false,

[hashimoto, 2013/05/28 02:34:45]

nit: Please add comments to describe about these boolean arguments.

[kinaba, 2013/05/28 03:31:28]

Done.

+                   google_apis::test_util::CreateCopyResultCallback(&error));
+  google_apis::test_util::RunBlockingPoolTask();
+  EXPECT_EQ(FILE_ERROR_OK, error);
+  EXPECT_EQ(FILE_ERROR_NOT_FOUND, GetLocalResourceEntry(file_in_root, &entry));
+
+  // Remove a file in subdirectory.
+  error = FILE_ERROR_FAILED;
+  ASSERT_EQ(FILE_ERROR_OK, GetLocalResourceEntry(file_in_subdir, &entry));
+  operation.Remove(file_in_subdir,
+                   false,
+                   google_apis::test_util::CreateCopyResultCallback(&error));
+  google_apis::test_util::RunBlockingPoolTask();
+  EXPECT_EQ(FILE_ERROR_OK, error);
+  EXPECT_EQ(FILE_ERROR_NOT_FOUND,
+            GetLocalResourceEntry(file_in_subdir, &entry));
+
+  // Try removing non-existing file.
+  error = FILE_ERROR_FAILED;
+  ASSERT_EQ(FILE_ERROR_NOT_FOUND,
+            GetLocalResourceEntry(nonexisting_file, &entry));
+  operation.Remove(base::FilePath::FromUTF8Unsafe("drive/root/Dummy file.txt"),
+                   false,
+                   google_apis::test_util::CreateCopyResultCallback(&error));
+  google_apis::test_util::RunBlockingPoolTask();
+  EXPECT_EQ(FILE_ERROR_NOT_FOUND, error);
+
+  // Verify observer notifications.
+  EXPECT_EQ(2U, observer()->get_changed_paths().size());
+  EXPECT_TRUE(observer()->get_changed_paths().count(file_in_root.DirName()));
+  EXPECT_TRUE(observer()->get_changed_paths().count(file_in_subdir.DirName()));
+}
+
+TEST_F(RemoveOperationTest, RemoveDirectory) {
+  RemoveOperation operation(observer(), scheduler(), metadata(), cache());
+
+  base::FilePath empty_dir(FILE_PATH_LITERAL(
+      "drive/root/Directory 1/Sub Directory Folder/Sub Sub Directory Folder"));
+  base::FilePath non_empty_dir(FILE_PATH_LITERAL(
+      "drive/root/Directory 1"));
+  base::FilePath file_in_non_empty_dir(FILE_PATH_LITERAL(
+      "drive/root/Directory 1/SubDirectory File 1.txt"));
+
+  // Empty directory can be removed even with is_recursive = false.
+  FileError error = FILE_ERROR_FAILED;
+  ResourceEntry entry;
+  operation.Remove(empty_dir,
+                   false,
+                   google_apis::test_util::CreateCopyResultCallback(&error));
+  google_apis::test_util::RunBlockingPoolTask();
+  EXPECT_EQ(FILE_ERROR_OK, error);
+  EXPECT_EQ(FILE_ERROR_NOT_FOUND,
+            GetLocalResourceEntry(empty_dir, &entry));
+
+  // Non-empty directory, cannot.
+  error = FILE_ERROR_FAILED;
+  ASSERT_EQ(FILE_ERROR_OK, GetLocalResourceEntry(non_empty_dir, &entry));
+  operation.Remove(non_empty_dir,
+                   false,
+                   google_apis::test_util::CreateCopyResultCallback(&error));
+  google_apis::test_util::RunBlockingPoolTask();
+  EXPECT_EQ(FILE_ERROR_NOT_EMPTY, error);
+  EXPECT_EQ(FILE_ERROR_OK,
+            GetLocalResourceEntry(non_empty_dir, &entry));
+
+  // With is_recursive = true, it can be deleted, however. Descendant entries
+  // are moved together.

[hashimoto, 2013/05/28 02:34:45]

nit: s/moved/removed/?

[kinaba, 2013/05/28 03:31:28]

Good catch.

+  error = FILE_ERROR_FAILED;
+  ASSERT_EQ(FILE_ERROR_OK,
+            GetLocalResourceEntry(file_in_non_empty_dir, &entry));
+  operation.Remove(non_empty_dir,
+                   true,
+                   google_apis::test_util::CreateCopyResultCallback(&error));
+  google_apis::test_util::RunBlockingPoolTask();
+  EXPECT_EQ(FILE_ERROR_OK, error);
+  EXPECT_EQ(FILE_ERROR_NOT_FOUND,
+            GetLocalResourceEntry(non_empty_dir, &entry));
+  EXPECT_EQ(FILE_ERROR_NOT_FOUND,
+            GetLocalResourceEntry(file_in_non_empty_dir, &entry));
+}
+
+}  // namespace file_system
+}  // namespace drive