gdata: Add GDataDirectoryService::AddEntryToDirectory()

chrome/browser/chromeos/gdata/gdata_db_unittest.cc

 // 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.
 
 #include "chrome/browser/chromeos/gdata/gdata_db.h"
 
+#include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/chromeos/gdata/gdata.pb.h"
 #include "chrome/browser/chromeos/gdata/gdata_db_factory.h"
 #include "chrome/browser/chromeos/gdata/gdata_files.h"
+#include "chrome/browser/chromeos/gdata/gdata_test_util.h"
 #include "chrome/test/base/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace gdata {
 namespace {
 
 class GDataDBTest : public testing::Test {
  public:
   GDataDBTest() {
   }
@@ skipping 38 matching lines @@
 
   // Tests GDataDB::NewIterator and GDataDBIter::GetNext.
   // Creates an iterator with start at |parent|, and iterates comparing with
   // expected |filenames|.
   void TestIter(const std::string& parent,
                 const char* file_paths[],
                 size_t file_paths_size);
 
   scoped_ptr<TestingProfile> profile_;
   scoped_ptr<GDataDB> gdata_db_;
+  MessageLoopForUI message_loop;
 };
 
 void GDataDBTest::SetUp() {
   profile_.reset(new TestingProfile());
   gdata_db_ = db_factory::CreateGDataDB(
       profile_->GetPath().Append("testdb"));
 }
 
 void GDataDBTest::TestGetNotFound(const GDataEntry& source) {
   scoped_ptr<GDataEntry> entry;
@@ skipping 57 matching lines @@
 
 GDataDirectory* GDataDBTest::AddDirectory(
     GDataDirectory* parent,
     GDataDirectoryService* directory_service,
     int sequence_id) {
   GDataDirectory* dir = new GDataDirectory(parent, directory_service);
   const std::string dir_name = "dir" + base::IntToString(sequence_id);
   const std::string resource_id = std::string("dir_resource_id:") +
                                   dir_name;
   dir->set_title(dir_name);
+  dir->SetBaseNameFromTitle();
   dir->set_resource_id(resource_id);
-  parent->AddEntry(dir);
+  GDataFileError error = GDATA_FILE_ERROR_FAILED;
+  directory_service->AddEntryToDirectory(
+      parent->GetFilePath(),
+      dir,
+      base::Bind(&test_util::CopyErrorCodeFromFileOperationCallback, &error));
+  test_util::RunBlockingPoolTask();
+  EXPECT_EQ(GDATA_FILE_OK, error);
 
   GDataDB::Status status = gdata_db_->Put(*dir);
   EXPECT_EQ(GDataDB::DB_OK, status);
   DVLOG(1) << "AddDirectory " << dir->GetFilePath().value()
            << ", " << resource_id;
   return dir;
 }
 
 GDataFile* GDataDBTest::AddFile(GDataDirectory* parent,
                                 GDataDirectoryService* directory_service,
                                 int sequence_id) {
   GDataFile* file = new GDataFile(parent, directory_service);
   const std::string title = "file" + base::IntToString(sequence_id);
   const std::string resource_id = std::string("file_resource_id:") +
                                   title;
   file->set_title(title);
+  file->SetBaseNameFromTitle();
   file->set_resource_id(resource_id);
-  parent->AddEntry(file);
+  GDataFileError error = GDATA_FILE_ERROR_FAILED;
+  directory_service->AddEntryToDirectory(
+      parent->GetFilePath(),
+      file,
+      base::Bind(&test_util::CopyErrorCodeFromFileOperationCallback, &error));
+  test_util::RunBlockingPoolTask();
+  EXPECT_EQ(GDATA_FILE_OK, error);
 
   GDataDB::Status status = gdata_db_->Put(*file);
   EXPECT_EQ(GDataDB::DB_OK, status);
   DVLOG(1) << "AddFile " << file->GetFilePath().value()
            << ", " << resource_id;
   return file;
 }
 
 void GDataDBTest::TestIter(const std::string& parent,
                            const char* file_paths[],
@@ skipping 147 matching lines @@
   entry_proto.SerializeToString(&serialized_proto);
   gdata_db_->PutRawForTesting("file_resource_id", serialized_proto);
 
   // Check if the corruption is detected.
   TestGetCorrupt(file);
   // We should no longer be able to find the file by iteration.
   TestIter("", NULL, 0);
 }
 
 }  // namespace gdata