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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/file_system_provider/request_manager_unittest.cc

Issue 210803003: [fsp] Decouple file_service_provider::Service. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed more comments. Created 6 years, 9 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/chromeos/file_system_provider/request_manager.cc ('K') | « chrome/browser/chromeos/file_system_provider/request_manager.cc ('k') | chrome/browser/chromeos/file_system_provider/service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/file_system_provider/request_manager_unittest.cc
diff --git a/chrome/browser/chromeos/file_system_provider/request_manager_unittest.cc b/chrome/browser/chromeos/file_system_provider/request_manager_unittest.cc
index 97ae969f11e712adb7a6adcc3acb78ecf0d61947..e035e6057bdeda6902c4c79b3e37ef3cb7083888 100644
--- a/chrome/browser/chromeos/file_system_provider/request_manager_unittest.cc
+++ b/chrome/browser/chromeos/file_system_provider/request_manager_unittest.cc
@@ -20,9 +20,6 @@ namespace {
const char kExtensionId[] = "mbflcebpggnecokmikipoihdbecnjfoj";
const int kFileSystemId = 1;
-const char kFileSystemName[] = "Camera Pictures";
-const base::FilePath::CharType kMountPath[] = FILE_PATH_LITERAL(
- "/provided/mbflcebpggnecokmikipoihdbecnjfoj-1-testing_profile-hash");
class EventLogger {
public:
@@ -84,23 +81,17 @@ class FileSystemProviderRequestManagerTest : public testing::Test {
virtual void SetUp() OVERRIDE {
request_manager_.reset(new RequestManager());
-
- // Configure the testing file system.
- file_system = ProvidedFileSystem(kExtensionId,
- kFileSystemId,
- kFileSystemName,
- base::FilePath(kMountPath));
}
scoped_ptr<RequestManager> request_manager_;
- ProvidedFileSystem file_system;
};
TEST_F(FileSystemProviderRequestManagerTest, CreateAndFulFill) {
EventLogger logger;
int request_id = request_manager_->CreateRequest(
- file_system,
+ kExtensionId,
+ kFileSystemId,
base::Bind(&EventLogger::OnSuccess, logger.GetWeakPtr()),
base::Bind(&EventLogger::OnError, logger.GetWeakPtr()));
@@ -113,7 +104,7 @@ TEST_F(FileSystemProviderRequestManagerTest, CreateAndFulFill) {
response->SetString("path", "i-like-vanilla");
bool result = request_manager_->FulfillRequest(
- file_system, request_id, response.Pass(), has_next);
+ kExtensionId, kFileSystemId, request_id, response.Pass(), has_next);
EXPECT_TRUE(result);
// Validate if the callback has correct arguments.
@@ -129,15 +120,16 @@ TEST_F(FileSystemProviderRequestManagerTest, CreateAndFulFill) {
// Confirm, that the request is removed. Basically, fulfilling again for the
// same request, should fail.
{
+ scoped_ptr<base::DictionaryValue> response;
bool retry = request_manager_->FulfillRequest(
- file_system, request_id, response.Pass(), has_next);
+ kExtensionId, kFileSystemId, request_id, response.Pass(), has_next);
EXPECT_FALSE(retry);
}
// Rejecting should also fail.
{
bool retry = request_manager_->RejectRequest(
- file_system, request_id, base::File::FILE_ERROR_FAILED);
+ kExtensionId, kFileSystemId, request_id, base::File::FILE_ERROR_FAILED);
EXPECT_FALSE(retry);
}
}
@@ -146,7 +138,8 @@ TEST_F(FileSystemProviderRequestManagerTest, CreateAndFulFill_WithHasNext) {
EventLogger logger;
int request_id = request_manager_->CreateRequest(
- file_system,
+ kExtensionId,
+ kFileSystemId,
base::Bind(&EventLogger::OnSuccess, logger.GetWeakPtr()),
base::Bind(&EventLogger::OnError, logger.GetWeakPtr()));
@@ -158,7 +151,7 @@ TEST_F(FileSystemProviderRequestManagerTest, CreateAndFulFill_WithHasNext) {
const bool has_next = true;
bool result = request_manager_->FulfillRequest(
- file_system, request_id, response.Pass(), has_next);
+ kExtensionId, kFileSystemId, request_id, response.Pass(), has_next);
EXPECT_TRUE(result);
// Validate if the callback has correct arguments.
@@ -173,7 +166,7 @@ TEST_F(FileSystemProviderRequestManagerTest, CreateAndFulFill_WithHasNext) {
{
bool new_has_next = false;
bool retry = request_manager_->FulfillRequest(
- file_system, request_id, response.Pass(), new_has_next);
+ kExtensionId, kFileSystemId, request_id, response.Pass(), new_has_next);
EXPECT_TRUE(retry);
}
@@ -182,7 +175,7 @@ TEST_F(FileSystemProviderRequestManagerTest, CreateAndFulFill_WithHasNext) {
{
bool new_has_next = false;
bool retry = request_manager_->FulfillRequest(
- file_system, request_id, response.Pass(), new_has_next);
+ kExtensionId, kFileSystemId, request_id, response.Pass(), new_has_next);
EXPECT_FALSE(retry);
}
}
@@ -191,7 +184,8 @@ TEST_F(FileSystemProviderRequestManagerTest, CreateAndReject) {
EventLogger logger;
int request_id = request_manager_->CreateRequest(
- file_system,
+ kExtensionId,
+ kFileSystemId,
base::Bind(&EventLogger::OnSuccess, logger.GetWeakPtr()),
base::Bind(&EventLogger::OnError, logger.GetWeakPtr()));
@@ -200,7 +194,8 @@ TEST_F(FileSystemProviderRequestManagerTest, CreateAndReject) {
EXPECT_EQ(0u, logger.error_events().size());
base::File::Error error = base::File::FILE_ERROR_NO_MEMORY;
- bool result = request_manager_->RejectRequest(file_system, request_id, error);
+ bool result = request_manager_->RejectRequest(
+ kExtensionId, kFileSystemId, request_id, error);
EXPECT_TRUE(result);
// Validate if the callback has correct arguments.
@@ -215,14 +210,14 @@ TEST_F(FileSystemProviderRequestManagerTest, CreateAndReject) {
scoped_ptr<base::DictionaryValue> response;
bool has_next = false;
bool retry = request_manager_->FulfillRequest(
- file_system, request_id, response.Pass(), has_next);
+ kExtensionId, kFileSystemId, request_id, response.Pass(), has_next);
EXPECT_FALSE(retry);
}
// Rejecting should also fail.
{
- bool retry =
- request_manager_->RejectRequest(file_system, request_id, error);
+ bool retry = request_manager_->RejectRequest(
+ kExtensionId, kFileSystemId, request_id, error);
EXPECT_FALSE(retry);
}
}
@@ -232,7 +227,8 @@ TEST_F(FileSystemProviderRequestManagerTest,
EventLogger logger;
int request_id = request_manager_->CreateRequest(
- file_system,
+ kExtensionId,
+ kFileSystemId,
base::Bind(&EventLogger::OnSuccess, logger.GetWeakPtr()),
base::Bind(&EventLogger::OnError, logger.GetWeakPtr()));
@@ -241,8 +237,8 @@ TEST_F(FileSystemProviderRequestManagerTest,
EXPECT_EQ(0u, logger.error_events().size());
base::File::Error error = base::File::FILE_ERROR_NO_MEMORY;
- bool result =
- request_manager_->RejectRequest(file_system, request_id + 1, error);
+ bool result = request_manager_->RejectRequest(
+ kExtensionId, kFileSystemId, request_id + 1, error);
EXPECT_FALSE(result);
// Callbacks should not be called.
@@ -251,8 +247,8 @@ TEST_F(FileSystemProviderRequestManagerTest,
// Confirm, that the request hasn't been removed, by rejecting it correctly.
{
- bool retry =
- request_manager_->RejectRequest(file_system, request_id, error);
+ bool retry = request_manager_->RejectRequest(
+ kExtensionId, kFileSystemId, request_id, error);
EXPECT_TRUE(retry);
}
}
@@ -262,7 +258,8 @@ TEST_F(FileSystemProviderRequestManagerTest,
EventLogger logger;
int request_id = request_manager_->CreateRequest(
- file_system,
+ kExtensionId,
+ kFileSystemId,
base::Bind(&EventLogger::OnSuccess, logger.GetWeakPtr()),
base::Bind(&EventLogger::OnError, logger.GetWeakPtr()));
@@ -271,8 +268,8 @@ TEST_F(FileSystemProviderRequestManagerTest,
EXPECT_EQ(0u, logger.error_events().size());
base::File::Error error = base::File::FILE_ERROR_NO_MEMORY;
- bool result =
- request_manager_->RejectRequest(file_system, request_id + 1, error);
+ bool result = request_manager_->RejectRequest(
+ kExtensionId, kFileSystemId, request_id + 1, error);
EXPECT_FALSE(result);
// Callbacks should not be called.
@@ -281,8 +278,8 @@ TEST_F(FileSystemProviderRequestManagerTest,
// Confirm, that the request hasn't been removed, by rejecting it correctly.
{
- bool retry =
- request_manager_->RejectRequest(file_system, request_id, error);
+ bool retry = request_manager_->RejectRequest(
+ kExtensionId, kFileSystemId, request_id, error);
EXPECT_TRUE(retry);
}
}
@@ -292,25 +289,20 @@ TEST_F(FileSystemProviderRequestManagerTest,
EventLogger logger;
int request_id = request_manager_->CreateRequest(
- file_system,
+ kExtensionId,
+ kFileSystemId,
base::Bind(&EventLogger::OnSuccess, logger.GetWeakPtr()),
base::Bind(&EventLogger::OnError, logger.GetWeakPtr()));
EXPECT_EQ(1, request_id);
- // Create another file system, which has just a different fiel system id
- // (1 -> 2).
- ProvidedFileSystem another_file_system(
- kExtensionId,
- 2, // file_system_id
- "Music",
- base::FilePath::FromUTF8Unsafe(
- "/provided/mbflcebpggnecokmikipoihdbecnjfoj-2-testing_profile-hash"));
-
scoped_ptr<base::DictionaryValue> response;
const bool has_next = false;
- bool result = request_manager_->FulfillRequest(
- another_file_system, request_id, response.Pass(), has_next);
+ bool result = request_manager_->FulfillRequest(kExtensionId,
+ 2, // file_system_id
+ request_id,
+ response.Pass(),
+ has_next);
EXPECT_FALSE(result);
// Callbacks should not be called.
@@ -321,7 +313,7 @@ TEST_F(FileSystemProviderRequestManagerTest,
// with a correct file system.
{
bool retry = request_manager_->FulfillRequest(
- file_system, request_id, response.Pass(), has_next);
+ kExtensionId, kFileSystemId, request_id, response.Pass(), has_next);
EXPECT_TRUE(retry);
}
}
@@ -330,12 +322,14 @@ TEST_F(FileSystemProviderRequestManagerTest, UniqueIds) {
EventLogger logger;
int first_request_id = request_manager_->CreateRequest(
- file_system,
+ kExtensionId,
+ kFileSystemId,
base::Bind(&EventLogger::OnSuccess, logger.GetWeakPtr()),
base::Bind(&EventLogger::OnError, logger.GetWeakPtr()));
int second_request_id = request_manager_->CreateRequest(
- file_system,
+ kExtensionId,
+ kFileSystemId,
base::Bind(&EventLogger::OnSuccess, logger.GetWeakPtr()),
base::Bind(&EventLogger::OnError, logger.GetWeakPtr()));
« chrome/browser/chromeos/file_system_provider/request_manager.cc ('K') | « chrome/browser/chromeos/file_system_provider/request_manager.cc ('k') | chrome/browser/chromeos/file_system_provider/service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698