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

Unified Diff: net/socket/socks_client_socket_unittest.cc

Issue 9425016: Change MockRead and MockWrite (et. al.) to take an IoMode enum, instead (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: sync Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/socket/socks_client_socket_pool_unittest.cc ('k') | net/socket/ssl_client_socket_pool_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/socks_client_socket_unittest.cc
===================================================================
--- net/socket/socks_client_socket_unittest.cc (revision 123143)
+++ net/socket/socks_client_socket_unittest.cc (working copy)
@@ -127,11 +127,11 @@
const std::string payload_read = "moar random data";
MockWrite data_writes[] = {
- MockWrite(true, kSOCKSOkRequest, arraysize(kSOCKSOkRequest)),
- MockWrite(true, payload_write.data(), payload_write.size()) };
+ MockWrite(ASYNC, kSOCKSOkRequest, arraysize(kSOCKSOkRequest)),
+ MockWrite(ASYNC, payload_write.data(), payload_write.size()) };
MockRead data_reads[] = {
- MockRead(true, kSOCKSOkReply, arraysize(kSOCKSOkReply)),
- MockRead(true, payload_read.data(), payload_read.size()) };
+ MockRead(ASYNC, kSOCKSOkReply, arraysize(kSOCKSOkReply)),
+ MockRead(ASYNC, payload_read.data(), payload_read.size()) };
CapturingNetLog log(CapturingNetLog::kUnbounded);
user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads),
@@ -202,9 +202,10 @@
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
MockWrite data_writes[] = {
- MockWrite(false, kSOCKSOkRequest, arraysize(kSOCKSOkRequest)) };
+ MockWrite(SYNCHRONOUS, kSOCKSOkRequest, arraysize(kSOCKSOkRequest)) };
MockRead data_reads[] = {
- MockRead(false, tests[i].fail_reply, arraysize(tests[i].fail_reply)) };
+ MockRead(SYNCHRONOUS, tests[i].fail_reply,
+ arraysize(tests[i].fail_reply)) };
CapturingNetLog log(CapturingNetLog::kUnbounded);
user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads),
@@ -238,10 +239,10 @@
const char kSOCKSPartialReply2[] = { 0x5A, 0x00, 0x00, 0, 0, 0, 0 };
MockWrite data_writes[] = {
- MockWrite(true, kSOCKSOkRequest, arraysize(kSOCKSOkRequest)) };
+ MockWrite(ASYNC, kSOCKSOkRequest, arraysize(kSOCKSOkRequest)) };
MockRead data_reads[] = {
- MockRead(true, kSOCKSPartialReply1, arraysize(kSOCKSPartialReply1)),
- MockRead(true, kSOCKSPartialReply2, arraysize(kSOCKSPartialReply2)) };
+ MockRead(ASYNC, kSOCKSPartialReply1, arraysize(kSOCKSPartialReply1)),
+ MockRead(ASYNC, kSOCKSPartialReply2, arraysize(kSOCKSPartialReply2)) };
CapturingNetLog log(CapturingNetLog::kUnbounded);
user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads),
@@ -272,14 +273,14 @@
const char kSOCKSPartialRequest2[] = { 0x00, 0x50, 127, 0, 0, 1, 0 };
MockWrite data_writes[] = {
- MockWrite(true, arraysize(kSOCKSPartialRequest1)),
+ MockWrite(ASYNC, arraysize(kSOCKSPartialRequest1)),
// simulate some empty writes
- MockWrite(true, 0),
- MockWrite(true, 0),
- MockWrite(true, kSOCKSPartialRequest2,
+ MockWrite(ASYNC, 0),
+ MockWrite(ASYNC, 0),
+ MockWrite(ASYNC, kSOCKSPartialRequest2,
arraysize(kSOCKSPartialRequest2)) };
MockRead data_reads[] = {
- MockRead(true, kSOCKSOkReply, arraysize(kSOCKSOkReply)) };
+ MockRead(ASYNC, kSOCKSOkReply, arraysize(kSOCKSOkReply)) };
CapturingNetLog log(CapturingNetLog::kUnbounded);
user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads),
@@ -307,11 +308,11 @@
// and closes the connection.
TEST_F(SOCKSClientSocketTest, FailedSocketRead) {
MockWrite data_writes[] = {
- MockWrite(true, kSOCKSOkRequest, arraysize(kSOCKSOkRequest)) };
+ MockWrite(ASYNC, kSOCKSOkRequest, arraysize(kSOCKSOkRequest)) };
MockRead data_reads[] = {
- MockRead(true, kSOCKSOkReply, arraysize(kSOCKSOkReply) - 2),
+ MockRead(ASYNC, kSOCKSOkReply, arraysize(kSOCKSOkReply) - 2),
// close connection unexpectedly
- MockRead(false, 0) };
+ MockRead(SYNCHRONOUS, 0) };
CapturingNetLog log(CapturingNetLog::kUnbounded);
user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads),
@@ -372,8 +373,8 @@
new HangingHostResolverWithCancel());
// Doesn't matter what the socket data is, we will never use it -- garbage.
- MockWrite data_writes[] = { MockWrite(false, "", 0) };
- MockRead data_reads[] = { MockRead(false, "", 0) };
+ MockWrite data_writes[] = { MockWrite(SYNCHRONOUS, "", 0) };
+ MockRead data_reads[] = { MockRead(SYNCHRONOUS, "", 0) };
user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads),
data_writes, arraysize(data_writes),
« no previous file with comments | « net/socket/socks_client_socket_pool_unittest.cc ('k') | net/socket/ssl_client_socket_pool_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698