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

Side by Side Diff: chrome/browser/chromeos/drive/file_system/remove_operation_unittest.cc

Issue 408143014: Rename OperationObserver to OperationDelegate (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/drive/file_system/remove_operation.h" 5 #include "chrome/browser/chromeos/drive/file_system/remove_operation.h"
6 6
7 #include "chrome/browser/chromeos/drive/file_change.h" 7 #include "chrome/browser/chromeos/drive/file_change.h"
8 #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h" 8 #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
9 #include "chrome/browser/chromeos/drive/file_system_util.h" 9 #include "chrome/browser/chromeos/drive/file_system_util.h"
10 #include "content/public/test/test_utils.h" 10 #include "content/public/test/test_utils.h"
11 #include "google_apis/drive/test_util.h" 11 #include "google_apis/drive/test_util.h"
12 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
13 13
14 namespace drive { 14 namespace drive {
15 namespace file_system { 15 namespace file_system {
16 16
17 typedef OperationTestBase RemoveOperationTest; 17 typedef OperationTestBase RemoveOperationTest;
18 18
19 TEST_F(RemoveOperationTest, RemoveFile) { 19 TEST_F(RemoveOperationTest, RemoveFile) {
20 RemoveOperation operation(blocking_task_runner(), observer(), metadata(), 20 RemoveOperation operation(blocking_task_runner(), delegate(), metadata(),
21 cache()); 21 cache());
22 22
23 base::FilePath nonexisting_file( 23 base::FilePath nonexisting_file(
24 FILE_PATH_LITERAL("drive/root/Dummy file.txt")); 24 FILE_PATH_LITERAL("drive/root/Dummy file.txt"));
25 base::FilePath file_in_root(FILE_PATH_LITERAL("drive/root/File 1.txt")); 25 base::FilePath file_in_root(FILE_PATH_LITERAL("drive/root/File 1.txt"));
26 base::FilePath file_in_subdir( 26 base::FilePath file_in_subdir(
27 FILE_PATH_LITERAL("drive/root/Directory 1/SubDirectory File 1.txt")); 27 FILE_PATH_LITERAL("drive/root/Directory 1/SubDirectory File 1.txt"));
28 28
29 // Remove a file in root. 29 // Remove a file in root.
30 ResourceEntry entry; 30 ResourceEntry entry;
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 // Try removing non-existing file. 62 // Try removing non-existing file.
63 error = FILE_ERROR_FAILED; 63 error = FILE_ERROR_FAILED;
64 ASSERT_EQ(FILE_ERROR_NOT_FOUND, 64 ASSERT_EQ(FILE_ERROR_NOT_FOUND,
65 GetLocalResourceEntry(nonexisting_file, &entry)); 65 GetLocalResourceEntry(nonexisting_file, &entry));
66 operation.Remove(nonexisting_file, 66 operation.Remove(nonexisting_file,
67 false, // is_recursive 67 false, // is_recursive
68 google_apis::test_util::CreateCopyResultCallback(&error)); 68 google_apis::test_util::CreateCopyResultCallback(&error));
69 content::RunAllBlockingPoolTasksUntilIdle(); 69 content::RunAllBlockingPoolTasksUntilIdle();
70 EXPECT_EQ(FILE_ERROR_NOT_FOUND, error); 70 EXPECT_EQ(FILE_ERROR_NOT_FOUND, error);
71 71
72 // Verify observer notifications. 72 // Verify delegate notifications.
73 EXPECT_EQ(2U, observer()->get_changed_files().size()); 73 EXPECT_EQ(2U, delegate()->get_changed_files().size());
74 EXPECT_TRUE(observer()->get_changed_files().count(file_in_root)); 74 EXPECT_TRUE(delegate()->get_changed_files().count(file_in_root));
75 EXPECT_TRUE(observer()->get_changed_files().count(file_in_subdir)); 75 EXPECT_TRUE(delegate()->get_changed_files().count(file_in_subdir));
76 76
77 EXPECT_EQ(2U, observer()->updated_local_ids().size()); 77 EXPECT_EQ(2U, delegate()->updated_local_ids().size());
78 EXPECT_TRUE(observer()->updated_local_ids().count(id_file_in_root)); 78 EXPECT_TRUE(delegate()->updated_local_ids().count(id_file_in_root));
79 EXPECT_TRUE(observer()->updated_local_ids().count(id_file_in_subdir)); 79 EXPECT_TRUE(delegate()->updated_local_ids().count(id_file_in_subdir));
80 } 80 }
81 81
82 TEST_F(RemoveOperationTest, RemoveDirectory) { 82 TEST_F(RemoveOperationTest, RemoveDirectory) {
83 RemoveOperation operation(blocking_task_runner(), observer(), metadata(), 83 RemoveOperation operation(blocking_task_runner(), delegate(), metadata(),
84 cache()); 84 cache());
85 85
86 base::FilePath empty_dir(FILE_PATH_LITERAL( 86 base::FilePath empty_dir(FILE_PATH_LITERAL(
87 "drive/root/Directory 1/Sub Directory Folder/Sub Sub Directory Folder")); 87 "drive/root/Directory 1/Sub Directory Folder/Sub Sub Directory Folder"));
88 base::FilePath non_empty_dir(FILE_PATH_LITERAL( 88 base::FilePath non_empty_dir(FILE_PATH_LITERAL(
89 "drive/root/Directory 1")); 89 "drive/root/Directory 1"));
90 base::FilePath file_in_non_empty_dir(FILE_PATH_LITERAL( 90 base::FilePath file_in_non_empty_dir(FILE_PATH_LITERAL(
91 "drive/root/Directory 1/SubDirectory File 1.txt")); 91 "drive/root/Directory 1/SubDirectory File 1.txt"));
92 92
93 // Empty directory can be removed even with is_recursive = false. 93 // Empty directory can be removed even with is_recursive = false.
(...skipping 29 matching lines...) Expand all
123 content::RunAllBlockingPoolTasksUntilIdle(); 123 content::RunAllBlockingPoolTasksUntilIdle();
124 EXPECT_EQ(FILE_ERROR_OK, error); 124 EXPECT_EQ(FILE_ERROR_OK, error);
125 EXPECT_EQ(FILE_ERROR_NOT_FOUND, 125 EXPECT_EQ(FILE_ERROR_NOT_FOUND,
126 GetLocalResourceEntry(non_empty_dir, &entry)); 126 GetLocalResourceEntry(non_empty_dir, &entry));
127 EXPECT_EQ(FILE_ERROR_NOT_FOUND, 127 EXPECT_EQ(FILE_ERROR_NOT_FOUND,
128 GetLocalResourceEntry(file_in_non_empty_dir, &entry)); 128 GetLocalResourceEntry(file_in_non_empty_dir, &entry));
129 } 129 }
130 130
131 } // namespace file_system 131 } // namespace file_system
132 } // namespace drive 132 } // namespace drive
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698