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

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

Issue 582020: Add bounds checking to StaticSocketDataProvider, to make tests more reliable (Closed)
Patch Set: Created 10 years, 10 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
« no previous file with comments | « net/spdy/spdy_network_transaction_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')
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 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 }; 141 };
142 MockWrite data_writes[] = { 142 MockWrite data_writes[] = {
143 MockWrite("GET /demo HTTP/1.1\r\n" 143 MockWrite("GET /demo HTTP/1.1\r\n"
144 "Upgrade: WebSocket\r\n" 144 "Upgrade: WebSocket\r\n"
145 "Connection: Upgrade\r\n" 145 "Connection: Upgrade\r\n"
146 "Host: example.com\r\n" 146 "Host: example.com\r\n"
147 "Origin: http://example.com\r\n" 147 "Origin: http://example.com\r\n"
148 "WebSocket-Protocol: sample\r\n" 148 "WebSocket-Protocol: sample\r\n"
149 "\r\n"), 149 "\r\n"),
150 }; 150 };
151 StaticSocketDataProvider data(data_reads, data_writes); 151 StaticSocketDataProvider data(data_reads, arraysize(data_reads),
152 data_writes, arraysize(data_writes));
152 mock_socket_factory.AddSocketDataProvider(&data); 153 mock_socket_factory.AddSocketDataProvider(&data);
153 154
154 WebSocket::Request* request( 155 WebSocket::Request* request(
155 new WebSocket::Request(GURL("ws://example.com/demo"), 156 new WebSocket::Request(GURL("ws://example.com/demo"),
156 "sample", 157 "sample",
157 "http://example.com", 158 "http://example.com",
158 "ws://example.com/demo", 159 "ws://example.com/demo",
159 new TestURLRequestContext())); 160 new TestURLRequestContext()));
160 request->SetHostResolver(new MockHostResolver()); 161 request->SetHostResolver(new MockHostResolver());
161 request->SetClientSocketFactory(&mock_socket_factory); 162 request->SetClientSocketFactory(&mock_socket_factory);
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 }; 202 };
202 MockWrite data_writes[] = { 203 MockWrite data_writes[] = {
203 MockWrite("GET /demo HTTP/1.1\r\n" 204 MockWrite("GET /demo HTTP/1.1\r\n"
204 "Upgrade: WebSocket\r\n" 205 "Upgrade: WebSocket\r\n"
205 "Connection: Upgrade\r\n" 206 "Connection: Upgrade\r\n"
206 "Host: example.com\r\n" 207 "Host: example.com\r\n"
207 "Origin: http://example.com\r\n" 208 "Origin: http://example.com\r\n"
208 "WebSocket-Protocol: sample\r\n" 209 "WebSocket-Protocol: sample\r\n"
209 "\r\n"), 210 "\r\n"),
210 }; 211 };
211 StaticSocketDataProvider data(data_reads, data_writes); 212 StaticSocketDataProvider data(data_reads, arraysize(data_reads),
213 data_writes, arraysize(data_writes));
212 mock_socket_factory.AddSocketDataProvider(&data); 214 mock_socket_factory.AddSocketDataProvider(&data);
213 215
214 WebSocket::Request* request( 216 WebSocket::Request* request(
215 new WebSocket::Request(GURL("ws://example.com/demo"), 217 new WebSocket::Request(GURL("ws://example.com/demo"),
216 "sample", 218 "sample",
217 "http://example.com", 219 "http://example.com",
218 "ws://example.com/demo", 220 "ws://example.com/demo",
219 new TestURLRequestContext())); 221 new TestURLRequestContext()));
220 request->SetHostResolver(new MockHostResolver()); 222 request->SetHostResolver(new MockHostResolver());
221 request->SetClientSocketFactory(&mock_socket_factory); 223 request->SetClientSocketFactory(&mock_socket_factory);
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
446 "sample", 448 "sample",
447 "http://example.com", 449 "http://example.com",
448 "wss://example.com/demo", 450 "wss://example.com/demo",
449 NULL); 451 NULL);
450 // :80 should be preserved as it's not the default port for wss://. 452 // :80 should be preserved as it's not the default port for wss://.
451 EXPECT_THAT(request.CreateClientHandshakeMessage(), 453 EXPECT_THAT(request.CreateClientHandshakeMessage(),
452 testing::HasSubstr("Host: example.com:80\r\n")); 454 testing::HasSubstr("Host: example.com:80\r\n"));
453 } 455 }
454 456
455 } // namespace net 457 } // namespace net
OLDNEW
« no previous file with comments | « net/spdy/spdy_network_transaction_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698