drive: Change the return type of ResourceMetadata's methods to FileError

chrome/browser/chromeos/drive/resource_metadata_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/drive/resource_metadata.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 141 matching lines @@
   scoped_ptr<ResourceMetadataStorage, test_util::DestroyHelperForTests>
       metadata_storage_;
   scoped_ptr<ResourceMetadata, test_util::DestroyHelperForTests>
       resource_metadata_;
 };
 
 TEST_F(ResourceMetadataTest, LargestChangestamp) {
   const int64 kChangestamp = 123456;
   EXPECT_EQ(FILE_ERROR_OK,
             resource_metadata_->SetLargestChangestamp(kChangestamp));
-  EXPECT_EQ(kChangestamp, resource_metadata_->GetLargestChangestamp());
+  int64 changestamp = 0;
+  EXPECT_EQ(FILE_ERROR_OK,
+            resource_metadata_->GetLargestChangestamp(&changestamp));
+  EXPECT_EQ(kChangestamp, changestamp);
 }
 
 TEST_F(ResourceMetadataTest, GetResourceEntryByPath) {
   // Confirm that an existing file is found.
   ResourceEntry entry;
   EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->GetResourceEntryByPath(
       base::FilePath::FromUTF8Unsafe("drive/root/dir1/file4"), &entry));
   EXPECT_EQ("file4", entry.base_name());
 
   // Confirm that a non existing file is not found.
@@ skipping 47 matching lines @@
   EXPECT_EQ("file9", entry.base_name());
   EXPECT_TRUE(!entry.file_info().is_directory());
   EXPECT_EQ("md5:file9", entry.file_specific_info().md5());
 
   // Rename it.
   ResourceEntry file_entry(entry);
   file_entry.set_title("file100");
   EXPECT_EQ(FILE_ERROR_OK,
             resource_metadata_->RefreshEntry(file_entry));
 
-  EXPECT_EQ("drive/root/dir1/dir3/file100",
-            resource_metadata_->GetFilePath(file_id).AsUTF8Unsafe());
+  base::FilePath path;
+  EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->GetFilePath(file_id, &path));
+  EXPECT_EQ("drive/root/dir1/dir3/file100", path.AsUTF8Unsafe());
   entry.Clear();
   EXPECT_EQ(FILE_ERROR_OK,
             resource_metadata_->GetResourceEntryById(file_id, &entry));
   EXPECT_EQ("file100", entry.base_name());
   EXPECT_TRUE(!entry.file_info().is_directory());
   EXPECT_EQ("md5:file9", entry.file_specific_info().md5());
 
   // Update the file md5.
   const std::string updated_md5("md5:updated");
   file_entry = entry;
   file_entry.mutable_file_specific_info()->set_md5(updated_md5);
   EXPECT_EQ(FILE_ERROR_OK,
             resource_metadata_->RefreshEntry(file_entry));
 
-  EXPECT_EQ("drive/root/dir1/dir3/file100",
-            resource_metadata_->GetFilePath(file_id).AsUTF8Unsafe());
+  EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->GetFilePath(file_id, &path));
+  EXPECT_EQ("drive/root/dir1/dir3/file100", path.AsUTF8Unsafe());
   entry.Clear();
   EXPECT_EQ(FILE_ERROR_OK,
             resource_metadata_->GetResourceEntryById(file_id, &entry));
   EXPECT_EQ("file100", entry.base_name());
   EXPECT_TRUE(!entry.file_info().is_directory());
   EXPECT_EQ(updated_md5, entry.file_specific_info().md5());
 
   // Make sure we get the same thing from GetResourceEntryByPath.
   entry.Clear();
   EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->GetResourceEntryByPath(
@@ skipping 16 matching lines @@
   std::string dir3_id;
   EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->GetIdByPath(
       base::FilePath::FromUTF8Unsafe("drive/root/dir1/dir3"), &dir3_id));
 
   // Change the name to dir100 and change the parent to drive/dir1/dir3.
   ResourceEntry dir_entry(entry);
   dir_entry.set_title("dir100");
   dir_entry.set_parent_local_id(dir3_id);
   EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->RefreshEntry(dir_entry));
 
-  EXPECT_EQ("drive/root/dir1/dir3/dir100",
-            resource_metadata_->GetFilePath(dir_id).AsUTF8Unsafe());
+  EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->GetFilePath(dir_id, &path));
+  EXPECT_EQ("drive/root/dir1/dir3/dir100", path.AsUTF8Unsafe());
   entry.Clear();
   EXPECT_EQ(FILE_ERROR_OK,
             resource_metadata_->GetResourceEntryById(dir_id, &entry));
   EXPECT_EQ("dir100", entry.base_name());
   EXPECT_TRUE(entry.file_info().is_directory());
   EXPECT_EQ("id:dir2", entry.resource_id());
 
   // Make sure the children have moved over. Test file6.
   entry.Clear();
   EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->GetResourceEntryByPath(
@@ skipping 40 matching lines @@
             resource_metadata_->RefreshEntry(new_entry));
 }
 
 TEST_F(ResourceMetadataTest, GetSubDirectoriesRecursively) {
   std::set<base::FilePath> sub_directories;
 
   // file9: not a directory, so no children.
   std::string local_id;
   EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->GetIdByPath(
       base::FilePath::FromUTF8Unsafe("drive/root/dir1/dir3/file9"), &local_id));
-  resource_metadata_->GetSubDirectoriesRecursively(local_id, &sub_directories);
+  EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->GetSubDirectoriesRecursively(
+      local_id, &sub_directories));
   EXPECT_TRUE(sub_directories.empty());
 
   // dir2: no child directories.
   EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->GetIdByPath(
       base::FilePath::FromUTF8Unsafe("drive/root/dir2"), &local_id));
-  resource_metadata_->GetSubDirectoriesRecursively(local_id, &sub_directories);
+  EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->GetSubDirectoriesRecursively(
+      local_id, &sub_directories));
   EXPECT_TRUE(sub_directories.empty());
   const std::string dir2_id = local_id;
 
   // dir1: dir3 is the only child
   EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->GetIdByPath(
       base::FilePath::FromUTF8Unsafe("drive/root/dir1"), &local_id));
-  resource_metadata_->GetSubDirectoriesRecursively(local_id, &sub_directories);
+  EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->GetSubDirectoriesRecursively(
+      local_id, &sub_directories));
   EXPECT_EQ(1u, sub_directories.size());
   EXPECT_EQ(1u, sub_directories.count(
       base::FilePath::FromUTF8Unsafe("drive/root/dir1/dir3")));
   sub_directories.clear();
 
   // Add a few more directories to make sure deeper nesting works.
   // dir2/dir100
   // dir2/dir101
   // dir2/dir101/dir102
   // dir2/dir101/dir103
@@ skipping 12 matching lines @@
       CreateDirectoryEntry("dir103", dir101_id), &local_id));
   EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->AddEntry(
       CreateDirectoryEntry("dir104", dir101_id), &local_id));
   EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->AddEntry(
       CreateDirectoryEntry("dir105", local_id), &local_id));
   EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->AddEntry(
       CreateDirectoryEntry("dir106", local_id), &local_id));
   EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->AddEntry(
       CreateDirectoryEntry("dir107", local_id), &local_id));
 
-  resource_metadata_->GetSubDirectoriesRecursively(dir2_id, &sub_directories);
+  EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->GetSubDirectoriesRecursively(
+      dir2_id, &sub_directories));
   EXPECT_EQ(8u, sub_directories.size());
   EXPECT_EQ(1u, sub_directories.count(base::FilePath::FromUTF8Unsafe(
       "drive/root/dir2/dir101")));
   EXPECT_EQ(1u, sub_directories.count(base::FilePath::FromUTF8Unsafe(
       "drive/root/dir2/dir101/dir104")));
   EXPECT_EQ(1u, sub_directories.count(base::FilePath::FromUTF8Unsafe(
       "drive/root/dir2/dir101/dir104/dir105/dir106/dir107")));
 }
 
 TEST_F(ResourceMetadataTest, AddEntry) {
-  base::FilePath drive_file_path;
-
   // Add a file to dir3.
   std::string local_id;
   EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->GetIdByPath(
       base::FilePath::FromUTF8Unsafe("drive/root/dir1/dir3"), &local_id));
   ResourceEntry file_entry = CreateFileEntry("file100", local_id);
   EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->AddEntry(file_entry, &local_id));
-  EXPECT_EQ("drive/root/dir1/dir3/file100",
-            resource_metadata_->GetFilePath(local_id).AsUTF8Unsafe());
+  base::FilePath path;
+  EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->GetFilePath(local_id, &path));
+  EXPECT_EQ("drive/root/dir1/dir3/file100", path.AsUTF8Unsafe());
 
   // Add a directory.
   EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->GetIdByPath(
       base::FilePath::FromUTF8Unsafe("drive/root/dir1"), &local_id));
   ResourceEntry dir_entry = CreateDirectoryEntry("dir101", local_id);
   EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->AddEntry(dir_entry, &local_id));
-  EXPECT_EQ("drive/root/dir1/dir101",
-            resource_metadata_->GetFilePath(local_id).AsUTF8Unsafe());
+  EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->GetFilePath(local_id, &path));
+  EXPECT_EQ("drive/root/dir1/dir101", path.AsUTF8Unsafe());
 
   // Add to an invalid parent.
   ResourceEntry file_entry3 = CreateFileEntry("file103", "id:invalid");
   EXPECT_EQ(FILE_ERROR_NOT_FOUND,
             resource_metadata_->AddEntry(file_entry3, &local_id));
 
   // Add an existing file.
   EXPECT_EQ(FILE_ERROR_EXISTS,
             resource_metadata_->AddEntry(file_entry, &local_id));
 }
@@ skipping 184 matching lines @@
   std::vector<ResourceEntry> entries;
   ASSERT_EQ(FILE_ERROR_OK,
             resource_metadata_->ReadDirectoryByPath(
                 base::FilePath::FromUTF8Unsafe("drive/root"), &entries));
   ASSERT_FALSE(entries.empty());
 
   // Reset.
   EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->Reset());
 
   // change stamp should be reset.
-  EXPECT_EQ(0, resource_metadata_->GetLargestChangestamp());
+  int64 changestamp = 0;
+  EXPECT_EQ(FILE_ERROR_OK,
+            resource_metadata_->GetLargestChangestamp(&changestamp));
+  EXPECT_EQ(0, changestamp);
 
   // root should continue to exist.
   ResourceEntry entry;
   ASSERT_EQ(FILE_ERROR_OK,
             resource_metadata_->GetResourceEntryByPath(
                 base::FilePath::FromUTF8Unsafe("drive"), &entry));
   EXPECT_EQ("drive", entry.base_name());
   ASSERT_TRUE(entry.file_info().is_directory());
   EXPECT_EQ(util::kDriveGrandRootLocalId, entry.local_id());
 
@@ skipping 11 matching lines @@
 
   // The "trash" directory should be empty.
   ASSERT_EQ(FILE_ERROR_OK,
             resource_metadata_->ReadDirectoryByPath(
                 base::FilePath::FromUTF8Unsafe("drive/trash"), &entries));
   EXPECT_TRUE(entries.empty());
 }
 
 }  // namespace internal
 }  // namespace drive