Split InitiateUpload method into two.

chrome/browser/google_apis/fake_drive_service_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/google_apis/fake_drive_service.h"
 
 #include <string>
 
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 1021 matching lines @@
       "new directory",
       base::Bind(&test_util::CopyResultsFromGetResourceEntryCallback,
                  &error,
                  &resource_entry));
   message_loop_.RunUntilIdle();
 
   EXPECT_EQ(GDATA_NO_CONNECTION, error);
   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));
   message_loop_.RunUntilIdle();
 
   EXPECT_EQ(GDATA_NO_CONNECTION, error);
   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));
   message_loop_.RunUntilIdle();
 
   EXPECT_EQ(HTTP_NOT_FOUND, error);
   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));
   message_loop_.RunUntilIdle();
 
   EXPECT_EQ(HTTP_SUCCESS, error);
   EXPECT_FALSE(upload_location.is_empty());
   EXPECT_NE(GURL("https://1_folder_resumable_create_media_link"),
             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_.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/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_.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));
   message_loop_.RunUntilIdle();
 
   EXPECT_EQ(HTTP_PRECONDITION, error);
   EXPECT_TRUE(upload_location.is_empty());
 }
 
 TEST_F(FakeDriveServiceTest, InitiateUpload_ExistingFile) {
   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")),
-          "\"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));
   message_loop_.RunUntilIdle();
 
   EXPECT_EQ(HTTP_SUCCESS, error);
   EXPECT_EQ(GURL("https://2_file_link_resumable_create_media"),
             upload_location);
 }
 
 TEST_F(FakeDriveServiceTest, ResumeUpload_Offline) {
   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",
-          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));
   message_loop_.RunUntilIdle();
 
   EXPECT_EQ(HTTP_SUCCESS, error);
   EXPECT_FALSE(upload_location.is_empty());
   EXPECT_NE(GURL("https://1_folder_resumable_create_media_link"),
             upload_location);
 
@@ skipping 14 matching lines @@
 
   EXPECT_EQ(GDATA_NO_CONNECTION, response.code);
   EXPECT_FALSE(entry.get());
 }
 
 TEST_F(FakeDriveServiceTest, ResumeUpload_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",
-          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));
   message_loop_.RunUntilIdle();
 
   ASSERT_EQ(HTTP_SUCCESS, error);
 
   UploadRangeResponse response;
   scoped_ptr<ResourceEntry> entry;
   fake_service_.ResumeUpload(
       ResumeUploadParams(UPLOAD_NEW_FILE,
                          0, 13, 15, "test/foo",
                          scoped_refptr<net::IOBuffer>(),
                          GURL("https://foo.com/"),
                          FilePath(FILE_PATH_LITERAL(
                              "drive/Directory 1/new file.foo"))),
       base::Bind(&test_util::CopyResultsFromUploadRangeCallback,
                  &response, &entry));
   message_loop_.RunUntilIdle();
 
   EXPECT_EQ(HTTP_NOT_FOUND, response.code);
   EXPECT_FALSE(entry.get());
 }
 
 TEST_F(FakeDriveServiceTest, ResumeUpload_ExistingFile) {
   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",
-          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));
   message_loop_.RunUntilIdle();
 
   ASSERT_EQ(HTTP_SUCCESS, error);
 
   UploadRangeResponse response;
   scoped_ptr<ResourceEntry> entry;
   fake_service_.ResumeUpload(
@@ skipping 25 matching lines @@
   EXPECT_TRUE(entry.get());
   EXPECT_EQ(15L, entry->file_size());
   EXPECT_TRUE(Exists(entry->resource_id()));
 }
 
 TEST_F(FakeDriveServiceTest, ResumeUpload_NewFile) {
   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",
-          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));
   message_loop_.RunUntilIdle();
 
   EXPECT_EQ(HTTP_SUCCESS, error);
   EXPECT_FALSE(upload_location.is_empty());
   EXPECT_NE(GURL("https://1_folder_resumable_create_media_link"),
             upload_location);
 
@@ skipping 26 matching lines @@
 
   EXPECT_EQ(HTTP_CREATED, response.code);
   EXPECT_TRUE(entry.get());
   EXPECT_EQ(15L, entry->file_size());
   EXPECT_TRUE(Exists(entry->resource_id()));
 }
 
 }  // namespace
 
 }  // namespace google_apis