diff options
| author | yhirano@chromium.org <yhirano@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-08 02:41:57 +0000 |
|---|---|---|
| committer | yhirano@chromium.org <yhirano@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-08 02:41:57 +0000 |
| commit | 0c2d584ab97619534f19b8c3fb1c48123dbcfde6 (patch) | |
| tree | 3cb5fe240103a158d86c1d4065b1c7f2ec76ef3d | |
| parent | 4e1e734864aae6f906f37d24569fb451631c5830 (diff) | |
| download | chromium_src-0c2d584ab97619534f19b8c3fb1c48123dbcfde6.zip chromium_src-0c2d584ab97619534f19b8c3fb1c48123dbcfde6.tar.gz chromium_src-0c2d584ab97619534f19b8c3fb1c48123dbcfde6.tar.bz2 | |
Refactor a SocketStream unittest.
Some review comments at http://crrev.com/23496078/ remained to be addressed.
This CL addresses them.
BUG=290957
R=tyoshino
Review URL: https://codereview.chromium.org/26225002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227443 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | net/socket_stream/socket_stream_unittest.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/net/socket_stream/socket_stream_unittest.cc b/net/socket_stream/socket_stream_unittest.cc index f26e493..e18f641 100644 --- a/net/socket_stream/socket_stream_unittest.cc +++ b/net/socket_stream/socket_stream_unittest.cc @@ -310,8 +310,8 @@ class SocketStreamTest : public PlatformTest { } virtual void DoCloseFlushPendingWriteTestWithSetContextNull( - SocketStream* socket_stream, SocketStreamEvent* event) { - socket_stream->set_context(NULL); + SocketStreamEvent* event) { + event->socket->set_context(NULL); // handshake response received. for (size_t i = 0; i < messages_.size(); i++) { std::vector<char> frame; @@ -990,8 +990,7 @@ TEST_F(SocketStreamTest, NullContextSocketStreamShouldNotCrash) { &SocketStreamTest::DoSendWebSocketHandshake, base::Unretained(this))); delegate->SetOnReceivedData(base::Bind( &SocketStreamTest::DoCloseFlushPendingWriteTestWithSetContextNull, - base::Unretained(this), - base::Unretained(socket_stream.get()))); + base::Unretained(this))); delegate->SetOnStartOpenConnection(base::Bind( &SocketStreamTest::DoIOPending, base::Unretained(this))); @@ -999,13 +998,9 @@ TEST_F(SocketStreamTest, NullContextSocketStreamShouldNotCrash) { MockWrite data_writes[] = { MockWrite(SocketStreamTest::kWebSocketHandshakeRequest), - MockWrite(ASYNC, ERR_ABORTED), - MockWrite(ASYNC, ERR_ABORTED), }; MockRead data_reads[] = { MockRead(SocketStreamTest::kWebSocketHandshakeResponse), - // Server doesn't close the connection after handshake. - MockRead(ASYNC, ERR_ABORTED), }; AddWebSocketMessage("message1"); AddWebSocketMessage("message2"); @@ -1022,6 +1017,8 @@ TEST_F(SocketStreamTest, NullContextSocketStreamShouldNotCrash) { io_test_callback_.WaitForResult(); delegate->CompleteConnection(OK); EXPECT_EQ(OK, test_callback.WaitForResult()); + EXPECT_TRUE(data_provider.at_read_eof()); + EXPECT_TRUE(data_provider.at_write_eof()); } } // namespace net |