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 "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 Loading... | |
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 UpdateHeaders(JNIEnv* env, | |
99 net::HttpResponseHeaders* headers) OVERRIDE { | |
100 // no-op | |
101 } | |
96 }; | 102 }; |
97 | 103 |
98 class NullStreamReaderDelegate : public StreamReaderDelegate { | 104 class NullStreamReaderDelegate : public StreamReaderDelegate { |
99 public: | 105 public: |
100 NullStreamReaderDelegate() {} | 106 NullStreamReaderDelegate() {} |
101 | 107 |
102 virtual scoped_ptr<InputStream> OpenInputStream( | 108 virtual scoped_ptr<InputStream> OpenInputStream( |
103 JNIEnv* env, | 109 JNIEnv* env, |
104 const GURL& url) OVERRIDE { | 110 const GURL& url) OVERRIDE { |
105 return make_scoped_ptr<InputStream>(NULL); | 111 return make_scoped_ptr<InputStream>(NULL); |
106 } | 112 } |
107 }; | 113 }; |
108 | 114 |
115 class HeaderAlteringStreamReaderDelegate : public NullStreamReaderDelegate { | |
116 public: | |
117 HeaderAlteringStreamReaderDelegate() {} | |
118 | |
119 virtual void UpdateHeaders(JNIEnv* env, | |
120 net::HttpResponseHeaders* headers) OVERRIDE { | |
121 headers->ReplaceStatusLine(kStatusLine); | |
122 std::string headerLine(kCustomHeaderName); | |
123 headerLine.append(": "); | |
124 headerLine.append(kCustomHeaderValue); | |
125 headers->AddHeader(headerLine); | |
126 } | |
127 | |
128 static const int kResponseCode; | |
129 static const char* kStatusLine; | |
130 static const char* kCustomHeaderName; | |
131 static const char* kCustomHeaderValue; | |
132 }; | |
133 | |
134 const int HeaderAlteringStreamReaderDelegate::kResponseCode = 401; | |
benm (inactive)
2014/05/15 16:17:40
are there any headers that we shouldn't allow the
mkosiba (inactive)
2014/05/15 17:03:21
That's a good question. I'm not sure there is a lo
| |
135 const char* HeaderAlteringStreamReaderDelegate::kStatusLine = | |
136 "HTTP/1.1 401 Gone"; | |
137 const char* HeaderAlteringStreamReaderDelegate::kCustomHeaderName = | |
138 "X-Test-Header"; | |
139 const char* HeaderAlteringStreamReaderDelegate::kCustomHeaderValue = | |
140 "TestHeaderValue"; | |
141 | |
109 class MockInputStreamReader : public InputStreamReader { | 142 class MockInputStreamReader : public InputStreamReader { |
110 public: | 143 public: |
111 MockInputStreamReader() : InputStreamReader(new NotImplInputStream()) {} | 144 MockInputStreamReader() : InputStreamReader(new NotImplInputStream()) {} |
112 ~MockInputStreamReader() {} | 145 ~MockInputStreamReader() {} |
113 | 146 |
114 MOCK_METHOD1(Seek, int(const net::HttpByteRange& byte_range)); | 147 MOCK_METHOD1(Seek, int(const net::HttpByteRange& byte_range)); |
115 MOCK_METHOD2(ReadRawData, int(net::IOBuffer* buffer, int buffer_size)); | 148 MOCK_METHOD2(ReadRawData, int(net::IOBuffer* buffer, int buffer_size)); |
116 }; | 149 }; |
117 | 150 |
118 | 151 |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
238 | 271 |
239 // The request_failed() method is named confusingly but all it checks is | 272 // The request_failed() method is named confusingly but all it checks is |
240 // whether the request got as far as calling NotifyHeadersComplete. | 273 // whether the request got as far as calling NotifyHeadersComplete. |
241 EXPECT_FALSE(url_request_delegate_.request_failed()); | 274 EXPECT_FALSE(url_request_delegate_.request_failed()); |
242 EXPECT_EQ(1, network_delegate_.completed_requests()); | 275 EXPECT_EQ(1, network_delegate_.completed_requests()); |
243 // A null input stream shouldn't result in an error. See crbug.com/180950. | 276 // A null input stream shouldn't result in an error. See crbug.com/180950. |
244 EXPECT_EQ(0, network_delegate_.error_count()); | 277 EXPECT_EQ(0, network_delegate_.error_count()); |
245 EXPECT_EQ(404, req_->GetResponseCode()); | 278 EXPECT_EQ(404, req_->GetResponseCode()); |
246 } | 279 } |
247 | 280 |
281 TEST_F(AndroidStreamReaderURLRequestJobTest, ModifyHeadersAndStatus) { | |
282 SetUpTestJob(scoped_ptr<InputStreamReader>(), | |
283 make_scoped_ptr(new HeaderAlteringStreamReaderDelegate()) | |
284 .PassAs<AndroidStreamReaderURLRequestJob::Delegate>()); | |
285 req_->Start(); | |
286 | |
287 // The TestDelegate will quit the message loop on request completion. | |
288 base::MessageLoop::current()->Run(); | |
289 | |
290 // The request_failed() method is named confusingly but all it checks is | |
291 // whether the request got as far as calling NotifyHeadersComplete. | |
292 EXPECT_FALSE(url_request_delegate_.request_failed()); | |
293 EXPECT_EQ(1, network_delegate_.completed_requests()); | |
294 // A null input stream shouldn't result in an error. See crbug.com/180950. | |
295 EXPECT_EQ(0, network_delegate_.error_count()); | |
296 EXPECT_EQ(HeaderAlteringStreamReaderDelegate::kResponseCode, | |
297 req_->GetResponseCode()); | |
298 EXPECT_EQ(HeaderAlteringStreamReaderDelegate::kStatusLine, | |
299 req_->response_headers()->GetStatusLine()); | |
300 EXPECT_TRUE(req_->response_headers()->HasHeader( | |
301 HeaderAlteringStreamReaderDelegate::kCustomHeaderName)); | |
302 std::string header_value; | |
303 EXPECT_TRUE(req_->response_headers()->EnumerateHeader( | |
304 NULL, HeaderAlteringStreamReaderDelegate::kCustomHeaderName, | |
305 &header_value)); | |
306 EXPECT_EQ(HeaderAlteringStreamReaderDelegate::kCustomHeaderValue, | |
307 header_value); | |
308 } | |
309 | |
248 TEST_F(AndroidStreamReaderURLRequestJobTest, ReadPartOfStream) { | 310 TEST_F(AndroidStreamReaderURLRequestJobTest, ReadPartOfStream) { |
249 const int bytes_available = 128; | 311 const int bytes_available = 128; |
250 const int offset = 32; | 312 const int offset = 32; |
251 const int bytes_to_read = bytes_available - offset; | 313 const int bytes_to_read = bytes_available - offset; |
252 scoped_ptr<StrictMock<MockInputStreamReader> > stream_reader( | 314 scoped_ptr<StrictMock<MockInputStreamReader> > stream_reader( |
253 new StrictMock<MockInputStreamReader>()); | 315 new StrictMock<MockInputStreamReader>()); |
254 { | 316 { |
255 InSequence s; | 317 InSequence s; |
256 EXPECT_CALL(*stream_reader, Seek(_)) | 318 EXPECT_CALL(*stream_reader, Seek(_)) |
257 .WillOnce(Return(bytes_available)); | 319 .WillOnce(Return(bytes_available)); |
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
348 | 410 |
349 SetRange(req_.get(), offset, bytes_available); | 411 SetRange(req_.get(), offset, bytes_available); |
350 req_->Start(); | 412 req_->Start(); |
351 | 413 |
352 loop.Run(); | 414 loop.Run(); |
353 | 415 |
354 EXPECT_EQ(0, network_delegate_.completed_requests()); | 416 EXPECT_EQ(0, network_delegate_.completed_requests()); |
355 req_->Cancel(); | 417 req_->Cancel(); |
356 EXPECT_EQ(1, network_delegate_.completed_requests()); | 418 EXPECT_EQ(1, network_delegate_.completed_requests()); |
357 } | 419 } |
OLD | NEW |