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

Side by Side Diff: net/socket_stream/socket_stream_unittest.cc

Issue 9251019: Fixes to socket_test_util.cc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Renamed blocked_ -> read_in_progress_. Created 8 years, 11 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
« no previous file with comments | « net/socket/socket_test_util.cc ('k') | net/spdy/spdy_http_stream_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "net/socket_stream/socket_stream.h" 5 #include "net/socket_stream/socket_stream.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 MockWrite(true, "\0message2\xff", 10) 292 MockWrite(true, "\0message2\xff", 10)
293 }; 293 };
294 MockRead data_reads[] = { 294 MockRead data_reads[] = {
295 MockRead(SocketStreamTest::kWebSocketHandshakeResponse), 295 MockRead(SocketStreamTest::kWebSocketHandshakeResponse),
296 // Server doesn't close the connection after handshake. 296 // Server doesn't close the connection after handshake.
297 MockRead(true, ERR_IO_PENDING) 297 MockRead(true, ERR_IO_PENDING)
298 }; 298 };
299 AddWebSocketMessage("message1"); 299 AddWebSocketMessage("message1");
300 AddWebSocketMessage("message2"); 300 AddWebSocketMessage("message2");
301 301
302 scoped_refptr<DelayedSocketData> data_provider( 302 scoped_ptr<DelayedSocketData> data_provider(
303 new DelayedSocketData(1, 303 new DelayedSocketData(1,
304 data_reads, arraysize(data_reads), 304 data_reads, arraysize(data_reads),
305 data_writes, arraysize(data_writes))); 305 data_writes, arraysize(data_writes)));
306 306
307 MockClientSocketFactory* mock_socket_factory = 307 MockClientSocketFactory* mock_socket_factory =
308 GetMockClientSocketFactory(); 308 GetMockClientSocketFactory();
309 mock_socket_factory->AddSocketDataProvider(data_provider.get()); 309 mock_socket_factory->AddSocketDataProvider(data_provider.get());
310 310
311 socket_stream->SetClientSocketFactory(mock_socket_factory); 311 socket_stream->SetClientSocketFactory(mock_socket_factory);
312 312
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
429 MockWrite(true, "\0message2\xff", 10) 429 MockWrite(true, "\0message2\xff", 10)
430 }; 430 };
431 MockRead data_reads[] = { 431 MockRead data_reads[] = {
432 MockRead(SocketStreamTest::kWebSocketHandshakeResponse), 432 MockRead(SocketStreamTest::kWebSocketHandshakeResponse),
433 // Server doesn't close the connection after handshake. 433 // Server doesn't close the connection after handshake.
434 MockRead(true, ERR_IO_PENDING) 434 MockRead(true, ERR_IO_PENDING)
435 }; 435 };
436 AddWebSocketMessage("message1"); 436 AddWebSocketMessage("message1");
437 AddWebSocketMessage("message2"); 437 AddWebSocketMessage("message2");
438 438
439 scoped_refptr<DelayedSocketData> data_provider( 439 scoped_ptr<DelayedSocketData> data_provider(
440 new DelayedSocketData(1, 440 new DelayedSocketData(1,
441 data_reads, arraysize(data_reads), 441 data_reads, arraysize(data_reads),
442 data_writes, arraysize(data_writes))); 442 data_writes, arraysize(data_writes)));
443 443
444 MockClientSocketFactory* mock_socket_factory = 444 MockClientSocketFactory* mock_socket_factory =
445 GetMockClientSocketFactory(); 445 GetMockClientSocketFactory();
446 mock_socket_factory->AddSocketDataProvider(data_provider.get()); 446 mock_socket_factory->AddSocketDataProvider(data_provider.get());
447 447
448 socket_stream->SetClientSocketFactory(mock_socket_factory); 448 socket_stream->SetClientSocketFactory(mock_socket_factory);
449 449
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
631 631
632 EXPECT_EQ(SocketStreamEvent::EVENT_START_OPEN_CONNECTION, 632 EXPECT_EQ(SocketStreamEvent::EVENT_START_OPEN_CONNECTION,
633 events[0].event_type); 633 events[0].event_type);
634 EXPECT_EQ(SocketStreamEvent::EVENT_CONNECTED, events[1].event_type); 634 EXPECT_EQ(SocketStreamEvent::EVENT_CONNECTED, events[1].event_type);
635 EXPECT_EQ(SocketStreamEvent::EVENT_ERROR, events[2].event_type); 635 EXPECT_EQ(SocketStreamEvent::EVENT_ERROR, events[2].event_type);
636 EXPECT_EQ(net::ERR_ABORTED, events[2].error_code); 636 EXPECT_EQ(net::ERR_ABORTED, events[2].error_code);
637 EXPECT_EQ(SocketStreamEvent::EVENT_CLOSE, events[3].event_type); 637 EXPECT_EQ(SocketStreamEvent::EVENT_CLOSE, events[3].event_type);
638 } 638 }
639 639
640 } // namespace net 640 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/socket_test_util.cc ('k') | net/spdy/spdy_http_stream_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698