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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/google_apis/fake_drive_service_unittest.cc

Issue 12207075: Split InitiateUpload method into two. (Closed) Base URL: http://git.chromium.org/chromium/src.git@b148632_extract_initiate_upload_operation_base
Patch Set: Created 7 years, 10 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
Download patch
« no previous file with comments | « chrome/browser/google_apis/fake_drive_service.cc ('k') | chrome/browser/google_apis/gdata_wapi_service.h » ('j') | chrome/browser/google_apis/gdata_wapi_service.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/google_apis/fake_drive_service_unittest.cc
diff --git a/chrome/browser/google_apis/fake_drive_service_unittest.cc b/chrome/browser/google_apis/fake_drive_service_unittest.cc
index 9c0998c79710c578eff4e313b3d80dbfc08e1e6e..c2178ec3b43fc83e62bcca6d11cb75c9d92cf0a2 100644
--- a/chrome/browser/google_apis/fake_drive_service_unittest.cc
+++ b/chrome/browser/google_apis/fake_drive_service_unittest.cc
@@ -1039,21 +1039,18 @@ TEST_F(FakeDriveServiceTest, AddNewDirectory_Offline) {
EXPECT_FALSE(resource_entry);
}
-TEST_F(FakeDriveServiceTest, InitiateUpload_Offline) {
+TEST_F(FakeDriveServiceTest, InitiateUploadNewFile_Offline) {
ASSERT_TRUE(fake_service_.LoadResourceListForWapi("gdata/root_feed.json"));
fake_service_.set_offline(true);
GDataErrorCode error = GDATA_OTHER_ERROR;
GURL upload_location;
- fake_service_.InitiateUpload(
- InitiateUploadParams(
- UPLOAD_NEW_FILE,
- "new file.foo",
- "test/foo",
- 13,
- GURL("https://1_folder_resumable_create_media_link"),
- FilePath(FILE_PATH_LITERAL("drive/Directory 1")),
- "etag_ignored"),
+ fake_service_.InitiateUploadNewFile(
+ FilePath(FILE_PATH_LITERAL("drive/Directory 1")),
+ "test/foo",
+ 13,
+ GURL("https://1_folder_resumable_create_media_link"),
+ "new file.foo",
base::Bind(&test_util::CopyResultsFromInitiateUploadCallback,
&error,
&upload_location));
@@ -1063,20 +1060,17 @@ TEST_F(FakeDriveServiceTest, InitiateUpload_Offline) {
EXPECT_TRUE(upload_location.is_empty());
}
-TEST_F(FakeDriveServiceTest, InitiateUpload_NotFound) {
+TEST_F(FakeDriveServiceTest, InitiateUploadNewFile_NotFound) {
ASSERT_TRUE(fake_service_.LoadResourceListForWapi("gdata/root_feed.json"));
GDataErrorCode error = GDATA_OTHER_ERROR;
GURL upload_location;
- fake_service_.InitiateUpload(
- InitiateUploadParams(
- UPLOAD_NEW_FILE,
- "new file.foo",
- "test/foo",
- 13,
- GURL("https://non_existent"),
- FilePath(FILE_PATH_LITERAL("drive/Directory 1")),
- "etag_ignored"),
+ fake_service_.InitiateUploadNewFile(
+ FilePath(FILE_PATH_LITERAL("drive/Directory 1")),
+ "test/foo",
+ 13,
+ GURL("https://non_existent"),
+ "new file.foo",
base::Bind(&test_util::CopyResultsFromInitiateUploadCallback,
&error,
&upload_location));
@@ -1086,20 +1080,17 @@ TEST_F(FakeDriveServiceTest, InitiateUpload_NotFound) {
EXPECT_TRUE(upload_location.is_empty());
}
-TEST_F(FakeDriveServiceTest, InitiateUpload_NewFile) {
+TEST_F(FakeDriveServiceTest, InitiateUploadNewFile) {
ASSERT_TRUE(fake_service_.LoadResourceListForWapi("gdata/root_feed.json"));
GDataErrorCode error = GDATA_OTHER_ERROR;
GURL upload_location;
- fake_service_.InitiateUpload(
- InitiateUploadParams(
- UPLOAD_NEW_FILE,
- "new file.foo",
- "test/foo",
- 13,
- GURL("https://1_folder_resumable_create_media_link"),
- FilePath(FILE_PATH_LITERAL("drive/Directory 1")),
- "etag_ignored"),
+ fake_service_.InitiateUploadNewFile(
+ FilePath(FILE_PATH_LITERAL("drive/Directory 1")),
+ "test/foo",
+ 13,
+ GURL("https://1_folder_resumable_create_media_link"),
+ "new file.foo",
base::Bind(&test_util::CopyResultsFromInitiateUploadCallback,
&error,
&upload_location));
@@ -1111,20 +1102,58 @@ TEST_F(FakeDriveServiceTest, InitiateUpload_NewFile) {
upload_location);
}
-TEST_F(FakeDriveServiceTest, InitiateUpload_WrongETag) {
+TEST_F(FakeDriveServiceTest, InitiateUploadExistingFile_Offline) {
+ ASSERT_TRUE(fake_service_.LoadResourceListForWapi("gdata/root_feed.json"));
+ fake_service_.set_offline(true);
+
+ GDataErrorCode error = GDATA_OTHER_ERROR;
+ GURL upload_location;
+ fake_service_.InitiateUploadExistingFile(
+ FilePath(FILE_PATH_LITERAL("drive/Directory 1")),
+ "test/foo",
+ 13,
+ GURL("https://1_folder_resumable_create_media_link"),
+ "", // etag
+ base::Bind(&test_util::CopyResultsFromInitiateUploadCallback,
+ &error,
+ &upload_location));
+ message_loop_.RunUntilIdle();
+
+ EXPECT_EQ(GDATA_NO_CONNECTION, error);
+ EXPECT_TRUE(upload_location.is_empty());
+}
+
+TEST_F(FakeDriveServiceTest, InitiateUploadExistingFile_NotFound) {
+ ASSERT_TRUE(fake_service_.LoadResourceListForWapi("gdata/root_feed.json"));
+
+ GDataErrorCode error = GDATA_OTHER_ERROR;
+ GURL upload_location;
+ fake_service_.InitiateUploadExistingFile(
+ FilePath(FILE_PATH_LITERAL("drive/Directory 1")),
+ "test/foo",
+ 13,
+ GURL("https://non_existent"),
+ "", // etag
+ base::Bind(&test_util::CopyResultsFromInitiateUploadCallback,
+ &error,
+ &upload_location));
+ message_loop_.RunUntilIdle();
+
+ EXPECT_EQ(HTTP_NOT_FOUND, error);
+ EXPECT_TRUE(upload_location.is_empty());
+}
+
+TEST_F(FakeDriveServiceTest, InitiateUploadExistingFile_WrongETag) {
ASSERT_TRUE(fake_service_.LoadResourceListForWapi("gdata/root_feed.json"));
GDataErrorCode error = GDATA_OTHER_ERROR;
GURL upload_location;
- fake_service_.InitiateUpload(
- InitiateUploadParams(
- UPLOAD_EXISTING_FILE,
- "name_ignored",
- "text/plain",
- 13,
- GURL("https://2_file_link_resumable_create_media"),
- FilePath(FILE_PATH_LITERAL("drive/File 1.txt")),
- "invalid_etag"),
+ fake_service_.InitiateUploadExistingFile(
+ FilePath(FILE_PATH_LITERAL("drive/File 1.txt")),
+ "text/plain",
+ 13,
+ GURL("https://2_file_link_resumable_create_media"),
+ "invalid_etag",
base::Bind(&test_util::CopyResultsFromInitiateUploadCallback,
&error,
&upload_location));
@@ -1139,15 +1168,12 @@ TEST_F(FakeDriveServiceTest, InitiateUpload_ExistingFile) {
GDataErrorCode error = GDATA_OTHER_ERROR;
GURL upload_location;
- fake_service_.InitiateUpload(
- InitiateUploadParams(
- UPLOAD_EXISTING_FILE,
- "name_ignored",
- "text/plain",
- 13,
- GURL("https://2_file_link_resumable_create_media"),
- FilePath(FILE_PATH_LITERAL("drive/File 1.txt")),
- "\"HhMOFgxXHit7ImBr\""),
+ fake_service_.InitiateUploadExistingFile(
+ FilePath(FILE_PATH_LITERAL("drive/File 1.txt")),
+ "text/plain",
+ 13,
+ GURL("https://2_file_link_resumable_create_media"),
+ "\"HhMOFgxXHit7ImBr\"",
base::Bind(&test_util::CopyResultsFromInitiateUploadCallback,
&error,
&upload_location));
@@ -1163,15 +1189,12 @@ TEST_F(FakeDriveServiceTest, ResumeUpload_Offline) {
GDataErrorCode error = GDATA_OTHER_ERROR;
GURL upload_location;
- fake_service_.InitiateUpload(
- InitiateUploadParams(
- UPLOAD_NEW_FILE,
- "new file.foo",
- "test/foo",
- 15,
- GURL("https://1_folder_resumable_create_media_link"),
- FilePath(FILE_PATH_LITERAL("drive/Directory 1/new file.foo")),
- "etag_ignored"),
+ fake_service_.InitiateUploadNewFile(
+ FilePath(FILE_PATH_LITERAL("drive/Directory 1/new file.foo")),
+ "test/foo",
+ 15,
+ GURL("https://1_folder_resumable_create_media_link"),
+ "new file.foo",
base::Bind(&test_util::CopyResultsFromInitiateUploadCallback,
&error,
&upload_location));
@@ -1206,15 +1229,12 @@ TEST_F(FakeDriveServiceTest, ResumeUpload_NotFound) {
GDataErrorCode error = GDATA_OTHER_ERROR;
GURL upload_location;
- fake_service_.InitiateUpload(
- InitiateUploadParams(
- UPLOAD_NEW_FILE,
- "new file.foo",
- "test/foo",
- 15,
- GURL("https://1_folder_resumable_create_media_link"),
- FilePath(FILE_PATH_LITERAL("drive/Directory 1/new file.foo")),
- "etag_ignored"),
+ fake_service_.InitiateUploadNewFile(
+ FilePath(FILE_PATH_LITERAL("drive/Directory 1/new file.foo")),
+ "test/foo",
+ 15,
+ GURL("https://1_folder_resumable_create_media_link"),
+ "new file.foo",
base::Bind(&test_util::CopyResultsFromInitiateUploadCallback,
&error,
&upload_location));
@@ -1244,15 +1264,12 @@ TEST_F(FakeDriveServiceTest, ResumeUpload_ExistingFile) {
GDataErrorCode error = GDATA_OTHER_ERROR;
GURL upload_location;
- fake_service_.InitiateUpload(
- InitiateUploadParams(
- UPLOAD_EXISTING_FILE,
- "name_ignored",
- "text/plain",
- 15,
- GURL("https://2_file_link_resumable_create_media"),
- FilePath(FILE_PATH_LITERAL("drive/File 1.txt")),
- "\"HhMOFgxXHit7ImBr\""),
+ fake_service_.InitiateUploadExistingFile(
+ FilePath(FILE_PATH_LITERAL("drive/File 1.txt")),
+ "text/plain",
+ 15,
+ GURL("https://2_file_link_resumable_create_media"),
+ "\"HhMOFgxXHit7ImBr\"",
base::Bind(&test_util::CopyResultsFromInitiateUploadCallback,
&error,
&upload_location));
@@ -1298,15 +1315,12 @@ TEST_F(FakeDriveServiceTest, ResumeUpload_NewFile) {
GDataErrorCode error = GDATA_OTHER_ERROR;
GURL upload_location;
- fake_service_.InitiateUpload(
- InitiateUploadParams(
- UPLOAD_NEW_FILE,
- "new file.foo",
- "test/foo",
- 15,
- GURL("https://1_folder_resumable_create_media_link"),
- FilePath(FILE_PATH_LITERAL("drive/Directory 1/new file.foo")),
- "etag_ignored"),
+ fake_service_.InitiateUploadNewFile(
+ FilePath(FILE_PATH_LITERAL("drive/Directory 1/new file.foo")),
+ "test/foo",
+ 15,
+ GURL("https://1_folder_resumable_create_media_link"),
+ "new file.foo",
base::Bind(&test_util::CopyResultsFromInitiateUploadCallback,
&error,
&upload_location));
« no previous file with comments | « chrome/browser/google_apis/fake_drive_service.cc ('k') | chrome/browser/google_apis/gdata_wapi_service.h » ('j') | chrome/browser/google_apis/gdata_wapi_service.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698