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

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

Issue 13456002: drive: Fills no-parent entiries in "/drive/other". (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased on 192559 Created 7 years, 8 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/resource_entry_conversion.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/drive/resource_entry_conversion_unittest.cc
diff --git a/chrome/browser/chromeos/drive/resource_entry_conversion_unittest.cc b/chrome/browser/chromeos/drive/resource_entry_conversion_unittest.cc
index fc322856beea27f5bf341e6934ffbfdc54592f2e..166b436ee5af3657db00511d70b232ede0b704dd 100644
--- a/chrome/browser/chromeos/drive/resource_entry_conversion_unittest.cc
+++ b/chrome/browser/chromeos/drive/resource_entry_conversion_unittest.cc
@@ -7,6 +7,7 @@
#include "base/files/file_path.h"
#include "base/values.h"
#include "chrome/browser/chromeos/drive/drive.pb.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_util.h"
#include "chrome/browser/chromeos/drive/drive_test_util.h"
#include "chrome/browser/google_apis/gdata_wapi_parser.h"
#include "googleurl/src/gurl.h"
@@ -32,7 +33,8 @@ TEST(ResourceEntryConversionTest, ConvertResourceEntryToDriveEntryProto_File) {
EXPECT_EQ("https://file_content_url/", entry_proto.download_url());
EXPECT_EQ("https://file1_link_self/file:2_file_resource_id",
entry_proto.edit_url());
- EXPECT_EQ("", entry_proto.parent_resource_id());
+ EXPECT_EQ(util::kDriveOtherDirSpecialResourceId,
+ entry_proto.parent_resource_id());
EXPECT_FALSE(entry_proto.deleted());
EXPECT_FALSE(entry_proto.shared_with_me());
@@ -113,7 +115,8 @@ TEST(ResourceEntryConversionTest,
EXPECT_EQ("https://3_document_content/", entry_proto.download_url());
EXPECT_EQ("https://3_document_self_link/document:5_document_resource_id",
entry_proto.edit_url());
- EXPECT_EQ("", entry_proto.parent_resource_id());
+ EXPECT_EQ(util::kDriveOtherDirSpecialResourceId,
+ entry_proto.parent_resource_id());
EXPECT_FALSE(entry_proto.deleted());
EXPECT_FALSE(entry_proto.shared_with_me());
@@ -271,7 +274,8 @@ TEST(ResourceEntryConversionTest,
EXPECT_EQ("https://content_url/", entry_proto.download_url());
EXPECT_EQ("https://edit_url/document%3Adeleted_in_root_id",
entry_proto.edit_url());
- EXPECT_EQ("", entry_proto.parent_resource_id());
+ EXPECT_EQ(util::kDriveOtherDirSpecialResourceId,
+ entry_proto.parent_resource_id());
EXPECT_TRUE(entry_proto.deleted()); // The document was deleted.
EXPECT_FALSE(entry_proto.shared_with_me());
« no previous file with comments | « chrome/browser/chromeos/drive/resource_entry_conversion.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698