chrome/browser/chromeos/drive/file_system/copy_operation_unittest.cc - Issue 380993002: Upstream RunBlockingPoolTask().

Unified Diff: chrome/browser/chromeos/drive/file_system/copy_operation_unittest.cc

Issue 380993002: Upstream RunBlockingPoolTask(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixed. Created 6 years, 5 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

« no previous file with comments | « chrome/browser/chromeos/drive/drive_integration_service_unittest.cc ('k') | chrome/browser/chromeos/drive/file_system/create_directory_operation_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/drive/file_system/copy_operation_unittest.cc

diff --git a/chrome/browser/chromeos/drive/file_system/copy_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/copy_operation_unittest.cc

index ed80ee96beefaba265cdec54b1e1a5a20da5f7e4..85e6056702364b54613b1812805c0d207e4b95a8 100644

--- a/chrome/browser/chromeos/drive/file_system/copy_operation_unittest.cc

+++ b/chrome/browser/chromeos/drive/file_system/copy_operation_unittest.cc

@@ -12,6 +12,7 @@

#include "chrome/browser/chromeos/drive/file_system_util.h"

#include "chrome/browser/drive/drive_api_util.h"

#include "chrome/browser/drive/fake_drive_service.h"

+#include "content/public/test/test_utils.h"

#include "google_apis/drive/drive_api_parser.h"

#include "google_apis/drive/test_util.h"

#include "testing/gtest/include/gtest/gtest.h"

@@ -54,7 +55,7 @@ TEST_F(CopyOperationTest, TransferFileFromLocalToRemote_RegularFile) {

local_src_path,

remote_dest_path,

google_apis::test_util::CreateCopyResultCallback(&error));

- test_util::RunBlockingPoolTask();

+ content::RunAllBlockingPoolTasksUntilIdle();

EXPECT_EQ(FILE_ERROR_OK, error);

// TransferFileFromLocalToRemote stores a copy of the local file in the cache,

@@ -86,7 +87,7 @@ TEST_F(CopyOperationTest, TransferFileFromLocalToRemote_Overwrite) {

local_src_path,

remote_dest_path,

google_apis::test_util::CreateCopyResultCallback(&error));

- test_util::RunBlockingPoolTask();

+ content::RunAllBlockingPoolTasksUntilIdle();

EXPECT_EQ(FILE_ERROR_OK, error);

// TransferFileFromLocalToRemote stores a copy of the local file in the cache,

@@ -123,7 +124,7 @@ TEST_F(CopyOperationTest,

local_src_path,

remote_dest_path,

google_apis::test_util::CreateCopyResultCallback(&error));

- test_util::RunBlockingPoolTask();

+ content::RunAllBlockingPoolTasksUntilIdle();

EXPECT_EQ(FILE_ERROR_OK, error);

EXPECT_EQ(FILE_ERROR_OK, GetLocalResourceEntry(remote_dest_path, &entry));

@@ -156,7 +157,7 @@ TEST_F(CopyOperationTest, TransferFileFromLocalToRemote_OrphanHostedDocument) {

local_src_path,

remote_dest_path,

google_apis::test_util::CreateCopyResultCallback(&error));

- test_util::RunBlockingPoolTask();

+ content::RunAllBlockingPoolTasksUntilIdle();

EXPECT_EQ(FILE_ERROR_OK, error);

EXPECT_EQ(FILE_ERROR_OK, GetLocalResourceEntry(remote_dest_path, &entry));

@@ -181,7 +182,7 @@ TEST_F(CopyOperationTest, TransferFileFromLocalToRemote_NewHostedDocument) {

"application/vnd.google-apps.document", "", "", "title", true,

google_apis::test_util::CreateCopyResultCallback(&gdata_error,

&new_gdoc_entry));

- test_util::RunBlockingPoolTask();

+ content::RunAllBlockingPoolTasksUntilIdle();

ASSERT_EQ(google_apis::HTTP_CREATED, gdata_error);

// Prepare a local file, which is a json file of the added hosted document.

@@ -200,7 +201,7 @@ TEST_F(CopyOperationTest, TransferFileFromLocalToRemote_NewHostedDocument) {

local_src_path,

remote_dest_path,

google_apis::test_util::CreateCopyResultCallback(&error));

- test_util::RunBlockingPoolTask();

+ content::RunAllBlockingPoolTasksUntilIdle();

EXPECT_EQ(FILE_ERROR_OK, error);

EXPECT_EQ(FILE_ERROR_OK, GetLocalResourceEntry(remote_dest_path, &entry));

@@ -223,7 +224,7 @@ TEST_F(CopyOperationTest, CopyNotExistingFile) {

dest_path,

false,

google_apis::test_util::CreateCopyResultCallback(&error));

- test_util::RunBlockingPoolTask();

+ content::RunAllBlockingPoolTasksUntilIdle();

EXPECT_EQ(FILE_ERROR_NOT_FOUND, error);

EXPECT_EQ(FILE_ERROR_NOT_FOUND, GetLocalResourceEntry(src_path, &entry));

@@ -245,7 +246,7 @@ TEST_F(CopyOperationTest, CopyFileToNonExistingDirectory) {

dest_path,

false,

google_apis::test_util::CreateCopyResultCallback(&error));

- test_util::RunBlockingPoolTask();

+ content::RunAllBlockingPoolTasksUntilIdle();

EXPECT_EQ(FILE_ERROR_NOT_FOUND, error);

EXPECT_EQ(FILE_ERROR_OK, GetLocalResourceEntry(src_path, &entry));

@@ -271,7 +272,7 @@ TEST_F(CopyOperationTest, CopyFileToInvalidPath) {

dest_path,

false,

google_apis::test_util::CreateCopyResultCallback(&error));

- test_util::RunBlockingPoolTask();

+ content::RunAllBlockingPoolTasksUntilIdle();

EXPECT_EQ(FILE_ERROR_NOT_A_DIRECTORY, error);

EXPECT_EQ(FILE_ERROR_OK, GetLocalResourceEntry(src_path, &entry));

@@ -303,7 +304,7 @@ TEST_F(CopyOperationTest, CopyDirtyFile) {

temp_file,

internal::FileCache::FILE_OPERATION_MOVE),

google_apis::test_util::CreateCopyResultCallback(&error));

- test_util::RunBlockingPoolTask();

+ content::RunAllBlockingPoolTasksUntilIdle();

EXPECT_EQ(FILE_ERROR_OK, error);

// Copy.

@@ -311,7 +312,7 @@ TEST_F(CopyOperationTest, CopyDirtyFile) {

dest_path,

false,

google_apis::test_util::CreateCopyResultCallback(&error));

- test_util::RunBlockingPoolTask();

+ content::RunAllBlockingPoolTasksUntilIdle();

EXPECT_EQ(FILE_ERROR_OK, error);

ResourceEntry dest_entry;

@@ -336,7 +337,7 @@ TEST_F(CopyOperationTest, CopyDirtyFile) {

dest_entry.local_id(),

&cache_file_path),

google_apis::test_util::CreateCopyResultCallback(&error));

- test_util::RunBlockingPoolTask();

+ content::RunAllBlockingPoolTasksUntilIdle();

EXPECT_EQ(FILE_ERROR_OK, error);

std::string copied_contents;

@@ -357,7 +358,7 @@ TEST_F(CopyOperationTest, CopyFileOverwriteFile) {

dest_path,

false,

google_apis::test_util::CreateCopyResultCallback(&error));

- test_util::RunBlockingPoolTask();

+ content::RunAllBlockingPoolTasksUntilIdle();

EXPECT_EQ(FILE_ERROR_OK, error);

ResourceEntry new_dest_entry;

@@ -378,7 +379,7 @@ TEST_F(CopyOperationTest, CopyFileOverwriteDirectory) {

dest_path,

false,

google_apis::test_util::CreateCopyResultCallback(&error));

- test_util::RunBlockingPoolTask();

+ content::RunAllBlockingPoolTasksUntilIdle();

EXPECT_EQ(FILE_ERROR_INVALID_OPERATION, error);

}

@@ -397,7 +398,7 @@ TEST_F(CopyOperationTest, CopyDirectory) {

dest_path,

false,

google_apis::test_util::CreateCopyResultCallback(&error));

- test_util::RunBlockingPoolTask();

+ content::RunAllBlockingPoolTasksUntilIdle();

EXPECT_EQ(FILE_ERROR_NOT_A_FILE, error);

}

@@ -415,7 +416,7 @@ TEST_F(CopyOperationTest, PreserveLastModified) {

dest_path,

true, // Preserve last modified.

google_apis::test_util::CreateCopyResultCallback(&error));

- test_util::RunBlockingPoolTask();

+ content::RunAllBlockingPoolTasksUntilIdle();

EXPECT_EQ(FILE_ERROR_OK, error);

ResourceEntry entry2;