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

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

Issue 13149003: drive: Use "/drive/root" namespace and fix Files app and tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge glitches. Created 7 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
Index: chrome/browser/chromeos/drive/search_metadata_unittest.cc
diff --git a/chrome/browser/chromeos/drive/search_metadata_unittest.cc b/chrome/browser/chromeos/drive/search_metadata_unittest.cc
index 1be4c459efc85f01de69bbecde5971a9d6b7c338..2a153fa79500f396b2186803aab667acc43326da 100644
--- a/chrome/browser/chromeos/drive/search_metadata_unittest.cc
+++ b/chrome/browser/chromeos/drive/search_metadata_unittest.cc
@@ -129,7 +129,7 @@ TEST_F(SearchMetadataTest, SearchMetadata_RegularFile) {
EXPECT_EQ(DRIVE_FILE_OK, error);
ASSERT_EQ(1U, result->size());
EXPECT_EQ(base::FilePath::FromUTF8Unsafe(
- "drive/Directory 1/SubDirectory File 1.txt"), result->at(0).path);
+ "drive/root/Directory 1/SubDirectory File 1.txt"), result->at(0).path);
}
// This test checks if |FindAndHighlight| does case-insensitive search.
@@ -149,7 +149,7 @@ TEST_F(SearchMetadataTest, SearchMetadata_CaseInsensitiveSearch) {
EXPECT_EQ(DRIVE_FILE_OK, error);
ASSERT_EQ(1U, result->size());
EXPECT_EQ(base::FilePath::FromUTF8Unsafe(
- "drive/Directory 1/SubDirectory File 1.txt"), result->at(0).path);
+ "drive/root/Directory 1/SubDirectory File 1.txt"), result->at(0).path);
}
TEST_F(SearchMetadataTest, SearchMetadata_RegularFiles) {
@@ -175,10 +175,10 @@ TEST_F(SearchMetadataTest, SearchMetadata_RegularFiles) {
// All base names should contain "File".
EXPECT_EQ(
base::FilePath::FromUTF8Unsafe(
- "drive/Slash \xE2\x88\x95 in directory/Slash SubDir File.txt"),
+ "drive/root/Slash \xE2\x88\x95 in directory/Slash SubDir File.txt"),
result->at(0).path);
EXPECT_EQ(base::FilePath::FromUTF8Unsafe(
- "drive/Directory 1/SubDirectory File 1.txt"), result->at(1).path);
+ "drive/root/Directory 1/SubDirectory File 1.txt"), result->at(1).path);
}
TEST_F(SearchMetadataTest, SearchMetadata_AtMostOneFile) {
@@ -198,7 +198,7 @@ TEST_F(SearchMetadataTest, SearchMetadata_AtMostOneFile) {
ASSERT_EQ(1U, result->size());
EXPECT_EQ(
base::FilePath::FromUTF8Unsafe(
- "drive/Slash \xE2\x88\x95 in directory/Slash SubDir File.txt"),
+ "drive/root/Slash \xE2\x88\x95 in directory/Slash SubDir File.txt"),
result->at(0).path);
}
@@ -216,7 +216,7 @@ TEST_F(SearchMetadataTest, SearchMetadata_Directory) {
EXPECT_EQ(DRIVE_FILE_OK, error);
ASSERT_EQ(1U, result->size());
EXPECT_EQ(
- base::FilePath::FromUTF8Unsafe("drive/Directory 1"),
+ base::FilePath::FromUTF8Unsafe("drive/root/Directory 1"),
result->at(0).path);
}
@@ -234,7 +234,7 @@ TEST_F(SearchMetadataTest, SearchMetadata_HostedDocument) {
EXPECT_EQ(DRIVE_FILE_OK, error);
ASSERT_EQ(1U, result->size());
- EXPECT_EQ(base::FilePath::FromUTF8Unsafe("drive/Document 1.gdoc"),
+ EXPECT_EQ(base::FilePath::FromUTF8Unsafe("drive/root/Document 1.gdoc"),
result->at(0).path);
}

Powered by Google App Engine
This is Rietveld 408576698