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

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

Issue 11227020: Set root resource ID upon full feed update. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: revert the previous Created 8 years, 1 month 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/drive_resource_metadata_unittest.cc
diff --git a/chrome/browser/chromeos/drive/drive_resource_metadata_unittest.cc b/chrome/browser/chromeos/drive/drive_resource_metadata_unittest.cc
index 12e2bdcaf801ac1378d4c73406d6ba2e362c6da6..41023db48ae19b54651c05aed8eb6478a4673a08 100644
--- a/chrome/browser/chromeos/drive/drive_resource_metadata_unittest.cc
+++ b/chrome/browser/chromeos/drive/drive_resource_metadata_unittest.cc
@@ -17,6 +17,7 @@
#include "chrome/browser/chromeos/drive/drive_cache.h"
#include "chrome/browser/chromeos/drive/drive_files.h"
#include "chrome/browser/chromeos/drive/drive_test_util.h"
+#include "chrome/browser/google_apis/gdata_util.h"
#include "chrome/test/base/testing_profile.h"
#include "content/public/test/test_browser_thread.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -24,6 +25,10 @@
namespace drive {
namespace {
+// The root directory resource ID for WAPI.
+// TODO(haruki): Make Drive API equivalent work. http://crbug.com/157114
+const char kTestRootDirectoryResourceId[] = "folder:testroot";
+
// See drive.proto for the difference between the two URLs.
const char kResumableEditMediaUrl[] = "http://resumable-edit-media/";
const char kResumableCreateMediaUrl[] = "http://resumable-create-media/";
@@ -84,6 +89,8 @@ DriveResourceMetadataTest::DriveResourceMetadataTest()
}
void DriveResourceMetadataTest::Init() {
+ resource_metadata_.InitializeRootEntry(kTestRootDirectoryResourceId);
+
int sequence_id = 1;
DriveDirectory* dir1 = AddDirectory(resource_metadata_.root(), sequence_id++);
DriveDirectory* dir2 = AddDirectory(resource_metadata_.root(), sequence_id++);
@@ -133,7 +140,7 @@ TEST_F(DriveResourceMetadataTest, VersionCheck) {
DriveEntryProto* mutable_entry =
proto.mutable_drive_directory()->mutable_drive_entry();
mutable_entry->mutable_file_info()->set_is_directory(true);
- mutable_entry->set_resource_id(kDriveRootDirectoryResourceId);
+ mutable_entry->set_resource_id(kTestRootDirectoryResourceId);
mutable_entry->set_upload_url(kResumableCreateMediaUrl);
mutable_entry->set_title("drive");
@@ -165,11 +172,14 @@ TEST_F(DriveResourceMetadataTest, VersionCheck) {
TEST_F(DriveResourceMetadataTest, GetEntryByResourceId_RootDirectory) {
DriveResourceMetadata resource_metadata;
+ resource_metadata.InitializeRootEntry(kTestRootDirectoryResourceId);
+ EXPECT_EQ(kTestRootDirectoryResourceId,
+ resource_metadata.root()->resource_id());
// Look up the root directory by its resource ID.
DriveEntry* entry = resource_metadata.GetEntryByResourceId(
- kDriveRootDirectoryResourceId);
+ resource_metadata.root()->resource_id());
ASSERT_TRUE(entry);
- EXPECT_EQ(kDriveRootDirectoryResourceId, entry->resource_id());
+ EXPECT_EQ(kTestRootDirectoryResourceId, entry->resource_id());
}
TEST_F(DriveResourceMetadataTest, GetEntryInfoByResourceId) {
@@ -360,6 +370,7 @@ TEST_F(DriveResourceMetadataTest, DBTest) {
// InitFromDB should succeed.
DriveResourceMetadata test_resource_metadata;
+ test_resource_metadata.InitializeRootEntry(kTestRootDirectoryResourceId);
test_resource_metadata.InitFromDB(db_path, blocking_task_runner,
base::Bind(&InitFromDBCallback, DRIVE_FILE_OK));
google_apis::test_util::RunBlockingPoolTask();
@@ -451,7 +462,7 @@ TEST_F(DriveResourceMetadataTest, RemoveEntryFromParent) {
// Try removing root. This should fail.
resource_metadata_.RemoveEntryFromParent(
- kDriveRootDirectoryResourceId,
+ resource_metadata_.root()->resource_id(),
base::Bind(&test_util::CopyResultsFromFileMoveCallback,
&error, &drive_file_path));
google_apis::test_util::RunBlockingPoolTask();
« no previous file with comments | « chrome/browser/chromeos/drive/drive_resource_metadata.cc ('k') | chrome/browser/chromeos/drive/drive_test_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698