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

Unified Diff: android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc

Issue 11363123: [android_webview] Don't block the IO thread when reading from an InputStream. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reinterpret_cast->static_cast Created 8 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc
diff --git a/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc b/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..a7f1fb8272f9404f411db276dea43275ef29e266
--- /dev/null
+++ b/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc
@@ -0,0 +1,310 @@
+// 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 "android_webview/browser/input_stream.h"
+#include "android_webview/browser/net/android_stream_reader_url_request_job.h"
+#include "android_webview/browser/net/aw_url_request_job_factory.h"
+#include "android_webview/browser/net/input_stream_reader.h"
+#include "base/format_macros.h"
+#include "base/message_loop.h"
+#include "base/run_loop.h"
+#include "base/stringprintf.h"
+#include "net/url_request/url_request_job_factory_impl.h"
+#include "net/url_request/url_request_test_util.h"
+
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+using android_webview::InputStream;
+using android_webview::InputStreamReader;
+using net::TestDelegate;
+using net::TestJobInterceptor;
+using net::TestNetworkDelegate;
+using net::TestURLRequestContext;
+using net::TestURLRequest;
+using testing::DoAll;
+using testing::Ge;
+using testing::Gt;
+using testing::InSequence;
+using testing::Invoke;
+using testing::InvokeWithoutArgs;
+using testing::NotNull;
+using testing::Return;
+using testing::SaveArg;
+using testing::SetArgPointee;
+using testing::StrictMock;
+using testing::Test;
+using testing::WithArg;
+using testing::WithArgs;
+using testing::_;
+
+// Some of the classes will DCHECK on a null InputStream (which is desirable).
+// The workaround is to use this class. None of the methods need to be
+// implemented as the mock InputStreamReader should never forward calls to the
+// InputStream.
+class NotImplInputStream : public InputStream {
+ public:
+ NotImplInputStream() {}
+ virtual ~NotImplInputStream() {}
+ virtual bool BytesAvailable(JNIEnv* env, int* bytes_available) const {
+ NOTIMPLEMENTED();
+ return false;
+ }
+ virtual bool Skip(JNIEnv* env, int64_t n, int64_t* bytes_skipped) {
+ NOTIMPLEMENTED();
+ return false;
+ }
+ virtual bool Read(JNIEnv* env,
+ net::IOBuffer* dest,
+ int length,
+ int* bytes_read) {
+ NOTIMPLEMENTED();
+ return false;
+ }
+};
+
+// Required in order to create an instance of AndroidStreamReaderURLRequestJob.
+class StreamReaderDelegate :
+ public AndroidStreamReaderURLRequestJob::Delegate {
+ public:
+ StreamReaderDelegate() {}
+
+ virtual scoped_ptr<InputStream> OpenInputStream(
+ JNIEnv* env,
+ net::URLRequest* request) {
+ return make_scoped_ptr<InputStream>(new NotImplInputStream());
+ }
+
+ virtual bool GetMimeType(
+ JNIEnv* env,
+ net::URLRequest* request,
+ const android_webview::InputStream& stream,
+ std::string* mime_type) {
+ return false;
+ }
+
+ virtual bool GetCharset(
+ JNIEnv* env,
+ net::URLRequest* request,
+ const android_webview::InputStream& stream,
+ std::string* charset) {
+ return false;
+ }
+};
+
+class MockInputStreamReader : public InputStreamReader {
+ public:
+ MockInputStreamReader() : InputStreamReader(new NotImplInputStream()) {}
+
+ MOCK_METHOD1(Seek, int(net::HttpByteRange byte_range));
+
+ MOCK_METHOD2(ReadRawData, int(net::IOBuffer* buffer, int buffer_size));
+};
+
+
+class TestStreamReaderJob : public AndroidStreamReaderURLRequestJob {
+ public:
+ TestStreamReaderJob(
+ net::URLRequest* request,
+ net::NetworkDelegate* network_delegate,
+ scoped_ptr<Delegate> delegate,
+ InputStreamReader* stream_reader)
+ : AndroidStreamReaderURLRequestJob(request,
+ network_delegate,
+ delegate.Pass()),
+ stream_reader_(stream_reader) {
+ message_loop_proxy_ = base::MessageLoopProxy::current();
+ }
+
+ virtual InputStreamReader* CreateStreamReader(InputStream* stream) {
+ return stream_reader_;
+ }
+ protected:
+ virtual ~TestStreamReaderJob() {}
+
+ virtual base::TaskRunner* GetWorkerThreadRunner() {
+ return message_loop_proxy_.get();
+ }
+
+ InputStreamReader* stream_reader_;
+ scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;
+};
+
+class AndroidStreamReaderURLRequestJobTest : public Test {
+ public:
+ AndroidStreamReaderURLRequestJobTest()
+ : loop_(MessageLoop::TYPE_IO) {
+ }
+ protected:
+ virtual void SetUp() {
+ context_.set_job_factory(&factory_);
+ context_.set_network_delegate(&network_delegate_);
+ factory_.AddInterceptor(&interceptor_);
+ req_.reset(
+ new TestURLRequest(GURL("content://foo"),
+ &url_request_delegate_,
+ &context_));
+ req_->set_method("GET");
+ }
+
+ void SetRange(net::URLRequest* req, int first_byte, int last_byte) {
+ net::HttpRequestHeaders headers;
+ headers.SetHeader(net::HttpRequestHeaders::kRange,
+ base::StringPrintf(
+ "bytes=%" PRIuS "-%" PRIuS,
+ first_byte, last_byte));
+ req->SetExtraRequestHeaders(headers);
+ }
+
+ void SetUpTestJob(InputStreamReader* stream_reader) {
+ scoped_ptr<AndroidStreamReaderURLRequestJob::Delegate>
+ stream_reader_delegate(new StreamReaderDelegate());
+ TestStreamReaderJob* test_stream_reader_job =
+ new TestStreamReaderJob(
+ req_.get(),
+ &network_delegate_,
+ stream_reader_delegate.Pass(),
+ stream_reader);
+ interceptor_.set_main_intercept_job(test_stream_reader_job);
+ }
+
+ MessageLoop loop_;
+ TestURLRequestContext context_;
+ TestJobInterceptor interceptor_;
+ android_webview::AwURLRequestJobFactory factory_;
+ TestDelegate url_request_delegate_;
+ TestNetworkDelegate network_delegate_;
+ scoped_ptr<TestURLRequest> req_;
+};
+
+TEST_F(AndroidStreamReaderURLRequestJobTest, ReadEmptyStream) {
+ StrictMock<MockInputStreamReader>* stream_reader =
+ new StrictMock<MockInputStreamReader>();
+ {
+ InSequence s;
+ EXPECT_CALL(*stream_reader, Seek(_))
+ .WillOnce(Return(0));
+ EXPECT_CALL(*stream_reader, ReadRawData(NotNull(), Gt(0)))
+ .WillOnce(Return(0));
+ }
+
+ SetUpTestJob(stream_reader);
+
+ req_->Start();
+
+ // The TestDelegate will quit the message loop on request completion.
+ MessageLoop::current()->Run();
+
+ EXPECT_FALSE(url_request_delegate_.request_failed());
+ EXPECT_EQ(1, network_delegate_.completed_requests());
+}
+
+TEST_F(AndroidStreamReaderURLRequestJobTest, ReadPartOfStream) {
+ const int bytes_available = 128;
+ const int offset = 32;
+ const int bytes_to_read = bytes_available - offset;
+ StrictMock<MockInputStreamReader>* stream_reader =
+ new StrictMock<MockInputStreamReader>();
+ {
+ InSequence s;
+ EXPECT_CALL(*stream_reader, Seek(_))
+ .WillOnce(Return(bytes_available));
+ EXPECT_CALL(*stream_reader, ReadRawData(NotNull(), Ge(bytes_to_read)))
+ .WillOnce(Return(bytes_to_read/2));
+ EXPECT_CALL(*stream_reader, ReadRawData(NotNull(), Ge(bytes_to_read)))
+ .WillOnce(Return(bytes_to_read/2));
+ EXPECT_CALL(*stream_reader, ReadRawData(NotNull(), Ge(bytes_to_read)))
+ .WillOnce(Return(0));
+ }
+
+ SetUpTestJob(stream_reader);
+
+ SetRange(req_.get(), offset, bytes_available);
+ req_->Start();
+
+ MessageLoop::current()->Run();
+
+ EXPECT_FALSE(url_request_delegate_.request_failed());
+ EXPECT_EQ(bytes_to_read, url_request_delegate_.bytes_received());
+ EXPECT_EQ(1, network_delegate_.completed_requests());
+}
+
+TEST_F(AndroidStreamReaderURLRequestJobTest,
+ ReadStreamWithMoreAvailableThanActual) {
+ const int bytes_available_reported = 190;
+ const int bytes_available = 128;
+ const int offset = 0;
+ const int bytes_to_read = bytes_available - offset;
+ StrictMock<MockInputStreamReader>* stream_reader =
+ new StrictMock<MockInputStreamReader>();
+ {
+ InSequence s;
+ EXPECT_CALL(*stream_reader, Seek(_))
+ .WillOnce(Return(bytes_available_reported));
+ EXPECT_CALL(*stream_reader, ReadRawData(NotNull(), Ge(bytes_to_read)))
+ .WillOnce(Return(bytes_available));
+ EXPECT_CALL(*stream_reader, ReadRawData(NotNull(), Ge(bytes_to_read)))
+ .WillOnce(Return(0));
+ }
+
+ SetUpTestJob(stream_reader);
+
+ SetRange(req_.get(), offset, bytes_available_reported);
+ req_->Start();
+
+ MessageLoop::current()->Run();
+
+ EXPECT_FALSE(url_request_delegate_.request_failed());
+ EXPECT_EQ(bytes_to_read, url_request_delegate_.bytes_received());
+ EXPECT_EQ(1, network_delegate_.completed_requests());
+}
+
+TEST_F(AndroidStreamReaderURLRequestJobTest, DeleteJobMidWaySeek) {
+ const int offset = 20;
+ const int bytes_available = 128;
+ base::RunLoop loop;
+ StrictMock<MockInputStreamReader>* stream_reader =
+ new StrictMock<MockInputStreamReader>();
+ EXPECT_CALL(*stream_reader, Seek(_))
+ .WillOnce(DoAll(InvokeWithoutArgs(&loop, &base::RunLoop::Quit),
+ Return(bytes_available)));
+ ON_CALL(*stream_reader, ReadRawData(_, _))
+ .WillByDefault(Return(0));
+
+ SetUpTestJob(stream_reader);
+
+ SetRange(req_.get(), offset, bytes_available);
+ req_->Start();
+
+ loop.Run();
+
+ EXPECT_EQ(0, network_delegate_.completed_requests());
+ req_->Cancel();
+ EXPECT_EQ(1, network_delegate_.completed_requests());
+}
+
+TEST_F(AndroidStreamReaderURLRequestJobTest, DeleteJobMidWayRead) {
+ const int offset = 20;
+ const int bytes_available = 128;
+ base::RunLoop loop;
+ StrictMock<MockInputStreamReader>* stream_reader =
+ new StrictMock<MockInputStreamReader>();
+ net::CompletionCallback read_completion_callback;
+ EXPECT_CALL(*stream_reader, Seek(_))
+ .WillOnce(Return(bytes_available));
+ EXPECT_CALL(*stream_reader, ReadRawData(_, _))
+ .WillOnce(DoAll(InvokeWithoutArgs(&loop, &base::RunLoop::Quit),
+ Return(bytes_available)));
+
+ SetUpTestJob(stream_reader);
+
+ SetRange(req_.get(), offset, bytes_available);
+ req_->Start();
+
+ loop.Run();
+
+ EXPECT_EQ(0, network_delegate_.completed_requests());
+ req_->Cancel();
+ EXPECT_EQ(1, network_delegate_.completed_requests());
+}

Powered by Google App Engine
This is Rietveld 408576698