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

Side by Side Diff: net/websockets/websocket_unittest.cc

Issue 384024: There was confusion in the mock socket classes due to... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/socket_stream/socket_stream_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:eol-style
+ LF
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 <string> 5 #include <string>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/task.h" 8 #include "base/task.h"
9 #include "net/base/completion_callback.h" 9 #include "net/base/completion_callback.h"
10 #include "net/base/io_buffer.h" 10 #include "net/base/io_buffer.h"
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 }; 140 };
141 MockWrite data_writes[] = { 141 MockWrite data_writes[] = {
142 MockWrite("GET /demo HTTP/1.1\r\n" 142 MockWrite("GET /demo HTTP/1.1\r\n"
143 "Upgrade: WebSocket\r\n" 143 "Upgrade: WebSocket\r\n"
144 "Connection: Upgrade\r\n" 144 "Connection: Upgrade\r\n"
145 "Host: example.com\r\n" 145 "Host: example.com\r\n"
146 "Origin: http://example.com\r\n" 146 "Origin: http://example.com\r\n"
147 "WebSocket-Protocol: sample\r\n" 147 "WebSocket-Protocol: sample\r\n"
148 "\r\n"), 148 "\r\n"),
149 }; 149 };
150 StaticMockSocket data(data_reads, data_writes); 150 StaticSocketDataProvider data(data_reads, data_writes);
151 mock_socket_factory.AddMockSocket(&data); 151 mock_socket_factory.AddSocketDataProvider(&data);
152 152
153 WebSocket::Request* request( 153 WebSocket::Request* request(
154 new WebSocket::Request(GURL("ws://example.com/demo"), 154 new WebSocket::Request(GURL("ws://example.com/demo"),
155 "sample", 155 "sample",
156 "http://example.com", 156 "http://example.com",
157 "ws://example.com/demo", 157 "ws://example.com/demo",
158 new TestURLRequestContext())); 158 new TestURLRequestContext()));
159 request->SetHostResolver(new MockHostResolver()); 159 request->SetHostResolver(new MockHostResolver());
160 request->SetClientSocketFactory(&mock_socket_factory); 160 request->SetClientSocketFactory(&mock_socket_factory);
161 161
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 }; 200 };
201 MockWrite data_writes[] = { 201 MockWrite data_writes[] = {
202 MockWrite("GET /demo HTTP/1.1\r\n" 202 MockWrite("GET /demo HTTP/1.1\r\n"
203 "Upgrade: WebSocket\r\n" 203 "Upgrade: WebSocket\r\n"
204 "Connection: Upgrade\r\n" 204 "Connection: Upgrade\r\n"
205 "Host: example.com\r\n" 205 "Host: example.com\r\n"
206 "Origin: http://example.com\r\n" 206 "Origin: http://example.com\r\n"
207 "WebSocket-Protocol: sample\r\n" 207 "WebSocket-Protocol: sample\r\n"
208 "\r\n"), 208 "\r\n"),
209 }; 209 };
210 StaticMockSocket data(data_reads, data_writes); 210 StaticSocketDataProvider data(data_reads, data_writes);
211 mock_socket_factory.AddMockSocket(&data); 211 mock_socket_factory.AddSocketDataProvider(&data);
212 212
213 WebSocket::Request* request( 213 WebSocket::Request* request(
214 new WebSocket::Request(GURL("ws://example.com/demo"), 214 new WebSocket::Request(GURL("ws://example.com/demo"),
215 "sample", 215 "sample",
216 "http://example.com", 216 "http://example.com",
217 "ws://example.com/demo", 217 "ws://example.com/demo",
218 new TestURLRequestContext())); 218 new TestURLRequestContext()));
219 request->SetHostResolver(new MockHostResolver()); 219 request->SetHostResolver(new MockHostResolver());
220 request->SetClientSocketFactory(&mock_socket_factory); 220 request->SetClientSocketFactory(&mock_socket_factory);
221 221
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 EXPECT_EQ(1U, events.size()); 320 EXPECT_EQ(1U, events.size());
321 321
322 EXPECT_EQ(WebSocketEvent::EVENT_MESSAGE, events[0].event_type); 322 EXPECT_EQ(WebSocketEvent::EVENT_MESSAGE, events[0].event_type);
323 EXPECT_EQ(kExpectedMsg, events[0].msg); 323 EXPECT_EQ(kExpectedMsg, events[0].msg);
324 } 324 }
325 325
326 websocket->DetachDelegate(); 326 websocket->DetachDelegate();
327 } 327 }
328 328
329 } // namespace net 329 } // namespace net
OLDNEW
« no previous file with comments | « net/socket_stream/socket_stream_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698