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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/socket/socks5_client_socket_unittest.cc

Issue 266243004: Clang format slam. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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
« net/base/mime_util_unittest.cc ('K') | « net/socket/socks5_client_socket.cc ('k') | net/socket/socks_client_socket.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/socks5_client_socket_unittest.cc
diff --git a/net/socket/socks5_client_socket_unittest.cc b/net/socket/socks5_client_socket_unittest.cc
index 78f2ac433c3c5322da62bd481f75939a9ecfbec3..fb6f02fa6716661dcd2d03d90f68cadd27bcc4d2 100644
--- a/net/socket/socks5_client_socket_unittest.cc
+++ b/net/socket/socks5_client_socket_unittest.cc
@@ -59,8 +59,7 @@ class SOCKS5ClientSocketTest : public PlatformTest {
};
SOCKS5ClientSocketTest::SOCKS5ClientSocketTest()
- : kNwPort(base::HostToNet16(80)),
- host_resolver_(new MockHostResolver) {
+ : kNwPort(base::HostToNet16(80)), host_resolver_(new MockHostResolver) {
}
// Set up platform before every test case
@@ -90,8 +89,8 @@ scoped_ptr<SOCKS5ClientSocket> SOCKS5ClientSocketTest::BuildMockSocket(
int port,
NetLog* net_log) {
TestCompletionCallback callback;
- data_.reset(new StaticSocketDataProvider(reads, reads_count,
- writes, writes_count));
+ data_.reset(
+ new StaticSocketDataProvider(reads, reads_count, writes, writes_count));
tcp_sock_ = new MockTCPClientSocket(address_list_, net_log, data_.get());
int rv = tcp_sock_->Connect(callback.callback());
@@ -115,28 +114,32 @@ TEST_F(SOCKS5ClientSocketTest, CompleteHandshake) {
const std::string payload_read = "moar random data";
const char kOkRequest[] = {
- 0x05, // Version
- 0x01, // Command (CONNECT)
- 0x00, // Reserved.
- 0x03, // Address type (DOMAINNAME).
- 0x09, // Length of domain (9)
- // Domain string:
- 'l', 'o', 'c', 'a', 'l', 'h', 'o', 's', 't',
- 0x00, 0x50, // 16-bit port (80)
+ 0x05, // Version
+ 0x01, // Command (CONNECT)
+ 0x00, // Reserved.
+ 0x03, // Address type (DOMAINNAME).
+ 0x09, // Length of domain (9)
+ // Domain string:
+ 'l', 'o', 'c', 'a', 'l', 'h',
+ 'o', 's', 't', 0x00, 0x50, // 16-bit port (80)
};
MockWrite data_writes[] = {
MockWrite(ASYNC, kSOCKS5GreetRequest, kSOCKS5GreetRequestLength),
MockWrite(ASYNC, kOkRequest, arraysize(kOkRequest)),
- MockWrite(ASYNC, payload_write.data(), payload_write.size()) };
+ MockWrite(ASYNC, payload_write.data(), payload_write.size())};
MockRead data_reads[] = {
MockRead(ASYNC, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength),
MockRead(ASYNC, kSOCKS5OkResponse, kSOCKS5OkResponseLength),
- MockRead(ASYNC, payload_read.data(), payload_read.size()) };
+ MockRead(ASYNC, payload_read.data(), payload_read.size())};
- user_sock_ = BuildMockSocket(data_reads, arraysize(data_reads),
- data_writes, arraysize(data_writes),
- "localhost", 80, &net_log_);
+ user_sock_ = BuildMockSocket(data_reads,
+ arraysize(data_reads),
+ data_writes,
+ arraysize(data_writes),
+ "localhost",
+ 80,
+ &net_log_);
// At this state the TCP connection is completed but not the SOCKS handshake.
EXPECT_TRUE(tcp_sock_->IsConnected());
@@ -148,8 +151,8 @@ TEST_F(SOCKS5ClientSocketTest, CompleteHandshake) {
CapturingNetLog::CapturedEntryList net_log_entries;
net_log_.GetEntries(&net_log_entries);
- EXPECT_TRUE(LogContainsBeginEvent(net_log_entries, 0,
- NetLog::TYPE_SOCKS5_CONNECT));
+ EXPECT_TRUE(
+ LogContainsBeginEvent(net_log_entries, 0, NetLog::TYPE_SOCKS5_CONNECT));
rv = callback_.WaitForResult();
@@ -157,8 +160,8 @@ TEST_F(SOCKS5ClientSocketTest, CompleteHandshake) {
EXPECT_TRUE(user_sock_->IsConnected());
net_log_.GetEntries(&net_log_entries);
- EXPECT_TRUE(LogContainsEndEvent(net_log_entries, -1,
- NetLog::TYPE_SOCKS5_CONNECT));
+ EXPECT_TRUE(
+ LogContainsEndEvent(net_log_entries, -1, NetLog::TYPE_SOCKS5_CONNECT));
scoped_refptr<IOBuffer> buffer(new IOBuffer(payload_write.size()));
memcpy(buffer->data(), payload_write.data(), payload_write.size());
@@ -199,16 +202,18 @@ TEST_F(SOCKS5ClientSocketTest, ConnectAndDisconnectTwice) {
for (int i = 0; i < 2; ++i) {
MockWrite data_writes[] = {
MockWrite(SYNCHRONOUS, kSOCKS5GreetRequest, kSOCKS5GreetRequestLength),
- MockWrite(SYNCHRONOUS, request.data(), request.size())
- };
+ MockWrite(SYNCHRONOUS, request.data(), request.size())};
MockRead data_reads[] = {
MockRead(SYNCHRONOUS, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength),
- MockRead(SYNCHRONOUS, kSOCKS5OkResponse, kSOCKS5OkResponseLength)
- };
+ MockRead(SYNCHRONOUS, kSOCKS5OkResponse, kSOCKS5OkResponseLength)};
- user_sock_ = BuildMockSocket(data_reads, arraysize(data_reads),
- data_writes, arraysize(data_writes),
- hostname, 80, NULL);
+ user_sock_ = BuildMockSocket(data_reads,
+ arraysize(data_reads),
+ data_writes,
+ arraysize(data_writes),
+ hostname,
+ 80,
+ NULL);
int rv = user_sock_->Connect(callback_.callback());
EXPECT_EQ(OK, rv);
@@ -228,9 +233,13 @@ TEST_F(SOCKS5ClientSocketTest, LargeHostNameFails) {
// Create a SOCKS socket, with mock transport socket.
MockWrite data_writes[] = {MockWrite()};
MockRead data_reads[] = {MockRead()};
- user_sock_ = BuildMockSocket(data_reads, arraysize(data_reads),
- data_writes, arraysize(data_writes),
- large_host_name, 80, NULL);
+ user_sock_ = BuildMockSocket(data_reads,
+ arraysize(data_reads),
+ data_writes,
+ arraysize(data_writes),
+ large_host_name,
+ 80,
+ NULL);
// Try to connect -- should fail (without having read/written anything to
// the transport socket first) because the hostname is too long.
@@ -243,74 +252,82 @@ TEST_F(SOCKS5ClientSocketTest, PartialReadWrites) {
const std::string hostname = "www.google.com";
const char kOkRequest[] = {
- 0x05, // Version
- 0x01, // Command (CONNECT)
- 0x00, // Reserved.
- 0x03, // Address type (DOMAINNAME).
- 0x0E, // Length of domain (14)
- // Domain string:
- 'w', 'w', 'w', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'c', 'o', 'm',
- 0x00, 0x50, // 16-bit port (80)
+ 0x05, // Version
+ 0x01, // Command (CONNECT)
+ 0x00, // Reserved.
+ 0x03, // Address type (DOMAINNAME).
+ 0x0E, // Length of domain (14)
+ // Domain string:
+ 'w', 'w', 'w', '.', 'g', 'o', 'o', 'g',
+ 'l', 'e', '.', 'c', 'o', 'm', 0x00, 0x50, // 16-bit port (80)
};
// Test for partial greet request write
{
- const char partial1[] = { 0x05, 0x01 };
- const char partial2[] = { 0x00 };
+ const char partial1[] = {0x05, 0x01};
+ const char partial2[] = {0x00};
MockWrite data_writes[] = {
MockWrite(ASYNC, arraysize(partial1)),
MockWrite(ASYNC, partial2, arraysize(partial2)),
- MockWrite(ASYNC, kOkRequest, arraysize(kOkRequest)) };
+ MockWrite(ASYNC, kOkRequest, arraysize(kOkRequest))};
MockRead data_reads[] = {
MockRead(ASYNC, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength),
- MockRead(ASYNC, kSOCKS5OkResponse, kSOCKS5OkResponseLength) };
- user_sock_ = BuildMockSocket(data_reads, arraysize(data_reads),
- data_writes, arraysize(data_writes),
- hostname, 80, &net_log_);
+ MockRead(ASYNC, kSOCKS5OkResponse, kSOCKS5OkResponseLength)};
+ user_sock_ = BuildMockSocket(data_reads,
+ arraysize(data_reads),
+ data_writes,
+ arraysize(data_writes),
+ hostname,
+ 80,
+ &net_log_);
int rv = user_sock_->Connect(callback_.callback());
EXPECT_EQ(ERR_IO_PENDING, rv);
CapturingNetLog::CapturedEntryList net_log_entries;
net_log_.GetEntries(&net_log_entries);
- EXPECT_TRUE(LogContainsBeginEvent(net_log_entries, 0,
- NetLog::TYPE_SOCKS5_CONNECT));
+ EXPECT_TRUE(
+ LogContainsBeginEvent(net_log_entries, 0, NetLog::TYPE_SOCKS5_CONNECT));
rv = callback_.WaitForResult();
EXPECT_EQ(OK, rv);
EXPECT_TRUE(user_sock_->IsConnected());
net_log_.GetEntries(&net_log_entries);
- EXPECT_TRUE(LogContainsEndEvent(net_log_entries, -1,
- NetLog::TYPE_SOCKS5_CONNECT));
+ EXPECT_TRUE(
+ LogContainsEndEvent(net_log_entries, -1, NetLog::TYPE_SOCKS5_CONNECT));
}
// Test for partial greet response read
{
- const char partial1[] = { 0x05 };
- const char partial2[] = { 0x00 };
+ const char partial1[] = {0x05};
+ const char partial2[] = {0x00};
MockWrite data_writes[] = {
MockWrite(ASYNC, kSOCKS5GreetRequest, kSOCKS5GreetRequestLength),
- MockWrite(ASYNC, kOkRequest, arraysize(kOkRequest)) };
+ MockWrite(ASYNC, kOkRequest, arraysize(kOkRequest))};
MockRead data_reads[] = {
MockRead(ASYNC, partial1, arraysize(partial1)),
MockRead(ASYNC, partial2, arraysize(partial2)),
- MockRead(ASYNC, kSOCKS5OkResponse, kSOCKS5OkResponseLength) };
- user_sock_ = BuildMockSocket(data_reads, arraysize(data_reads),
- data_writes, arraysize(data_writes),
- hostname, 80, &net_log_);
+ MockRead(ASYNC, kSOCKS5OkResponse, kSOCKS5OkResponseLength)};
+ user_sock_ = BuildMockSocket(data_reads,
+ arraysize(data_reads),
+ data_writes,
+ arraysize(data_writes),
+ hostname,
+ 80,
+ &net_log_);
int rv = user_sock_->Connect(callback_.callback());
EXPECT_EQ(ERR_IO_PENDING, rv);
CapturingNetLog::CapturedEntryList net_log_entries;
net_log_.GetEntries(&net_log_entries);
- EXPECT_TRUE(LogContainsBeginEvent(net_log_entries, 0,
- NetLog::TYPE_SOCKS5_CONNECT));
+ EXPECT_TRUE(
+ LogContainsBeginEvent(net_log_entries, 0, NetLog::TYPE_SOCKS5_CONNECT));
rv = callback_.WaitForResult();
EXPECT_EQ(OK, rv);
EXPECT_TRUE(user_sock_->IsConnected());
net_log_.GetEntries(&net_log_entries);
- EXPECT_TRUE(LogContainsEndEvent(net_log_entries, -1,
- NetLog::TYPE_SOCKS5_CONNECT));
+ EXPECT_TRUE(
+ LogContainsEndEvent(net_log_entries, -1, NetLog::TYPE_SOCKS5_CONNECT));
}
// Test for partial handshake request write.
@@ -319,27 +336,31 @@ TEST_F(SOCKS5ClientSocketTest, PartialReadWrites) {
MockWrite data_writes[] = {
MockWrite(ASYNC, kSOCKS5GreetRequest, kSOCKS5GreetRequestLength),
MockWrite(ASYNC, kOkRequest, kSplitPoint),
- MockWrite(ASYNC, kOkRequest + kSplitPoint,
- arraysize(kOkRequest) - kSplitPoint)
- };
+ MockWrite(ASYNC,
+ kOkRequest + kSplitPoint,
+ arraysize(kOkRequest) - kSplitPoint)};
MockRead data_reads[] = {
MockRead(ASYNC, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength),
- MockRead(ASYNC, kSOCKS5OkResponse, kSOCKS5OkResponseLength) };
- user_sock_ = BuildMockSocket(data_reads, arraysize(data_reads),
- data_writes, arraysize(data_writes),
- hostname, 80, &net_log_);
+ MockRead(ASYNC, kSOCKS5OkResponse, kSOCKS5OkResponseLength)};
+ user_sock_ = BuildMockSocket(data_reads,
+ arraysize(data_reads),
+ data_writes,
+ arraysize(data_writes),
+ hostname,
+ 80,
+ &net_log_);
int rv = user_sock_->Connect(callback_.callback());
EXPECT_EQ(ERR_IO_PENDING, rv);
CapturingNetLog::CapturedEntryList net_log_entries;
net_log_.GetEntries(&net_log_entries);
- EXPECT_TRUE(LogContainsBeginEvent(net_log_entries, 0,
- NetLog::TYPE_SOCKS5_CONNECT));
+ EXPECT_TRUE(
+ LogContainsBeginEvent(net_log_entries, 0, NetLog::TYPE_SOCKS5_CONNECT));
rv = callback_.WaitForResult();
EXPECT_EQ(OK, rv);
EXPECT_TRUE(user_sock_->IsConnected());
net_log_.GetEntries(&net_log_entries);
- EXPECT_TRUE(LogContainsEndEvent(net_log_entries, -1,
- NetLog::TYPE_SOCKS5_CONNECT));
+ EXPECT_TRUE(
+ LogContainsEndEvent(net_log_entries, -1, NetLog::TYPE_SOCKS5_CONNECT));
}
// Test for partial handshake response read
@@ -347,30 +368,33 @@ TEST_F(SOCKS5ClientSocketTest, PartialReadWrites) {
const int kSplitPoint = 6; // Break the handshake read into two parts.
MockWrite data_writes[] = {
MockWrite(ASYNC, kSOCKS5GreetRequest, kSOCKS5GreetRequestLength),
- MockWrite(ASYNC, kOkRequest, arraysize(kOkRequest))
- };
+ MockWrite(ASYNC, kOkRequest, arraysize(kOkRequest))};
MockRead data_reads[] = {
MockRead(ASYNC, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength),
MockRead(ASYNC, kSOCKS5OkResponse, kSplitPoint),
- MockRead(ASYNC, kSOCKS5OkResponse + kSplitPoint,
- kSOCKS5OkResponseLength - kSplitPoint)
- };
-
- user_sock_ = BuildMockSocket(data_reads, arraysize(data_reads),
- data_writes, arraysize(data_writes),
- hostname, 80, &net_log_);
+ MockRead(ASYNC,
+ kSOCKS5OkResponse + kSplitPoint,
+ kSOCKS5OkResponseLength - kSplitPoint)};
+
+ user_sock_ = BuildMockSocket(data_reads,
+ arraysize(data_reads),
+ data_writes,
+ arraysize(data_writes),
+ hostname,
+ 80,
+ &net_log_);
int rv = user_sock_->Connect(callback_.callback());
EXPECT_EQ(ERR_IO_PENDING, rv);
CapturingNetLog::CapturedEntryList net_log_entries;
net_log_.GetEntries(&net_log_entries);
- EXPECT_TRUE(LogContainsBeginEvent(net_log_entries, 0,
- NetLog::TYPE_SOCKS5_CONNECT));
+ EXPECT_TRUE(
+ LogContainsBeginEvent(net_log_entries, 0, NetLog::TYPE_SOCKS5_CONNECT));
rv = callback_.WaitForResult();
EXPECT_EQ(OK, rv);
EXPECT_TRUE(user_sock_->IsConnected());
net_log_.GetEntries(&net_log_entries);
- EXPECT_TRUE(LogContainsEndEvent(net_log_entries, -1,
- NetLog::TYPE_SOCKS5_CONNECT));
+ EXPECT_TRUE(
+ LogContainsEndEvent(net_log_entries, -1, NetLog::TYPE_SOCKS5_CONNECT));
}
}
« net/base/mime_util_unittest.cc ('K') | « net/socket/socks5_client_socket.cc ('k') | net/socket/socks_client_socket.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698