| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "google_apis/drive/base_requests.h" | 5 #include "google_apis/drive/base_requests.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <utility> | 10 #include <utility> |
| 11 | 11 |
| 12 #include "base/bind.h" | 12 #include "base/bind.h" |
| 13 #include "base/memory/ptr_util.h" | 13 #include "base/memory/ptr_util.h" |
| 14 #include "base/message_loop/message_loop.h" | 14 #include "base/message_loop/message_loop.h" |
| 15 #include "base/run_loop.h" | 15 #include "base/run_loop.h" |
| 16 #include "base/values.h" | 16 #include "base/values.h" |
| 17 #include "google_apis/drive/drive_api_parser.h" | 17 #include "google_apis/drive/drive_api_parser.h" |
| 18 #include "google_apis/drive/drive_api_requests.h" | 18 #include "google_apis/drive/drive_api_requests.h" |
| 19 #include "google_apis/drive/dummy_auth_service.h" | 19 #include "google_apis/drive/dummy_auth_service.h" |
| 20 #include "google_apis/drive/request_sender.h" | 20 #include "google_apis/drive/request_sender.h" |
| 21 #include "google_apis/drive/test_util.h" | 21 #include "google_apis/drive/test_util.h" |
| 22 #include "net/test/embedded_test_server/embedded_test_server.h" | 22 #include "net/test/embedded_test_server/embedded_test_server.h" |
| 23 #include "net/test/embedded_test_server/http_request.h" | 23 #include "net/test/embedded_test_server/http_request.h" |
| 24 #include "net/test/embedded_test_server/http_response.h" | 24 #include "net/test/embedded_test_server/http_response.h" |
| 25 #include "net/traffic_annotation/network_traffic_annotation_test_helper.h" |
| 25 #include "net/url_request/url_request_test_util.h" | 26 #include "net/url_request/url_request_test_util.h" |
| 26 #include "testing/gtest/include/gtest/gtest.h" | 27 #include "testing/gtest/include/gtest/gtest.h" |
| 27 | 28 |
| 28 namespace google_apis { | 29 namespace google_apis { |
| 29 | 30 |
| 30 namespace { | 31 namespace { |
| 31 | 32 |
| 32 const char kValidJsonString[] = "{ \"test\": 123 }"; | 33 const char kValidJsonString[] = "{ \"test\": 123 }"; |
| 33 const char kInvalidJsonString[] = "$$$"; | 34 const char kInvalidJsonString[] = "$$$"; |
| 34 | 35 |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 } // namespace | 109 } // namespace |
| 109 | 110 |
| 110 class BaseRequestsTest : public testing::Test { | 111 class BaseRequestsTest : public testing::Test { |
| 111 public: | 112 public: |
| 112 BaseRequestsTest() : response_code_(net::HTTP_OK) {} | 113 BaseRequestsTest() : response_code_(net::HTTP_OK) {} |
| 113 | 114 |
| 114 void SetUp() override { | 115 void SetUp() override { |
| 115 request_context_getter_ = new net::TestURLRequestContextGetter( | 116 request_context_getter_ = new net::TestURLRequestContextGetter( |
| 116 message_loop_.task_runner()); | 117 message_loop_.task_runner()); |
| 117 | 118 |
| 118 sender_.reset(new RequestSender(new DummyAuthService, | 119 sender_.reset(new RequestSender( |
| 119 request_context_getter_.get(), | 120 new DummyAuthService, request_context_getter_.get(), |
| 120 message_loop_.task_runner(), | 121 message_loop_.task_runner(), std::string(), /* custom user agent */ |
| 121 std::string() /* custom user agent */)); | 122 TRAFFIC_ANNOTATION_FOR_TESTS)); |
| 122 | 123 |
| 123 test_server_.RegisterRequestHandler( | 124 test_server_.RegisterRequestHandler( |
| 124 base::Bind(&BaseRequestsTest::HandleRequest, base::Unretained(this))); | 125 base::Bind(&BaseRequestsTest::HandleRequest, base::Unretained(this))); |
| 125 ASSERT_TRUE(test_server_.Start()); | 126 ASSERT_TRUE(test_server_.Start()); |
| 126 } | 127 } |
| 127 | 128 |
| 128 std::unique_ptr<net::test_server::HttpResponse> HandleRequest( | 129 std::unique_ptr<net::test_server::HttpResponse> HandleRequest( |
| 129 const net::test_server::HttpRequest& request) { | 130 const net::test_server::HttpRequest& request) { |
| 130 std::unique_ptr<net::test_server::BasicHttpResponse> response( | 131 std::unique_ptr<net::test_server::BasicHttpResponse> response( |
| 131 new net::test_server::BasicHttpResponse); | 132 new net::test_server::BasicHttpResponse); |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 "\n" | 226 "\n" |
| 226 "This is a sample file. I like chocolate and chips.\n" | 227 "This is a sample file. I like chocolate and chips.\n" |
| 227 "\n" | 228 "\n" |
| 228 "--TESTBOUNDARY--", | 229 "--TESTBOUNDARY--", |
| 229 upload_content_data); | 230 upload_content_data); |
| 230 ASSERT_EQ(HTTP_SUCCESS, error); | 231 ASSERT_EQ(HTTP_SUCCESS, error); |
| 231 EXPECT_EQ("file_id", file->file_id()); | 232 EXPECT_EQ("file_id", file->file_id()); |
| 232 } | 233 } |
| 233 | 234 |
| 234 } // Namespace google_apis | 235 } // Namespace google_apis |
| OLD | NEW |