Implement upload progress reporting in FakeDriveSerivice.

Implement upload progress reporting in FakeDriveSerivice.

BUG=128079
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=193328

[kinaba, 2013-04-09 06:57:21]

Tree is closed. Let's go reviewing!

[kinaba, 2013-04-09 06:58:56]

Needlessto say, this patch depends on https://codereview.chromium.org/13927002/.

[hidehiko, 2013-04-09 07:26:24]

lgtm

[commit-bot: I haz the power, 2013-04-09 22:13:04]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/kinaba@chromium.org/13941004/1

[commit-bot: I haz the power, 2013-04-09 22:13:05]

Failed to apply patch for
chrome/browser/google_apis/fake_drive_service_unittest.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/google_apis/fake_drive_service_unittest.cc
  Hunk #1 FAILED at 5.
  Hunk #2 succeeded at 89 (offset 1 line).
  Hunk #3 succeeded at 1897 (offset 231 lines).
  Hunk #4 succeeded at 1905 (offset 231 lines).
  Hunk #5 succeeded at 1918 (offset 231 lines).
  Hunk #6 succeeded at 1953 (offset 231 lines).
  Hunk #7 succeeded at 1961 (offset 231 lines).
  Hunk #8 succeeded at 1974 (offset 231 lines).
  1 out of 8 hunks FAILED -- saving rejects to file
chrome/browser/google_apis/fake_drive_service_unittest.cc.rej

Patch:       chrome/browser/google_apis/fake_drive_service_unittest.cc
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
03fa8cd03b8cf1ab23f6b7c77c7cacc050a28598..76ff373ed5e358b6010415d1f3569556d5c321c6
100644
--- a/chrome/browser/google_apis/fake_drive_service_unittest.cc
+++ b/chrome/browser/google_apis/fake_drive_service_unittest.cc
@@ -5,10 +5,12 @@
 #include "chrome/browser/google_apis/fake_drive_service.h"
 
 #include <string>
+#include <vector>
 
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop.h"
+#include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/google_apis/drive_api_parser.h"
 #include "chrome/browser/google_apis/gdata_wapi_operations.h"
@@ -88,6 +90,10 @@ class FakeDriveServiceTest : public testing::Test {
   FakeDriveService fake_service_;
 };
 
+void AppendProgressCallbackResult(std::vector<int64>* values, int64 progress) {
+  values->push_back(progress);
+}
+
 TEST_F(FakeDriveServiceTest, GetResourceList_All) {
   ASSERT_TRUE(fake_service_.LoadResourceListForWapi(
       "chromeos/gdata/root_feed.json"));
@@ -1662,6 +1668,7 @@ TEST_F(FakeDriveServiceTest, ResumeUpload_ExistingFile) {
 
   UploadRangeResponse response;
   scoped_ptr<ResourceEntry> entry;
+  std::vector<int64> upload_progress_values;
   fake_service_.ResumeUpload(
       UPLOAD_EXISTING_FILE,
       base::FilePath(FILE_PATH_LITERAL("drive/File 1.txt")),
@@ -1669,7 +1676,7 @@ TEST_F(FakeDriveServiceTest, ResumeUpload_ExistingFile) {
       0, 13, 15, "text/plain",
       scoped_refptr<net::IOBuffer>(),
       test_util::CreateCopyResultCallback(&response, &entry),
-      ProgressCallback());
+      base::Bind(&AppendProgressCallbackResult, &upload_progress_values));
   message_loop_.RunUntilIdle();
 
   EXPECT_EQ(HTTP_RESUME_INCOMPLETE, response.code);
@@ -1682,13 +1689,17 @@ TEST_F(FakeDriveServiceTest, ResumeUpload_ExistingFile)
{
       14, 15, 15, "text/plain",
       scoped_refptr<net::IOBuffer>(),
       test_util::CreateCopyResultCallback(&response, &entry),
-      ProgressCallback());
+      base::Bind(&AppendProgressCallbackResult, &upload_progress_values));
   message_loop_.RunUntilIdle();
 
   EXPECT_EQ(HTTP_SUCCESS, response.code);
   EXPECT_TRUE(entry.get());
   EXPECT_EQ(15L, entry->file_size());
   EXPECT_TRUE(Exists(entry->resource_id()));
+  ASSERT_TRUE(!upload_progress_values.empty());
+  EXPECT_TRUE(base::STLIsSorted(upload_progress_values));
+  EXPECT_GE(upload_progress_values.front(), 0);
+  EXPECT_LE(upload_progress_values.back(), entry->file_size());
 }
 
 TEST_F(FakeDriveServiceTest, ResumeUpload_NewFile) {
@@ -1713,6 +1724,7 @@ TEST_F(FakeDriveServiceTest, ResumeUpload_NewFile) {
 
   UploadRangeResponse response;
   scoped_ptr<ResourceEntry> entry;
+  std::vector<int64> upload_progress_values;
   fake_service_.ResumeUpload(
       UPLOAD_NEW_FILE,
       base::FilePath(FILE_PATH_LITERAL("drive/Directory 1/new file.foo")),
@@ -1720,7 +1732,7 @@ TEST_F(FakeDriveServiceTest, ResumeUpload_NewFile) {
       0, 13, 15, "test/foo",
       scoped_refptr<net::IOBuffer>(),
       test_util::CreateCopyResultCallback(&response, &entry),
-      ProgressCallback());
+      base::Bind(&AppendProgressCallbackResult, &upload_progress_values));
   message_loop_.RunUntilIdle();
 
   EXPECT_EQ(HTTP_RESUME_INCOMPLETE, response.code);
@@ -1733,13 +1745,17 @@ TEST_F(FakeDriveServiceTest, ResumeUpload_NewFile) {
       14, 15, 15, "test/foo",
       scoped_refptr<net::IOBuffer>(),
       test_util::CreateCopyResultCallback(&response, &entry),
-      ProgressCallback());
+      base::Bind(&AppendProgressCallbackResult, &upload_progress_values));
   message_loop_.RunUntilIdle();
 
   EXPECT_EQ(HTTP_CREATED, response.code);
   EXPECT_TRUE(entry.get());
   EXPECT_EQ(15L, entry->file_size());
   EXPECT_TRUE(Exists(entry->resource_id()));
+  ASSERT_TRUE(!upload_progress_values.empty());
+  EXPECT_TRUE(base::STLIsSorted(upload_progress_values));
+  EXPECT_GE(upload_progress_values.front(), 0);
+  EXPECT_LE(upload_progress_values.back(), entry->file_size());
 }
 
 TEST_F(FakeDriveServiceTest, AddNewFile_ToRootDirectory) {

[commit-bot: I haz the power, 2013-04-10 02:46:43]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/kinaba@chromium.org/13941004/7001

[commit-bot: I haz the power, 2013-04-10 05:10:22]

Change committed as 193328