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

Unified Diff: trunk/src/net/socket_stream/socket_stream_unittest.cc

Issue 14335011: Revert 196728 "Websocket should fire 'error' event if no server ..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: trunk/src/net/socket_stream/socket_stream_unittest.cc
===================================================================
--- trunk/src/net/socket_stream/socket_stream_unittest.cc (revision 196854)
+++ trunk/src/net/socket_stream/socket_stream_unittest.cc (working copy)
@@ -356,7 +356,7 @@
test_callback.WaitForResult();
const std::vector<SocketStreamEvent>& events = delegate->GetSeenEvents();
- ASSERT_EQ(7U, events.size());
+ ASSERT_EQ(8U, events.size());
EXPECT_EQ(SocketStreamEvent::EVENT_START_OPEN_CONNECTION,
events[0].event_type);
@@ -365,7 +365,9 @@
EXPECT_EQ(SocketStreamEvent::EVENT_RECEIVED_DATA, events[3].event_type);
EXPECT_EQ(SocketStreamEvent::EVENT_SENT_DATA, events[4].event_type);
EXPECT_EQ(SocketStreamEvent::EVENT_SENT_DATA, events[5].event_type);
- EXPECT_EQ(SocketStreamEvent::EVENT_CLOSE, events[6].event_type);
+ EXPECT_EQ(SocketStreamEvent::EVENT_ERROR, events[6].event_type);
+ EXPECT_EQ(ERR_CONNECTION_CLOSED, events[6].error_code);
+ EXPECT_EQ(SocketStreamEvent::EVENT_CLOSE, events[7].event_type);
}
TEST_F(SocketStreamTest, ExceedMaxPendingSendAllowed) {
@@ -643,7 +645,7 @@
EXPECT_EQ(OK, test_callback.WaitForResult());
const std::vector<SocketStreamEvent>& events = delegate->GetSeenEvents();
- ASSERT_EQ(7U, events.size());
+ ASSERT_EQ(8U, events.size());
EXPECT_EQ(SocketStreamEvent::EVENT_START_OPEN_CONNECTION,
events[0].event_type);
@@ -652,7 +654,9 @@
EXPECT_EQ(SocketStreamEvent::EVENT_RECEIVED_DATA, events[3].event_type);
EXPECT_EQ(SocketStreamEvent::EVENT_SENT_DATA, events[4].event_type);
EXPECT_EQ(SocketStreamEvent::EVENT_SENT_DATA, events[5].event_type);
- EXPECT_EQ(SocketStreamEvent::EVENT_CLOSE, events[6].event_type);
+ EXPECT_EQ(SocketStreamEvent::EVENT_ERROR, events[6].event_type);
+ EXPECT_EQ(ERR_CONNECTION_CLOSED, events[6].error_code);
+ EXPECT_EQ(SocketStreamEvent::EVENT_CLOSE, events[7].event_type);
}
TEST_F(SocketStreamTest, SwitchToSpdy) {
« no previous file with comments | « trunk/src/net/socket_stream/socket_stream.cc ('k') | trunk/src/webkit/glue/websocketstreamhandle_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698