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

Side by Side Diff: android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc

Issue 284123004: [android_webview] Add more params to request intercepting. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix accidentally broken test Created 6 years, 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 "android_webview/browser/input_stream.h" 5 #include "android_webview/browser/input_stream.h"
6 #include "android_webview/browser/net/android_stream_reader_url_request_job.h" 6 #include "android_webview/browser/net/android_stream_reader_url_request_job.h"
7 #include "android_webview/browser/net/aw_url_request_job_factory.h" 7 #include "android_webview/browser/net/aw_url_request_job_factory.h"
8 #include "android_webview/browser/net/input_stream_reader.h" 8 #include "android_webview/browser/net/input_stream_reader.h"
9 #include "base/format_macros.h" 9 #include "base/format_macros.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
11 #include "base/run_loop.h" 11 #include "base/run_loop.h"
12 #include "base/strings/stringprintf.h" 12 #include "base/strings/stringprintf.h"
13 #include "net/base/request_priority.h" 13 #include "net/base/request_priority.h"
14 #include "net/http/http_byte_range.h" 14 #include "net/http/http_byte_range.h"
15 #include "net/http/http_response_headers.h"
15 #include "net/url_request/url_request_job_factory_impl.h" 16 #include "net/url_request/url_request_job_factory_impl.h"
16 #include "net/url_request/url_request_test_util.h" 17 #include "net/url_request/url_request_test_util.h"
17 18
18 #include "testing/gmock/include/gmock/gmock.h" 19 #include "testing/gmock/include/gmock/gmock.h"
19 #include "testing/gtest/include/gtest/gtest.h" 20 #include "testing/gtest/include/gtest/gtest.h"
20 21
21 using android_webview::InputStream; 22 using android_webview::InputStream;
22 using android_webview::InputStreamReader; 23 using android_webview::InputStreamReader;
23 using net::TestDelegate; 24 using net::TestDelegate;
24 using net::TestJobInterceptor; 25 using net::TestJobInterceptor;
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 std::string* mime_type) OVERRIDE { 87 std::string* mime_type) OVERRIDE {
87 return false; 88 return false;
88 } 89 }
89 90
90 virtual bool GetCharset(JNIEnv* env, 91 virtual bool GetCharset(JNIEnv* env,
91 net::URLRequest* request, 92 net::URLRequest* request,
92 android_webview::InputStream* stream, 93 android_webview::InputStream* stream,
93 std::string* charset) OVERRIDE { 94 std::string* charset) OVERRIDE {
94 return false; 95 return false;
95 } 96 }
97
98 virtual void AppendResponseHeaders(
99 JNIEnv* env,
100 net::HttpResponseHeaders* headers) OVERRIDE {
101 // no-op
102 }
96 }; 103 };
97 104
98 class NullStreamReaderDelegate : public StreamReaderDelegate { 105 class NullStreamReaderDelegate : public StreamReaderDelegate {
99 public: 106 public:
100 NullStreamReaderDelegate() {} 107 NullStreamReaderDelegate() {}
101 108
102 virtual scoped_ptr<InputStream> OpenInputStream( 109 virtual scoped_ptr<InputStream> OpenInputStream(
103 JNIEnv* env, 110 JNIEnv* env,
104 const GURL& url) OVERRIDE { 111 const GURL& url) OVERRIDE {
105 return make_scoped_ptr<InputStream>(NULL); 112 return make_scoped_ptr<InputStream>(NULL);
106 } 113 }
107 }; 114 };
108 115
116 class HeaderAlteringStreamReaderDelegate : public NullStreamReaderDelegate {
117 public:
118 HeaderAlteringStreamReaderDelegate() {}
119
120 virtual void AppendResponseHeaders(
121 JNIEnv* env,
122 net::HttpResponseHeaders* headers) OVERRIDE {
123 headers->ReplaceStatusLine(kStatusLine);
124 std::string headerLine(kCustomHeaderName);
125 headerLine.append(": ");
126 headerLine.append(kCustomHeaderValue);
127 headers->AddHeader(headerLine);
128 }
129
130 static const int kResponseCode;
131 static const char* kStatusLine;
132 static const char* kCustomHeaderName;
133 static const char* kCustomHeaderValue;
134 };
135
136 const int HeaderAlteringStreamReaderDelegate::kResponseCode = 401;
137 const char* HeaderAlteringStreamReaderDelegate::kStatusLine =
138 "HTTP/1.1 401 Gone";
139 const char* HeaderAlteringStreamReaderDelegate::kCustomHeaderName =
140 "X-Test-Header";
141 const char* HeaderAlteringStreamReaderDelegate::kCustomHeaderValue =
142 "TestHeaderValue";
143
109 class MockInputStreamReader : public InputStreamReader { 144 class MockInputStreamReader : public InputStreamReader {
110 public: 145 public:
111 MockInputStreamReader() : InputStreamReader(new NotImplInputStream()) {} 146 MockInputStreamReader() : InputStreamReader(new NotImplInputStream()) {}
112 ~MockInputStreamReader() {} 147 ~MockInputStreamReader() {}
113 148
114 MOCK_METHOD1(Seek, int(const net::HttpByteRange& byte_range)); 149 MOCK_METHOD1(Seek, int(const net::HttpByteRange& byte_range));
115 MOCK_METHOD2(ReadRawData, int(net::IOBuffer* buffer, int buffer_size)); 150 MOCK_METHOD2(ReadRawData, int(net::IOBuffer* buffer, int buffer_size));
116 }; 151 };
117 152
118 153
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 273
239 // The request_failed() method is named confusingly but all it checks is 274 // The request_failed() method is named confusingly but all it checks is
240 // whether the request got as far as calling NotifyHeadersComplete. 275 // whether the request got as far as calling NotifyHeadersComplete.
241 EXPECT_FALSE(url_request_delegate_.request_failed()); 276 EXPECT_FALSE(url_request_delegate_.request_failed());
242 EXPECT_EQ(1, network_delegate_.completed_requests()); 277 EXPECT_EQ(1, network_delegate_.completed_requests());
243 // A null input stream shouldn't result in an error. See crbug.com/180950. 278 // A null input stream shouldn't result in an error. See crbug.com/180950.
244 EXPECT_EQ(0, network_delegate_.error_count()); 279 EXPECT_EQ(0, network_delegate_.error_count());
245 EXPECT_EQ(404, req_->GetResponseCode()); 280 EXPECT_EQ(404, req_->GetResponseCode());
246 } 281 }
247 282
283 TEST_F(AndroidStreamReaderURLRequestJobTest, ModifyHeadersAndStatus) {
284 SetUpTestJob(scoped_ptr<InputStreamReader>(),
285 make_scoped_ptr(new HeaderAlteringStreamReaderDelegate())
286 .PassAs<AndroidStreamReaderURLRequestJob::Delegate>());
287 req_->Start();
288
289 // The TestDelegate will quit the message loop on request completion.
290 base::MessageLoop::current()->Run();
291
292 // The request_failed() method is named confusingly but all it checks is
293 // whether the request got as far as calling NotifyHeadersComplete.
294 EXPECT_FALSE(url_request_delegate_.request_failed());
295 EXPECT_EQ(1, network_delegate_.completed_requests());
296 // A null input stream shouldn't result in an error. See crbug.com/180950.
297 EXPECT_EQ(0, network_delegate_.error_count());
298 EXPECT_EQ(HeaderAlteringStreamReaderDelegate::kResponseCode,
299 req_->GetResponseCode());
300 EXPECT_EQ(HeaderAlteringStreamReaderDelegate::kStatusLine,
301 req_->response_headers()->GetStatusLine());
302 EXPECT_TRUE(req_->response_headers()->HasHeader(
303 HeaderAlteringStreamReaderDelegate::kCustomHeaderName));
304 std::string header_value;
305 EXPECT_TRUE(req_->response_headers()->EnumerateHeader(
306 NULL, HeaderAlteringStreamReaderDelegate::kCustomHeaderName,
307 &header_value));
308 EXPECT_EQ(HeaderAlteringStreamReaderDelegate::kCustomHeaderValue,
309 header_value);
310 }
311
248 TEST_F(AndroidStreamReaderURLRequestJobTest, ReadPartOfStream) { 312 TEST_F(AndroidStreamReaderURLRequestJobTest, ReadPartOfStream) {
249 const int bytes_available = 128; 313 const int bytes_available = 128;
250 const int offset = 32; 314 const int offset = 32;
251 const int bytes_to_read = bytes_available - offset; 315 const int bytes_to_read = bytes_available - offset;
252 scoped_ptr<StrictMock<MockInputStreamReader> > stream_reader( 316 scoped_ptr<StrictMock<MockInputStreamReader> > stream_reader(
253 new StrictMock<MockInputStreamReader>()); 317 new StrictMock<MockInputStreamReader>());
254 { 318 {
255 InSequence s; 319 InSequence s;
256 EXPECT_CALL(*stream_reader, Seek(_)) 320 EXPECT_CALL(*stream_reader, Seek(_))
257 .WillOnce(Return(bytes_available)); 321 .WillOnce(Return(bytes_available));
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 412
349 SetRange(req_.get(), offset, bytes_available); 413 SetRange(req_.get(), offset, bytes_available);
350 req_->Start(); 414 req_->Start();
351 415
352 loop.Run(); 416 loop.Run();
353 417
354 EXPECT_EQ(0, network_delegate_.completed_requests()); 418 EXPECT_EQ(0, network_delegate_.completed_requests());
355 req_->Cancel(); 419 req_->Cancel();
356 EXPECT_EQ(1, network_delegate_.completed_requests()); 420 EXPECT_EQ(1, network_delegate_.completed_requests());
357 } 421 }
OLDNEW
« no previous file with comments | « android_webview/browser/net/android_stream_reader_url_request_job.cc ('k') | android_webview/buildbot/aosp_manifest.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698