Skip to content

GitLab

T
tangled
Commit 56192681 authored by hidehiko@chromium.org's avatar hidehiko@chromium.org
Browse files
Options

Eliminate small CopyResultFromXxxCallback families in drive_test_util. 

Replace the methods with CreateCopyResultCallback and RunBlockingPoolTask.

BUG=180569
TEST=Ran unit_tests --gtest_filter=DriveFileSystem*:SearchMetadata*


Review URL: https://chromiumcodereview.appspot.com/12833019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190450 0039d316-1c4b-4281-b951-d872f2087c98
parent f73f8813
Show whitespace changes
Inline Side-by-side
Showing with 26 additions and 117 deletions
chrome/browser/chromeos/drive/drive_file_system_unittest.cc
View file @ 56192681
...@@ -2081,7 +2081,7 @@ TEST_F(DriveFileSystemTest, GetAvailableSpace) { ...@@ -2081,7 +2081,7 @@ TEST_F(DriveFileSystemTest, GetAvailableSpace) {
int64 bytes_total; int64 bytes_total;
int64 bytes_used; int64 bytes_used;
file_system_->GetAvailableSpace( file_system_->GetAvailableSpace(
base::Bind(&test_util::CopyResultsFromGetAvailableSpaceCallback, google_apis::test_util::CreateCopyResultCallback(
&error, &bytes_total, &bytes_used)); &error, &bytes_total, &bytes_used));
google_apis::test_util::RunBlockingPoolTask(); google_apis::test_util::RunBlockingPoolTask();
EXPECT_EQ(GG_LONGLONG(6789012345), bytes_used); EXPECT_EQ(GG_LONGLONG(6789012345), bytes_used);
...@@ -2131,9 +2131,8 @@ TEST_F(DriveFileSystemTest, OpenAndCloseFile) { ...@@ -2131,9 +2131,8 @@ TEST_F(DriveFileSystemTest, OpenAndCloseFile) {
base::FilePath file_path; base::FilePath file_path;
file_system_->OpenFile( file_system_->OpenFile(
kFileInRoot, kFileInRoot,
base::Bind(&test_util::CopyResultsFromOpenFileCallbackAndQuit, google_apis::test_util::CreateCopyResultCallback(&error, &file_path));
&error, &file_path)); google_apis::test_util::RunBlockingPoolTask();
message_loop_.Run();
const base::FilePath opened_file_path = file_path; const base::FilePath opened_file_path = file_path;
// Verify that the file was properly opened. // Verify that the file was properly opened.
...@@ -2142,9 +2141,8 @@ TEST_F(DriveFileSystemTest, OpenAndCloseFile) { ...@@ -2142,9 +2141,8 @@ TEST_F(DriveFileSystemTest, OpenAndCloseFile) {
// Try to open the already opened file. // Try to open the already opened file.
file_system_->OpenFile( file_system_->OpenFile(
kFileInRoot, kFileInRoot,
base::Bind(&test_util::CopyResultsFromOpenFileCallbackAndQuit, google_apis::test_util::CreateCopyResultCallback(&error, &file_path));
&error, &file_path)); google_apis::test_util::RunBlockingPoolTask();
message_loop_.Run();
// It must fail. // It must fail.
EXPECT_EQ(DRIVE_FILE_ERROR_IN_USE, error); EXPECT_EQ(DRIVE_FILE_ERROR_IN_USE, error);
...@@ -2174,9 +2172,8 @@ TEST_F(DriveFileSystemTest, OpenAndCloseFile) { ...@@ -2174,9 +2172,8 @@ TEST_F(DriveFileSystemTest, OpenAndCloseFile) {
// Close kFileInRoot ("drive/File 1.txt"). // Close kFileInRoot ("drive/File 1.txt").
file_system_->CloseFile( file_system_->CloseFile(
kFileInRoot, kFileInRoot,
base::Bind(&test_util::CopyResultsFromCloseFileCallbackAndQuit, google_apis::test_util::CreateCopyResultCallback(&error));
&error)); google_apis::test_util::RunBlockingPoolTask();
message_loop_.Run();
// Verify that the file was properly closed. // Verify that the file was properly closed.
EXPECT_EQ(DRIVE_FILE_OK, error); EXPECT_EQ(DRIVE_FILE_OK, error);
...@@ -2191,9 +2188,8 @@ TEST_F(DriveFileSystemTest, OpenAndCloseFile) { ...@@ -2191,9 +2188,8 @@ TEST_F(DriveFileSystemTest, OpenAndCloseFile) {
// Try to close the same file twice. // Try to close the same file twice.
file_system_->CloseFile( file_system_->CloseFile(
kFileInRoot, kFileInRoot,
base::Bind(&test_util::CopyResultsFromCloseFileCallbackAndQuit, google_apis::test_util::CreateCopyResultCallback(&error));
&error)); google_apis::test_util::RunBlockingPoolTask();
message_loop_.Run();
// It must fail. // It must fail.
EXPECT_EQ(DRIVE_FILE_ERROR_NOT_FOUND, error); EXPECT_EQ(DRIVE_FILE_ERROR_NOT_FOUND, error);
......
chrome/browser/chromeos/drive/drive_test_util.cc
View file @ 56192681
...@@ -37,47 +37,6 @@ bool CacheStatesEqual(const DriveCacheEntry& a, const DriveCacheEntry& b) { ...@@ -37,47 +37,6 @@ bool CacheStatesEqual(const DriveCacheEntry& a, const DriveCacheEntry& b) {
a.is_persistent() == b.is_persistent()); a.is_persistent() == b.is_persistent());
} }
void CopyResultsFromGetAvailableSpaceCallback(DriveFileError* out_error,
int64* out_bytes_total,
int64* out_bytes_used,
DriveFileError error,
int64 bytes_total,
int64 bytes_used) {
DCHECK(out_error);
DCHECK(out_bytes_total);
DCHECK(out_bytes_used);
*out_error = error;
*out_bytes_total = bytes_total;
*out_bytes_used = bytes_used;
}
void CopyResultsFromSearchMetadataCallback(
DriveFileError* out_error,
scoped_ptr<MetadataSearchResultVector>* out_result,
DriveFileError error,
scoped_ptr<MetadataSearchResultVector> result) {
DCHECK(out_error);
DCHECK(out_result);
*out_error = error;
*out_result = result.Pass();
}
void CopyResultsFromOpenFileCallbackAndQuit(DriveFileError* out_error,
base::FilePath* out_file_path,
DriveFileError error,
const base::FilePath& file_path) {
*out_error = error;
*out_file_path = file_path;
MessageLoop::current()->Quit();
}
void CopyResultsFromCloseFileCallbackAndQuit(DriveFileError* out_error,
DriveFileError error) {
*out_error = error;
MessageLoop::current()->Quit();
}
bool LoadChangeFeed(const std::string& relative_path, bool LoadChangeFeed(const std::string& relative_path,
ChangeListLoader* change_list_loader, ChangeListLoader* change_list_loader,
bool is_delta_feed, bool is_delta_feed,
......
chrome/browser/chromeos/drive/drive_test_util.h
View file @ 56192681
...@@ -44,36 +44,6 @@ DriveCacheEntry ToCacheEntry(int cache_state); ...@@ -44,36 +44,6 @@ DriveCacheEntry ToCacheEntry(int cache_state);
// Returns true if the cache state of the given two cache entries are equal. // Returns true if the cache state of the given two cache entries are equal.
bool CacheStatesEqual(const DriveCacheEntry& a, const DriveCacheEntry& b); bool CacheStatesEqual(const DriveCacheEntry& a, const DriveCacheEntry& b);
// Copies results from DriveFileSystem methods. Used to run asynchronous
// functions that take GetAvailableSpaceCallback from tests.
void CopyResultsFromGetAvailableSpaceCallback(DriveFileError* out_error,
int64* out_bytes_total,
int64* out_bytes_used,
DriveFileError error,
int64 bytes_total,
int64 bytes_used);
// Copies results from SearchMetadataCallback.
void CopyResultsFromSearchMetadataCallback(
DriveFileError* out_error,
scoped_ptr<MetadataSearchResultVector>* out_result,
DriveFileError error,
scoped_ptr<MetadataSearchResultVector> result);
// Copies the results from DriveFileSystem methods and stops the message loop
// of the current thread. Used to run asynchronous function that take
// OpenFileCallback.
void CopyResultsFromOpenFileCallbackAndQuit(DriveFileError* out_error,
base::FilePath* out_file_path,
DriveFileError error,
const base::FilePath& file_path);
// Copies the results from DriveFileSystem methods and stops the message loop
// of the current thread. Used to run asynchronous function that take
// CloseFileCallback.
void CopyResultsFromCloseFileCallbackAndQuit(DriveFileError* out_error,
DriveFileError error);
// Loads a test json file as root ("/drive") element from a test file stored // Loads a test json file as root ("/drive") element from a test file stored
// under chrome/test/data/chromeos. Returns true on success. // under chrome/test/data/chromeos. Returns true on success.
bool LoadChangeFeed(const std::string& relative_path, bool LoadChangeFeed(const std::string& relative_path,
......
chrome/browser/chromeos/drive/search_metadata_unittest.cc
View file @ 56192681
...@@ -107,10 +107,8 @@ TEST_F(SearchMetadataTest, SearchMetadata_ZeroMatches) { ...@@ -107,10 +107,8 @@ TEST_F(SearchMetadataTest, SearchMetadata_ZeroMatches) {
SearchMetadata(file_system_.get(), SearchMetadata(file_system_.get(),
"NonExistent", "NonExistent",
kDefaultAtMostNumMatches, kDefaultAtMostNumMatches,
base::Bind(&test_util::CopyResultsFromSearchMetadataCallback, google_apis::test_util::CreateCopyResultCallback(
&error, &error, &result));
&result));
google_apis::test_util::RunBlockingPoolTask(); google_apis::test_util::RunBlockingPoolTask();
EXPECT_EQ(DRIVE_FILE_OK, error); EXPECT_EQ(DRIVE_FILE_OK, error);
ASSERT_EQ(0U, result->size()); ASSERT_EQ(0U, result->size());
...@@ -123,10 +121,8 @@ TEST_F(SearchMetadataTest, SearchMetadata_RegularFile) { ...@@ -123,10 +121,8 @@ TEST_F(SearchMetadataTest, SearchMetadata_RegularFile) {
SearchMetadata(file_system_.get(), SearchMetadata(file_system_.get(),
"SubDirectory File 1.txt", "SubDirectory File 1.txt",
kDefaultAtMostNumMatches, kDefaultAtMostNumMatches,
base::Bind(&test_util::CopyResultsFromSearchMetadataCallback, google_apis::test_util::CreateCopyResultCallback(
&error, &error, &result));
&result));
google_apis::test_util::RunBlockingPoolTask(); google_apis::test_util::RunBlockingPoolTask();
EXPECT_EQ(DRIVE_FILE_OK, error); EXPECT_EQ(DRIVE_FILE_OK, error);
ASSERT_EQ(1U, result->size()); ASSERT_EQ(1U, result->size());
...@@ -144,10 +140,8 @@ TEST_F(SearchMetadataTest, SearchMetadata_CaseInsensitiveSearch) { ...@@ -144,10 +140,8 @@ TEST_F(SearchMetadataTest, SearchMetadata_CaseInsensitiveSearch) {
SearchMetadata(file_system_.get(), SearchMetadata(file_system_.get(),
"subdirectory file 1.txt", "subdirectory file 1.txt",
kDefaultAtMostNumMatches, kDefaultAtMostNumMatches,
base::Bind(&test_util::CopyResultsFromSearchMetadataCallback, google_apis::test_util::CreateCopyResultCallback(
&error, &error, &result));
&result));
google_apis::test_util::RunBlockingPoolTask(); google_apis::test_util::RunBlockingPoolTask();
EXPECT_EQ(DRIVE_FILE_OK, error); EXPECT_EQ(DRIVE_FILE_OK, error);
ASSERT_EQ(1U, result->size()); ASSERT_EQ(1U, result->size());
...@@ -162,10 +156,8 @@ TEST_F(SearchMetadataTest, SearchMetadata_RegularFiles) { ...@@ -162,10 +156,8 @@ TEST_F(SearchMetadataTest, SearchMetadata_RegularFiles) {
SearchMetadata(file_system_.get(), SearchMetadata(file_system_.get(),
"SubDir", "SubDir",
kDefaultAtMostNumMatches, kDefaultAtMostNumMatches,
base::Bind(&test_util::CopyResultsFromSearchMetadataCallback, google_apis::test_util::CreateCopyResultCallback(
&error, &error, &result));
&result));
google_apis::test_util::RunBlockingPoolTask(); google_apis::test_util::RunBlockingPoolTask();
EXPECT_EQ(DRIVE_FILE_OK, error); EXPECT_EQ(DRIVE_FILE_OK, error);
ASSERT_EQ(2U, result->size()); ASSERT_EQ(2U, result->size());
...@@ -194,10 +186,8 @@ TEST_F(SearchMetadataTest, SearchMetadata_AtMostOneFile) { ...@@ -194,10 +186,8 @@ TEST_F(SearchMetadataTest, SearchMetadata_AtMostOneFile) {
SearchMetadata(file_system_.get(), SearchMetadata(file_system_.get(),
"SubDir", "SubDir",
1, // at_most_num_matches 1, // at_most_num_matches
base::Bind(&test_util::CopyResultsFromSearchMetadataCallback, google_apis::test_util::CreateCopyResultCallback(
&error, &error, &result));
&result));
google_apis::test_util::RunBlockingPoolTask(); google_apis::test_util::RunBlockingPoolTask();
EXPECT_EQ(DRIVE_FILE_OK, error); EXPECT_EQ(DRIVE_FILE_OK, error);
ASSERT_EQ(1U, result->size()); ASSERT_EQ(1U, result->size());
...@@ -214,10 +204,8 @@ TEST_F(SearchMetadataTest, SearchMetadata_Directory) { ...@@ -214,10 +204,8 @@ TEST_F(SearchMetadataTest, SearchMetadata_Directory) {
SearchMetadata(file_system_.get(), SearchMetadata(file_system_.get(),
"Directory 1", "Directory 1",
kDefaultAtMostNumMatches, kDefaultAtMostNumMatches,
base::Bind(&test_util::CopyResultsFromSearchMetadataCallback, google_apis::test_util::CreateCopyResultCallback(
&error, &error, &result));
&result));
google_apis::test_util::RunBlockingPoolTask(); google_apis::test_util::RunBlockingPoolTask();
EXPECT_EQ(DRIVE_FILE_OK, error); EXPECT_EQ(DRIVE_FILE_OK, error);
ASSERT_EQ(1U, result->size()); ASSERT_EQ(1U, result->size());
...@@ -233,10 +221,8 @@ TEST_F(SearchMetadataTest, SearchMetadata_HostedDocument) { ...@@ -233,10 +221,8 @@ TEST_F(SearchMetadataTest, SearchMetadata_HostedDocument) {
SearchMetadata(file_system_.get(), SearchMetadata(file_system_.get(),
"Document", "Document",
kDefaultAtMostNumMatches, kDefaultAtMostNumMatches,
base::Bind(&test_util::CopyResultsFromSearchMetadataCallback, google_apis::test_util::CreateCopyResultCallback(
&error, &error, &result));
&result));
google_apis::test_util::RunBlockingPoolTask(); google_apis::test_util::RunBlockingPoolTask();
EXPECT_EQ(DRIVE_FILE_OK, error); EXPECT_EQ(DRIVE_FILE_OK, error);
ASSERT_EQ(1U, result->size()); ASSERT_EQ(1U, result->size());
...@@ -257,10 +243,8 @@ TEST_F(SearchMetadataTest, SearchMetadata_HideHostedDocument) { ...@@ -257,10 +243,8 @@ TEST_F(SearchMetadataTest, SearchMetadata_HideHostedDocument) {
SearchMetadata(file_system_.get(), SearchMetadata(file_system_.get(),
"Document", "Document",
kDefaultAtMostNumMatches, kDefaultAtMostNumMatches,
base::Bind(&test_util::CopyResultsFromSearchMetadataCallback, google_apis::test_util::CreateCopyResultCallback(
&error, &error, &result));
&result));
google_apis::test_util::RunBlockingPoolTask(); google_apis::test_util::RunBlockingPoolTask();
EXPECT_EQ(DRIVE_FILE_OK, error); EXPECT_EQ(DRIVE_FILE_OK, error);
ASSERT_EQ(0U, result->size()); ASSERT_EQ(0U, result->size());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment