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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/socket/deterministic_socket_data_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/client_socket_pool_manager_impl.cc ('k') | net/socket/mock_client_socket_pool_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/deterministic_socket_data_unittest.cc
diff --git a/net/socket/deterministic_socket_data_unittest.cc b/net/socket/deterministic_socket_data_unittest.cc
index c51427e25a7e878ed6930a645d371da9c71235a0..41036d8248dd1d046b62da1b9681a3d4c14d01ff 100644
--- a/net/socket/deterministic_socket_data_unittest.cc
+++ b/net/socket/deterministic_socket_data_unittest.cc
@@ -35,7 +35,9 @@ class DeterministicSocketDataTest : public PlatformTest {
void ReentrantWriteCallback(const char* data, int len, int rv);
protected:
- void Initialize(MockRead* reads, size_t reads_count, MockWrite* writes,
+ void Initialize(MockRead* reads,
+ size_t reads_count,
+ MockWrite* writes,
size_t writes_count);
void AssertSyncReadEquals(const char* data, int len);
@@ -76,7 +78,8 @@ DeterministicSocketDataTest::DeterministicSocketDataTest()
false,
OnHostResolutionCallback())),
histograms_(std::string()),
- socket_pool_(10, 10, &histograms_, &socket_factory_) {}
+ socket_pool_(10, 10, &histograms_, &socket_factory_) {
+}
void DeterministicSocketDataTest::TearDown() {
// Empty the current queue.
@@ -85,17 +88,18 @@ void DeterministicSocketDataTest::TearDown() {
}
void DeterministicSocketDataTest::Initialize(MockRead* reads,
- size_t reads_count,
- MockWrite* writes,
- size_t writes_count) {
- data_.reset(new DeterministicSocketData(reads, reads_count,
- writes, writes_count));
+ size_t reads_count,
+ MockWrite* writes,
+ size_t writes_count) {
+ data_.reset(
+ new DeterministicSocketData(reads, reads_count, writes, writes_count));
data_->set_connect_data(connect_data_);
socket_factory_.AddSocketDataProvider(data_.get());
// Perform the TCP connect
EXPECT_EQ(OK,
- connection_.Init(endpoint_.ToString(),
+ connection_.Init(
+ endpoint_.ToString(),
tcp_params_,
LOWEST,
CompletionCallback(),
@@ -126,7 +130,8 @@ void DeterministicSocketDataTest::AssertAsyncReadEquals(const char* data,
}
void DeterministicSocketDataTest::AssertReadReturns(const char* data,
- int len, int rv) {
+ int len,
+ int rv) {
read_buf_ = new IOBuffer(len);
ASSERT_EQ(rv, sock_->Read(read_buf_.get(), len, read_callback_.callback()));
}
@@ -137,7 +142,7 @@ void DeterministicSocketDataTest::AssertReadBufferEquals(const char* data,
}
void DeterministicSocketDataTest::AssertSyncWriteEquals(const char* data,
- int len) {
+ int len) {
scoped_refptr<IOBuffer> buf(new IOBuffer(len));
memcpy(buf->data(), data, len);
@@ -158,7 +163,8 @@ void DeterministicSocketDataTest::AssertAsyncWriteEquals(const char* data,
}
void DeterministicSocketDataTest::AssertWriteReturns(const char* data,
- int len, int rv) {
+ int len,
+ int rv) {
scoped_refptr<IOBuffer> buf(new IOBuffer(len));
memcpy(buf->data(), data, len);
@@ -177,8 +183,9 @@ void DeterministicSocketDataTest::ReentrantReadCallback(int len, int rv) {
len)));
}
-void DeterministicSocketDataTest::ReentrantWriteCallback(
- const char* data, int len, int rv) {
+void DeterministicSocketDataTest::ReentrantWriteCallback(const char* data,
+ int len,
+ int rv) {
scoped_refptr<IOBuffer> write_buf(new IOBuffer(len));
memcpy(write_buf->data(), data, len);
EXPECT_EQ(len,
@@ -195,8 +202,8 @@ void DeterministicSocketDataTest::ReentrantWriteCallback(
TEST_F(DeterministicSocketDataTest, SingleSyncReadWhileStopped) {
MockRead reads[] = {
- MockRead(SYNCHRONOUS, kMsg1, kLen1, 0), // Sync Read
- MockRead(SYNCHRONOUS, 0, 1), // EOF
+ MockRead(SYNCHRONOUS, kMsg1, kLen1, 0), // Sync Read
+ MockRead(SYNCHRONOUS, 0, 1), // EOF
};
Initialize(reads, arraysize(reads), NULL, 0);
@@ -207,13 +214,11 @@ TEST_F(DeterministicSocketDataTest, SingleSyncReadWhileStopped) {
TEST_F(DeterministicSocketDataTest, SingleSyncReadTooEarly) {
MockRead reads[] = {
- MockRead(SYNCHRONOUS, kMsg1, kLen1, 1), // Sync Read
- MockRead(SYNCHRONOUS, 0, 2), // EOF
+ MockRead(SYNCHRONOUS, kMsg1, kLen1, 1), // Sync Read
+ MockRead(SYNCHRONOUS, 0, 2), // EOF
};
- MockWrite writes[] = {
- MockWrite(SYNCHRONOUS, 0, 0)
- };
+ MockWrite writes[] = {MockWrite(SYNCHRONOUS, 0, 0)};
Initialize(reads, arraysize(reads), writes, arraysize(writes));
@@ -224,8 +229,8 @@ TEST_F(DeterministicSocketDataTest, SingleSyncReadTooEarly) {
TEST_F(DeterministicSocketDataTest, SingleSyncRead) {
MockRead reads[] = {
- MockRead(SYNCHRONOUS, kMsg1, kLen1, 0), // Sync Read
- MockRead(SYNCHRONOUS, 0, 1), // EOF
+ MockRead(SYNCHRONOUS, kMsg1, kLen1, 0), // Sync Read
+ MockRead(SYNCHRONOUS, 0, 1), // EOF
};
Initialize(reads, arraysize(reads), NULL, 0);
@@ -236,14 +241,14 @@ TEST_F(DeterministicSocketDataTest, SingleSyncRead) {
TEST_F(DeterministicSocketDataTest, MultipleSyncReads) {
MockRead reads[] = {
- MockRead(SYNCHRONOUS, kMsg1, kLen1, 0), // Sync Read
- MockRead(SYNCHRONOUS, kMsg2, kLen2, 1), // Sync Read
- MockRead(SYNCHRONOUS, kMsg3, kLen3, 2), // Sync Read
- MockRead(SYNCHRONOUS, kMsg3, kLen3, 3), // Sync Read
- MockRead(SYNCHRONOUS, kMsg2, kLen2, 4), // Sync Read
- MockRead(SYNCHRONOUS, kMsg3, kLen3, 5), // Sync Read
- MockRead(SYNCHRONOUS, kMsg1, kLen1, 6), // Sync Read
- MockRead(SYNCHRONOUS, 0, 7), // EOF
+ MockRead(SYNCHRONOUS, kMsg1, kLen1, 0), // Sync Read
+ MockRead(SYNCHRONOUS, kMsg2, kLen2, 1), // Sync Read
+ MockRead(SYNCHRONOUS, kMsg3, kLen3, 2), // Sync Read
+ MockRead(SYNCHRONOUS, kMsg3, kLen3, 3), // Sync Read
+ MockRead(SYNCHRONOUS, kMsg2, kLen2, 4), // Sync Read
+ MockRead(SYNCHRONOUS, kMsg3, kLen3, 5), // Sync Read
+ MockRead(SYNCHRONOUS, kMsg1, kLen1, 6), // Sync Read
+ MockRead(SYNCHRONOUS, 0, 7), // EOF
};
Initialize(reads, arraysize(reads), NULL, 0);
@@ -261,8 +266,8 @@ TEST_F(DeterministicSocketDataTest, MultipleSyncReads) {
TEST_F(DeterministicSocketDataTest, SingleAsyncRead) {
MockRead reads[] = {
- MockRead(ASYNC, kMsg1, kLen1, 0), // Async Read
- MockRead(SYNCHRONOUS, 0, 1), // EOF
+ MockRead(ASYNC, kMsg1, kLen1, 0), // Async Read
+ MockRead(SYNCHRONOUS, 0, 1), // EOF
};
Initialize(reads, arraysize(reads), NULL, 0);
@@ -279,7 +284,7 @@ TEST_F(DeterministicSocketDataTest, MultipleAsyncReads) {
MockRead(ASYNC, kMsg2, kLen2, 4), // Async Read
MockRead(ASYNC, kMsg3, kLen3, 5), // Async Read
MockRead(ASYNC, kMsg1, kLen1, 6), // Async Read
- MockRead(SYNCHRONOUS, 0, 7), // EOF
+ MockRead(SYNCHRONOUS, 0, 7), // EOF
};
Initialize(reads, arraysize(reads), NULL, 0);
@@ -296,13 +301,13 @@ TEST_F(DeterministicSocketDataTest, MultipleAsyncReads) {
TEST_F(DeterministicSocketDataTest, MixedReads) {
MockRead reads[] = {
MockRead(SYNCHRONOUS, kMsg1, kLen1, 0), // Sync Read
- MockRead(ASYNC, kMsg2, kLen2, 1), // Async Read
+ MockRead(ASYNC, kMsg2, kLen2, 1), // Async Read
MockRead(SYNCHRONOUS, kMsg3, kLen3, 2), // Sync Read
- MockRead(ASYNC, kMsg3, kLen3, 3), // Async Read
+ MockRead(ASYNC, kMsg3, kLen3, 3), // Async Read
MockRead(SYNCHRONOUS, kMsg2, kLen2, 4), // Sync Read
- MockRead(ASYNC, kMsg3, kLen3, 5), // Async Read
+ MockRead(ASYNC, kMsg3, kLen3, 5), // Async Read
MockRead(SYNCHRONOUS, kMsg1, kLen1, 6), // Sync Read
- MockRead(SYNCHRONOUS, 0, 7), // EOF
+ MockRead(SYNCHRONOUS, 0, 7), // EOF
};
Initialize(reads, arraysize(reads), NULL, 0);
@@ -322,7 +327,7 @@ TEST_F(DeterministicSocketDataTest, MixedReads) {
TEST_F(DeterministicSocketDataTest, SyncReadFromCompletionCallback) {
MockRead reads[] = {
- MockRead(ASYNC, kMsg1, kLen1, 0), // Async Read
+ MockRead(ASYNC, kMsg1, kLen1, 0), // Async Read
MockRead(SYNCHRONOUS, kMsg2, kLen2, 1), // Sync Read
};
@@ -345,7 +350,7 @@ TEST_F(DeterministicSocketDataTest, SyncReadFromCompletionCallback) {
TEST_F(DeterministicSocketDataTest, SingleSyncWriteWhileStopped) {
MockWrite writes[] = {
- MockWrite(SYNCHRONOUS, kMsg1, kLen1, 0), // Sync Read
+ MockWrite(SYNCHRONOUS, kMsg1, kLen1, 0), // Sync Read
};
Initialize(NULL, 0, writes, arraysize(writes));
@@ -356,12 +361,10 @@ TEST_F(DeterministicSocketDataTest, SingleSyncWriteWhileStopped) {
TEST_F(DeterministicSocketDataTest, SingleSyncWriteTooEarly) {
MockWrite writes[] = {
- MockWrite(SYNCHRONOUS, kMsg1, kLen1, 1), // Sync Write
+ MockWrite(SYNCHRONOUS, kMsg1, kLen1, 1), // Sync Write
};
- MockRead reads[] = {
- MockRead(SYNCHRONOUS, 0, 0)
- };
+ MockRead reads[] = {MockRead(SYNCHRONOUS, 0, 0)};
Initialize(reads, arraysize(reads), writes, arraysize(writes));
@@ -372,7 +375,7 @@ TEST_F(DeterministicSocketDataTest, SingleSyncWriteTooEarly) {
TEST_F(DeterministicSocketDataTest, SingleSyncWrite) {
MockWrite writes[] = {
- MockWrite(SYNCHRONOUS, kMsg1, kLen1, 0), // Sync Write
+ MockWrite(SYNCHRONOUS, kMsg1, kLen1, 0), // Sync Write
};
Initialize(NULL, 0, writes, arraysize(writes));
@@ -384,13 +387,13 @@ TEST_F(DeterministicSocketDataTest, SingleSyncWrite) {
TEST_F(DeterministicSocketDataTest, MultipleSyncWrites) {
MockWrite writes[] = {
- MockWrite(SYNCHRONOUS, kMsg1, kLen1, 0), // Sync Write
- MockWrite(SYNCHRONOUS, kMsg2, kLen2, 1), // Sync Write
- MockWrite(SYNCHRONOUS, kMsg3, kLen3, 2), // Sync Write
- MockWrite(SYNCHRONOUS, kMsg3, kLen3, 3), // Sync Write
- MockWrite(SYNCHRONOUS, kMsg2, kLen2, 4), // Sync Write
- MockWrite(SYNCHRONOUS, kMsg3, kLen3, 5), // Sync Write
- MockWrite(SYNCHRONOUS, kMsg1, kLen1, 6), // Sync Write
+ MockWrite(SYNCHRONOUS, kMsg1, kLen1, 0), // Sync Write
+ MockWrite(SYNCHRONOUS, kMsg2, kLen2, 1), // Sync Write
+ MockWrite(SYNCHRONOUS, kMsg3, kLen3, 2), // Sync Write
+ MockWrite(SYNCHRONOUS, kMsg3, kLen3, 3), // Sync Write
+ MockWrite(SYNCHRONOUS, kMsg2, kLen2, 4), // Sync Write
+ MockWrite(SYNCHRONOUS, kMsg3, kLen3, 5), // Sync Write
+ MockWrite(SYNCHRONOUS, kMsg1, kLen1, 6), // Sync Write
};
Initialize(NULL, 0, writes, arraysize(writes));
@@ -408,7 +411,7 @@ TEST_F(DeterministicSocketDataTest, MultipleSyncWrites) {
TEST_F(DeterministicSocketDataTest, SingleAsyncWrite) {
MockWrite writes[] = {
- MockWrite(ASYNC, kMsg1, kLen1, 0), // Async Write
+ MockWrite(ASYNC, kMsg1, kLen1, 0), // Async Write
};
Initialize(NULL, 0, writes, arraysize(writes));
@@ -418,13 +421,13 @@ TEST_F(DeterministicSocketDataTest, SingleAsyncWrite) {
TEST_F(DeterministicSocketDataTest, MultipleAsyncWrites) {
MockWrite writes[] = {
- MockWrite(ASYNC, kMsg1, kLen1, 0), // Async Write
- MockWrite(ASYNC, kMsg2, kLen2, 1), // Async Write
- MockWrite(ASYNC, kMsg3, kLen3, 2), // Async Write
- MockWrite(ASYNC, kMsg3, kLen3, 3), // Async Write
- MockWrite(ASYNC, kMsg2, kLen2, 4), // Async Write
- MockWrite(ASYNC, kMsg3, kLen3, 5), // Async Write
- MockWrite(ASYNC, kMsg1, kLen1, 6), // Async Write
+ MockWrite(ASYNC, kMsg1, kLen1, 0), // Async Write
+ MockWrite(ASYNC, kMsg2, kLen2, 1), // Async Write
+ MockWrite(ASYNC, kMsg3, kLen3, 2), // Async Write
+ MockWrite(ASYNC, kMsg3, kLen3, 3), // Async Write
+ MockWrite(ASYNC, kMsg2, kLen2, 4), // Async Write
+ MockWrite(ASYNC, kMsg3, kLen3, 5), // Async Write
+ MockWrite(ASYNC, kMsg1, kLen1, 6), // Async Write
};
Initialize(NULL, 0, writes, arraysize(writes));
@@ -440,13 +443,13 @@ TEST_F(DeterministicSocketDataTest, MultipleAsyncWrites) {
TEST_F(DeterministicSocketDataTest, MixedWrites) {
MockWrite writes[] = {
- MockWrite(SYNCHRONOUS, kMsg1, kLen1, 0), // Sync Write
- MockWrite(ASYNC, kMsg2, kLen2, 1), // Async Write
- MockWrite(SYNCHRONOUS, kMsg3, kLen3, 2), // Sync Write
- MockWrite(ASYNC, kMsg3, kLen3, 3), // Async Write
- MockWrite(SYNCHRONOUS, kMsg2, kLen2, 4), // Sync Write
- MockWrite(ASYNC, kMsg3, kLen3, 5), // Async Write
- MockWrite(SYNCHRONOUS, kMsg1, kLen1, 6), // Sync Write
+ MockWrite(SYNCHRONOUS, kMsg1, kLen1, 0), // Sync Write
+ MockWrite(ASYNC, kMsg2, kLen2, 1), // Async Write
+ MockWrite(SYNCHRONOUS, kMsg3, kLen3, 2), // Sync Write
+ MockWrite(ASYNC, kMsg3, kLen3, 3), // Async Write
+ MockWrite(SYNCHRONOUS, kMsg2, kLen2, 4), // Sync Write
+ MockWrite(ASYNC, kMsg3, kLen3, 5), // Async Write
+ MockWrite(SYNCHRONOUS, kMsg1, kLen1, 6), // Sync Write
};
Initialize(NULL, 0, writes, arraysize(writes));
@@ -466,8 +469,8 @@ TEST_F(DeterministicSocketDataTest, MixedWrites) {
TEST_F(DeterministicSocketDataTest, SyncWriteFromCompletionCallback) {
MockWrite writes[] = {
- MockWrite(ASYNC, kMsg1, kLen1, 0), // Async Write
- MockWrite(SYNCHRONOUS, kMsg2, kLen2, 1), // Sync Write
+ MockWrite(ASYNC, kMsg1, kLen1, 0), // Async Write
+ MockWrite(SYNCHRONOUS, kMsg2, kLen2, 1), // Sync Write
};
Initialize(NULL, 0, writes, arraysize(writes));
@@ -491,14 +494,14 @@ TEST_F(DeterministicSocketDataTest, SyncWriteFromCompletionCallback) {
TEST_F(DeterministicSocketDataTest, MixedSyncOperations) {
MockRead reads[] = {
- MockRead(SYNCHRONOUS, kMsg1, kLen1, 0), // Sync Read
- MockRead(SYNCHRONOUS, kMsg2, kLen2, 3), // Sync Read
- MockRead(SYNCHRONOUS, 0, 4), // EOF
+ MockRead(SYNCHRONOUS, kMsg1, kLen1, 0), // Sync Read
+ MockRead(SYNCHRONOUS, kMsg2, kLen2, 3), // Sync Read
+ MockRead(SYNCHRONOUS, 0, 4), // EOF
};
MockWrite writes[] = {
- MockWrite(SYNCHRONOUS, kMsg2, kLen2, 1), // Sync Write
- MockWrite(SYNCHRONOUS, kMsg3, kLen3, 2), // Sync Write
+ MockWrite(SYNCHRONOUS, kMsg2, kLen2, 1), // Sync Write
+ MockWrite(SYNCHRONOUS, kMsg3, kLen3, 2), // Sync Write
};
Initialize(reads, arraysize(reads), writes, arraysize(writes));
@@ -513,14 +516,14 @@ TEST_F(DeterministicSocketDataTest, MixedSyncOperations) {
TEST_F(DeterministicSocketDataTest, MixedAsyncOperations) {
MockRead reads[] = {
- MockRead(ASYNC, kMsg1, kLen1, 0), // Sync Read
- MockRead(ASYNC, kMsg2, kLen2, 3), // Sync Read
- MockRead(ASYNC, 0, 4), // EOF
+ MockRead(ASYNC, kMsg1, kLen1, 0), // Sync Read
+ MockRead(ASYNC, kMsg2, kLen2, 3), // Sync Read
+ MockRead(ASYNC, 0, 4), // EOF
};
MockWrite writes[] = {
- MockWrite(ASYNC, kMsg2, kLen2, 1), // Sync Write
- MockWrite(ASYNC, kMsg3, kLen3, 2), // Sync Write
+ MockWrite(ASYNC, kMsg2, kLen2, 1), // Sync Write
+ MockWrite(ASYNC, kMsg3, kLen3, 2), // Sync Write
};
Initialize(reads, arraysize(reads), writes, arraysize(writes));
@@ -534,14 +537,14 @@ TEST_F(DeterministicSocketDataTest, MixedAsyncOperations) {
TEST_F(DeterministicSocketDataTest, InterleavedAsyncOperations) {
// Order of completion is read, write, write, read
MockRead reads[] = {
- MockRead(ASYNC, kMsg1, kLen1, 0), // Async Read
- MockRead(ASYNC, kMsg2, kLen2, 3), // Async Read
- MockRead(ASYNC, 0, 4), // EOF
+ MockRead(ASYNC, kMsg1, kLen1, 0), // Async Read
+ MockRead(ASYNC, kMsg2, kLen2, 3), // Async Read
+ MockRead(ASYNC, 0, 4), // EOF
};
MockWrite writes[] = {
- MockWrite(ASYNC, kMsg2, kLen2, 1), // Async Write
- MockWrite(ASYNC, kMsg3, kLen3, 2), // Async Write
+ MockWrite(ASYNC, kMsg2, kLen2, 1), // Async Write
+ MockWrite(ASYNC, kMsg3, kLen3, 2), // Async Write
};
Initialize(reads, arraysize(reads), writes, arraysize(writes));
@@ -581,14 +584,14 @@ TEST_F(DeterministicSocketDataTest, InterleavedAsyncOperations) {
TEST_F(DeterministicSocketDataTest, InterleavedMixedOperations) {
// Order of completion is read, write, write, read
MockRead reads[] = {
- MockRead(SYNCHRONOUS, kMsg1, kLen1, 0), // Sync Read
- MockRead(ASYNC, kMsg2, kLen2, 3), // Async Read
- MockRead(SYNCHRONOUS, 0, 4), // EOF
+ MockRead(SYNCHRONOUS, kMsg1, kLen1, 0), // Sync Read
+ MockRead(ASYNC, kMsg2, kLen2, 3), // Async Read
+ MockRead(SYNCHRONOUS, 0, 4), // EOF
};
MockWrite writes[] = {
- MockWrite(ASYNC, kMsg2, kLen2, 1), // Async Write
- MockWrite(SYNCHRONOUS, kMsg3, kLen3, 2), // Sync Write
+ MockWrite(ASYNC, kMsg2, kLen2, 1), // Async Write
+ MockWrite(SYNCHRONOUS, kMsg3, kLen3, 2), // Sync Write
};
Initialize(reads, arraysize(reads), writes, arraysize(writes));
« net/base/mime_util_unittest.cc ('K') | « net/socket/client_socket_pool_manager_impl.cc ('k') | net/socket/mock_client_socket_pool_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698