net: Add SetUploadStream method to URLFetcher.

net/url_request/url_fetcher_impl_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 "net/url_request/url_fetcher_impl.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "build/build_config.h"
 #include "crypto/nss_util.h"
+#include "net/base/elements_upload_data_stream.h"
 #include "net/base/network_change_notifier.h"
+#include "net/base/upload_bytes_element_reader.h"
+#include "net/base/upload_element_reader.h"
+#include "net/base/upload_file_element_reader.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/http/http_response_headers.h"
 #include "net/test/spawned_test_server/spawned_test_server.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_test_util.h"
 #include "net/url_request/url_request_throttler_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(USE_NSS) || defined(OS_IOS)
 #include "net/ocsp/nss_ocsp.h"
 #endif
 
 namespace net {
 
 using base::Time;
 using base::TimeDelta;
 
 // TODO(eroman): Add a regression test for http://crbug.com/40505.
 
 namespace {
 
 // TODO(akalin): Move all the test data to somewhere under net/.
 const base::FilePath::CharType kDocRoot[] =
     FILE_PATH_LITERAL("net/data/url_fetcher_impl_unittest");
 const char kTestServerFilePrefix[] = "files/";
 
+scoped_ptr<UploadDataStream> CreateUploadStream(const base::FilePath& path) {
+  ScopedVector<UploadElementReader> readers;
+  const std::string str("bobsyeruncle\n");
+  std::vector<char> buffer(str.begin(), str.end());
+  readers.push_back(new UploadOwnedBytesElementReader(&buffer));
+  readers.push_back(
+      new UploadFileElementReader(base::MessageLoopProxy::current().get(), path,
+                                  0, kuint64max, base::Time()));
+  return make_scoped_ptr<UploadDataStream>(
+             new ElementsUploadDataStream(readers.Pass(), 0)).Pass();

[mmenke, 2015/01/09 17:42:25]

Do we get anything from having multiple elements here?  If we do, I'm fine with
it, but should have a comment about why it's useful for the tests that use it.

[hirono, 2015/01/15 08:14:27]

No, let me simplify it.

+}
+
 class ThrottlingTestURLRequestContext : public TestURLRequestContext {
  public:
   ThrottlingTestURLRequestContext() : TestURLRequestContext(true) {
     set_throttler_manager(&throttler_manager_);
     Init();
     DCHECK(throttler_manager() != NULL);
   }
 
  private:
   URLRequestThrottlerManager throttler_manager_;
@@ skipping 194 matching lines @@
 
   // URLFetcherDelegate:
   void OnURLFetchComplete(const URLFetcher* source) override;
 
  private:
   base::FilePath path_;
   uint64 range_offset_;
   uint64 range_length_;
 };
 
+class URLFetcherPostStreamTest : public URLFetcherTest {
+ public:
+  URLFetcherPostStreamTest();
+
+  // URLFetcherTest:
+  void CreateFetcher(const GURL& url) override;
+
+  // URLFetcherDelegate:
+  void OnURLFetchComplete(const URLFetcher* source) override;
+
+ private:
+  base::FilePath path_;
+};
+
 // Version of URLFetcherTest that does a POST instead with empty upload body
 class URLFetcherEmptyPostTest : public URLFetcherTest {
  public:
   // URLFetcherTest:
   void CreateFetcher(const GURL& url) override;
 
   // URLFetcherDelegate:
   void OnURLFetchComplete(const URLFetcher* source) override;
 };
 
@@ skipping 292 matching lines @@
   ASSERT_LE(range_offset_, expected.size());
   uint64 expected_size =
       std::min(range_length_, expected.size() - range_offset_);
 
   std::string data;
   EXPECT_TRUE(source->GetResponseAsString(&data));
   EXPECT_EQ(expected.substr(range_offset_, expected_size), data);
   URLFetcherTest::OnURLFetchComplete(source);
 }
 
+URLFetcherPostStreamTest::URLFetcherPostStreamTest() {
+  PathService::Get(base::DIR_SOURCE_ROOT, &path_);
+  path_ = path_.Append(FILE_PATH_LITERAL("net"));
+  path_ = path_.Append(FILE_PATH_LITERAL("data"));
+  path_ = path_.Append(FILE_PATH_LITERAL("url_request_unittest"));
+  path_ = path_.Append(FILE_PATH_LITERAL("BullRunSpeech.txt"));
+}
+
+void URLFetcherPostStreamTest::CreateFetcher(const GURL& url) {

[mmenke, 2015/01/09 17:42:25]

We really should make sure the test actually retries, so it runs the callback
twice (And count the times the callback is run).

I think the simplest way to do this would be to modify the test server so either
either the "echo" URL takes an option response code parameter, or add a new URL
"echo-with-500-status-code" - former seems preferable.  I'm open to other ideas.

[hirono, 2015/01/15 08:14:27]

I added status parameter to the "echo" URL. Done.

+  fetcher_ = new URLFetcherImpl(url, URLFetcher::POST, this);
+  fetcher_->SetRequestContext(new ThrottlingTestURLRequestContextGetter(
+      io_message_loop_proxy().get(), request_context()));
+  fetcher_->SetUploadStreamFactory("text/plain",
+                                   base::Bind(CreateUploadStream, path_));
+  fetcher_->Start();
+}
+
+void URLFetcherPostStreamTest::OnURLFetchComplete(const URLFetcher* source) {
+  std::string data;
+  EXPECT_TRUE(source->GetResponseAsString(&data));
+
+  std::string expected;
+  ASSERT_TRUE(base::ReadFileToString(path_, &expected));
+  EXPECT_EQ(std::string("bobsyeruncle\n") + expected, data);
+
+  URLFetcherTest::OnURLFetchComplete(source);
+}
+
 void URLFetcherEmptyPostTest::CreateFetcher(const GURL& url) {
   fetcher_ = new URLFetcherImpl(url, URLFetcher::POST, this);
   fetcher_->SetRequestContext(new TestURLRequestContextGetter(
       io_message_loop_proxy()));
   fetcher_->SetUploadData("text/plain", std::string());
   fetcher_->Start();
 }
 
 void URLFetcherEmptyPostTest::OnURLFetchComplete(const URLFetcher* source) {
   EXPECT_TRUE(source->GetStatus().is_success());
@@ skipping 494 matching lines @@
                                 SpawnedTestServer::kLocalhost,
                                 base::FilePath(kDocRoot));
   ASSERT_TRUE(test_server.Start());
 
   SetUploadRange(30, 100);
 
   CreateFetcher(test_server.GetURL("echo"));
   base::MessageLoop::current()->Run();
 }
 
+TEST_F(URLFetcherPostStreamTest, Basic) {
+  SpawnedTestServer test_server(SpawnedTestServer::TYPE_HTTP,
+                                SpawnedTestServer::kLocalhost,
+                                base::FilePath(kDocRoot));
+  ASSERT_TRUE(test_server.Start());
+
+  CreateFetcher(test_server.GetURL("echo"));
+  base::MessageLoop::current()->Run();
+}
+
 TEST_F(URLFetcherEmptyPostTest, Basic) {
   SpawnedTestServer test_server(SpawnedTestServer::TYPE_HTTP,
                                 SpawnedTestServer::kLocalhost,
                                 base::FilePath(kDocRoot));
   ASSERT_TRUE(test_server.Start());
 
   CreateFetcher(test_server.GetURL("echo"));
   base::MessageLoop::current()->Run();
 }
 
@@ skipping 436 matching lines @@
 
     base::MessageLoop::current()->RunUntilIdle();
     ASSERT_EQ(kTake[i], base::PathExists(file_path_)) <<
         "FilePath: " << file_path_.value();
   }
 }
 
 }  // namespace
 
 }  // namespace net