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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/drive/change_list_processor_unittest.cc

Issue 343073003: Files.app: Provide detailed change information on onDirectoryChanged event (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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
« no previous file with comments | « chrome/browser/chromeos/drive/change_list_processor.cc ('k') | chrome/browser/chromeos/drive/directory_loader.cc » ('j') | chrome/browser/chromeos/drive/file_change.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/drive/change_list_processor_unittest.cc
diff --git a/chrome/browser/chromeos/drive/change_list_processor_unittest.cc b/chrome/browser/chromeos/drive/change_list_processor_unittest.cc
index 39e556455031478724c4bf9496e90f0c1a55cbc9..1f258174e94a5c89a09f8dabd5d00483704fdcaa 100644
--- a/chrome/browser/chromeos/drive/change_list_processor_unittest.cc
+++ b/chrome/browser/chromeos/drive/change_list_processor_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// 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.
@@ -10,6 +10,7 @@
#include "chrome/browser/chromeos/drive/drive.pb.h"
#include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h"
#include "chrome/browser/chromeos/drive/file_cache.h"
+#include "chrome/browser/chromeos/drive/file_change.h"
#include "chrome/browser/chromeos/drive/file_system_util.h"
#include "chrome/browser/chromeos/drive/resource_metadata.h"
#include "chrome/browser/chromeos/drive/test_util.h"
@@ -132,7 +133,7 @@ class ChangeListProcessorTest : public testing::Test {
// Applies the |changes| to |metadata_| as a delta update. Delta changelists
// should contain their changestamp in themselves.
FileError ApplyChangeList(ScopedVector<ChangeList> changes,
- std::set<base::FilePath>* changed_dirs) {
+ FileChange* changed_files) {
scoped_ptr<google_apis::AboutResource> about_resource(
new google_apis::AboutResource);
about_resource->set_largest_change_id(kBaseResourceListChangestamp);
@@ -142,7 +143,7 @@ class ChangeListProcessorTest : public testing::Test {
FileError error = processor.Apply(about_resource.Pass(),
changes.Pass(),
true /* is_delta_update */);
- *changed_dirs = processor.changed_dirs();
+ *changed_files = processor.changed_files();
return error;
}
@@ -235,8 +236,10 @@ TEST_F(ChangeListProcessorTest, DeltaFileAddedInNewDirectory) {
// Apply the changelist and check the effect.
EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
- std::set<base::FilePath> changed_dirs;
- EXPECT_EQ(FILE_ERROR_OK, ApplyChangeList(change_lists.Pass(), &changed_dirs));
+
+ FileChange changed_files;
+ EXPECT_EQ(FILE_ERROR_OK,
+ ApplyChangeList(change_lists.Pass(), &changed_files));
int64 changestamp = 0;
EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
@@ -245,10 +248,10 @@ TEST_F(ChangeListProcessorTest, DeltaFileAddedInNewDirectory) {
EXPECT_TRUE(GetResourceEntry(
"drive/root/New Directory/File in new dir.txt"));
- EXPECT_EQ(2U, changed_dirs.size());
- EXPECT_TRUE(changed_dirs.count(
- base::FilePath::FromUTF8Unsafe("drive/root")));
- EXPECT_TRUE(changed_dirs.count(
+ EXPECT_EQ(2U, changed_files.size());
+ EXPECT_TRUE(changed_files.count(base::FilePath::FromUTF8Unsafe(
+ "drive/root/New Directory/File in new dir.txt")));
+ EXPECT_TRUE(changed_files.count(
base::FilePath::FromUTF8Unsafe("drive/root/New Directory")));
}
@@ -268,8 +271,10 @@ TEST_F(ChangeListProcessorTest, DeltaDirMovedFromRootToDirectory) {
// Apply the changelist and check the effect.
EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
- std::set<base::FilePath> changed_dirs;
- EXPECT_EQ(FILE_ERROR_OK, ApplyChangeList(change_lists.Pass(), &changed_dirs));
+
+ FileChange changed_files;
+ EXPECT_EQ(FILE_ERROR_OK,
+ ApplyChangeList(change_lists.Pass(), &changed_files));
int64 changestamp = 0;
EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
@@ -278,17 +283,15 @@ TEST_F(ChangeListProcessorTest, DeltaDirMovedFromRootToDirectory) {
EXPECT_TRUE(GetResourceEntry(
"drive/root/Directory 2 excludeDir-test/Directory 1"));
- EXPECT_EQ(4U, changed_dirs.size());
- EXPECT_TRUE(changed_dirs.count(
+ EXPECT_EQ(2U, changed_files.size());
+ EXPECT_TRUE(changed_files.CountDirectory(
base::FilePath::FromUTF8Unsafe("drive/root")));
- EXPECT_TRUE(changed_dirs.count(
+ EXPECT_TRUE(changed_files.count(
base::FilePath::FromUTF8Unsafe("drive/root/Directory 1")));
- EXPECT_TRUE(changed_dirs.count(
- base::FilePath::FromUTF8Unsafe(
- "drive/root/Directory 2 excludeDir-test")));
- EXPECT_TRUE(changed_dirs.count(
- base::FilePath::FromUTF8Unsafe(
- "drive/root/Directory 2 excludeDir-test/Directory 1")));
+ EXPECT_TRUE(changed_files.CountDirectory(base::FilePath::FromUTF8Unsafe(
+ "drive/root/Directory 2 excludeDir-test")));
+ EXPECT_TRUE(changed_files.count(base::FilePath::FromUTF8Unsafe(
+ "drive/root/Directory 2 excludeDir-test/Directory 1")));
}
TEST_F(ChangeListProcessorTest, DeltaFileMovedFromDirectoryToRoot) {
@@ -305,8 +308,9 @@ TEST_F(ChangeListProcessorTest, DeltaFileMovedFromDirectoryToRoot) {
// Apply the changelist and check the effect.
EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
- std::set<base::FilePath> changed_dirs;
- EXPECT_EQ(FILE_ERROR_OK, ApplyChangeList(change_lists.Pass(), &changed_dirs));
+ FileChange changed_files;
+ EXPECT_EQ(FILE_ERROR_OK,
+ ApplyChangeList(change_lists.Pass(), &changed_files));
int64 changestamp = 0;
EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
@@ -315,11 +319,11 @@ TEST_F(ChangeListProcessorTest, DeltaFileMovedFromDirectoryToRoot) {
"drive/root/Directory 1/SubDirectory File 1.txt"));
EXPECT_TRUE(GetResourceEntry("drive/root/SubDirectory File 1.txt"));
- EXPECT_EQ(2U, changed_dirs.size());
- EXPECT_TRUE(changed_dirs.count(
- base::FilePath::FromUTF8Unsafe("drive/root")));
- EXPECT_TRUE(changed_dirs.count(
- base::FilePath::FromUTF8Unsafe("drive/root/Directory 1")));
+ EXPECT_EQ(2U, changed_files.size());
+ EXPECT_TRUE(changed_files.count(
+ base::FilePath::FromUTF8Unsafe("drive/root/SubDirectory File 1.txt")));
+ EXPECT_TRUE(changed_files.count(base::FilePath::FromUTF8Unsafe(
+ "drive/root/Directory 1/SubDirectory File 1.txt")));
}
TEST_F(ChangeListProcessorTest, DeltaFileRenamedInDirectory) {
@@ -337,8 +341,9 @@ TEST_F(ChangeListProcessorTest, DeltaFileRenamedInDirectory) {
// Apply the changelist and check the effect.
EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
- std::set<base::FilePath> changed_dirs;
- EXPECT_EQ(FILE_ERROR_OK, ApplyChangeList(change_lists.Pass(), &changed_dirs));
+ FileChange changed_files;
+ EXPECT_EQ(FILE_ERROR_OK,
+ ApplyChangeList(change_lists.Pass(), &changed_files));
int64 changestamp = 0;
EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
@@ -348,9 +353,11 @@ TEST_F(ChangeListProcessorTest, DeltaFileRenamedInDirectory) {
EXPECT_TRUE(GetResourceEntry(
"drive/root/Directory 1/New SubDirectory File 1.txt"));
- EXPECT_EQ(1U, changed_dirs.size());
- EXPECT_TRUE(changed_dirs.count(
- base::FilePath::FromUTF8Unsafe("drive/root/Directory 1")));
+ EXPECT_EQ(2U, changed_files.size());
+ EXPECT_TRUE(changed_files.count(base::FilePath::FromUTF8Unsafe(
+ "drive/root/Directory 1/SubDirectory File 1.txt")));
+ EXPECT_TRUE(changed_files.count(base::FilePath::FromUTF8Unsafe(
+ "drive/root/Directory 1/New SubDirectory File 1.txt")));
}
TEST_F(ChangeListProcessorTest, DeltaAddAndDeleteFileInRoot) {
@@ -368,15 +375,17 @@ TEST_F(ChangeListProcessorTest, DeltaAddAndDeleteFileInRoot) {
// Apply.
EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
- std::set<base::FilePath> changed_dirs;
- EXPECT_EQ(FILE_ERROR_OK, ApplyChangeList(change_lists.Pass(), &changed_dirs));
+ FileChange changed_files;
+ EXPECT_EQ(FILE_ERROR_OK,
+ ApplyChangeList(change_lists.Pass(), &changed_files));
+
int64 changestamp = 0;
EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
EXPECT_EQ(16683, changestamp);
EXPECT_TRUE(GetResourceEntry("drive/root/Added file.txt"));
- EXPECT_EQ(1U, changed_dirs.size());
- EXPECT_TRUE(changed_dirs.count(
- base::FilePath::FromUTF8Unsafe("drive/root")));
+ EXPECT_EQ(1U, changed_files.size());
+ EXPECT_TRUE(changed_files.count(
+ base::FilePath::FromUTF8Unsafe("drive/root/Added file.txt")));
// Create ChangeList to delete the file.
change_lists.push_back(new ChangeList);
@@ -388,13 +397,14 @@ TEST_F(ChangeListProcessorTest, DeltaAddAndDeleteFileInRoot) {
change_lists[0]->set_largest_changestamp(16687);
// Apply.
- EXPECT_EQ(FILE_ERROR_OK, ApplyChangeList(change_lists.Pass(), &changed_dirs));
+ EXPECT_EQ(FILE_ERROR_OK,
+ ApplyChangeList(change_lists.Pass(), &changed_files));
EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
EXPECT_EQ(16687, changestamp);
EXPECT_FALSE(GetResourceEntry("drive/root/Added file.txt"));
- EXPECT_EQ(1U, changed_dirs.size());
- EXPECT_TRUE(changed_dirs.count(
- base::FilePath::FromUTF8Unsafe("drive/root")));
+ EXPECT_EQ(1U, changed_files.size());
+ EXPECT_TRUE(changed_files.count(
+ base::FilePath::FromUTF8Unsafe("drive/root/Added file.txt")));
}
@@ -414,16 +424,17 @@ TEST_F(ChangeListProcessorTest, DeltaAddAndDeleteFileFromExistingDirectory) {
// Apply.
EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
- std::set<base::FilePath> changed_dirs;
- EXPECT_EQ(FILE_ERROR_OK, ApplyChangeList(change_lists.Pass(), &changed_dirs));
+ FileChange changed_files;
+ EXPECT_EQ(FILE_ERROR_OK,
+ ApplyChangeList(change_lists.Pass(), &changed_files));
int64 changestamp = 0;
EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
EXPECT_EQ(16730, changestamp);
EXPECT_TRUE(GetResourceEntry("drive/root/Directory 1/Added file.txt"));
- EXPECT_EQ(1U, changed_dirs.size());
- EXPECT_TRUE(changed_dirs.count(
- base::FilePath::FromUTF8Unsafe("drive/root/Directory 1")));
+ EXPECT_EQ(1U, changed_files.size());
+ EXPECT_TRUE(changed_files.count(
+ base::FilePath::FromUTF8Unsafe("drive/root/Directory 1/Added file.txt")));
// Create ChangeList to delete the file.
change_lists.push_back(new ChangeList);
@@ -436,14 +447,15 @@ TEST_F(ChangeListProcessorTest, DeltaAddAndDeleteFileFromExistingDirectory) {
change_lists[0]->set_largest_changestamp(16770);
// Apply.
- EXPECT_EQ(FILE_ERROR_OK, ApplyChangeList(change_lists.Pass(), &changed_dirs));
+ EXPECT_EQ(FILE_ERROR_OK,
+ ApplyChangeList(change_lists.Pass(), &changed_files));
EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
EXPECT_EQ(16770, changestamp);
EXPECT_FALSE(GetResourceEntry("drive/root/Directory 1/Added file.txt"));
- EXPECT_EQ(1U, changed_dirs.size());
- EXPECT_TRUE(changed_dirs.count(
- base::FilePath::FromUTF8Unsafe("drive/root/Directory 1")));
+ EXPECT_EQ(1U, changed_files.size());
+ EXPECT_TRUE(changed_files.count(
+ base::FilePath::FromUTF8Unsafe("drive/root/Directory 1/Added file.txt")));
}
TEST_F(ChangeListProcessorTest, DeltaAddFileToNewButDeletedDirectory) {
@@ -474,15 +486,16 @@ TEST_F(ChangeListProcessorTest, DeltaAddFileToNewButDeletedDirectory) {
// Apply the changelist and check the effect.
EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
- std::set<base::FilePath> changed_dirs;
- EXPECT_EQ(FILE_ERROR_OK, ApplyChangeList(change_lists.Pass(), &changed_dirs));
+ FileChange changed_files;
+ EXPECT_EQ(FILE_ERROR_OK,
+ ApplyChangeList(change_lists.Pass(), &changed_files));
int64 changestamp = 0;
EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
EXPECT_EQ(16730, changestamp);
EXPECT_FALSE(GetResourceEntry("drive/root/New Directory/new_pdf_file.pdf"));
- EXPECT_TRUE(changed_dirs.empty());
+ EXPECT_TRUE(changed_files.empty());
}
TEST_F(ChangeListProcessorTest, RefreshDirectory) {
@@ -578,8 +591,9 @@ TEST_F(ChangeListProcessorTest, SharedFilesWithNoParentInFeed) {
change_lists[0]->mutable_parent_resource_ids()->push_back("nonexisting");
change_lists[0]->set_largest_changestamp(kBaseResourceListChangestamp + 1);
- std::set<base::FilePath> changed_dirs;
- EXPECT_EQ(FILE_ERROR_OK, ApplyChangeList(change_lists.Pass(), &changed_dirs));
+ FileChange changed_files;
+ EXPECT_EQ(FILE_ERROR_OK,
+ ApplyChangeList(change_lists.Pass(), &changed_files));
// "new_file" should be added under drive/other.
ResourceEntry entry;
@@ -622,8 +636,9 @@ TEST_F(ChangeListProcessorTest, ModificationDate) {
EXPECT_EQ(FILE_ERROR_OK, metadata_->AddEntry(new_file_local, &local_id));
// Apply the change.
- std::set<base::FilePath> changed_dirs;
- EXPECT_EQ(FILE_ERROR_OK, ApplyChangeList(change_lists.Pass(), &changed_dirs));
+ FileChange changed_files;
+ EXPECT_EQ(FILE_ERROR_OK,
+ ApplyChangeList(change_lists.Pass(), &changed_files));
// The change is rejected due to the old modification date.
ResourceEntry entry;
« no previous file with comments | « chrome/browser/chromeos/drive/change_list_processor.cc ('k') | chrome/browser/chromeos/drive/directory_loader.cc » ('j') | chrome/browser/chromeos/drive/file_change.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698