diff options
Diffstat (limited to 'net/socket')
| -rw-r--r-- | net/socket/deterministic_socket_data_unittest.cc | 154 | ||||
| -rw-r--r-- | net/socket/socket_test_util.cc | 72 | ||||
| -rw-r--r-- | net/socket/socket_test_util.h | 45 | ||||
| -rw-r--r-- | net/socket/socks5_client_socket_unittest.cc | 62 | ||||
| -rw-r--r-- | net/socket/socks_client_socket_pool_unittest.cc | 30 | ||||
| -rw-r--r-- | net/socket/socks_client_socket_unittest.cc | 41 | ||||
| -rw-r--r-- | net/socket/ssl_client_socket_pool_unittest.cc | 38 | ||||
| -rw-r--r-- | net/socket/ssl_client_socket_unittest.cc | 7 |
8 files changed, 227 insertions, 222 deletions
diff --git a/net/socket/deterministic_socket_data_unittest.cc b/net/socket/deterministic_socket_data_unittest.cc index 5989f91..92c6eef 100644 --- a/net/socket/deterministic_socket_data_unittest.cc +++ b/net/socket/deterministic_socket_data_unittest.cc @@ -165,8 +165,8 @@ void DeterministicSocketDataTest::AssertWriteReturns(const char* data, TEST_F(DeterministicSocketDataTest, SingleSyncReadWhileStopped) { MockRead reads[] = { - MockRead(false, kMsg1, kLen1, 0), // Sync Read - MockRead(false, 0, 1), // EOF + MockRead(SYNCHRONOUS, kMsg1, kLen1, 0), // Sync Read + MockRead(SYNCHRONOUS, 0, 1), // EOF }; Initialize(reads, arraysize(reads), NULL, 0); @@ -177,8 +177,8 @@ TEST_F(DeterministicSocketDataTest, SingleSyncReadWhileStopped) { TEST_F(DeterministicSocketDataTest, SingleSyncReadTooEarly) { MockRead reads[] = { - MockRead(false, kMsg1, kLen1, 1), // Sync Read - MockRead(false, 0, 2), // EOF + MockRead(SYNCHRONOUS, kMsg1, kLen1, 1), // Sync Read + MockRead(SYNCHRONOUS, 0, 2), // EOF }; Initialize(reads, arraysize(reads), NULL, 0); @@ -190,8 +190,8 @@ TEST_F(DeterministicSocketDataTest, SingleSyncReadTooEarly) { TEST_F(DeterministicSocketDataTest, SingleSyncRead) { MockRead reads[] = { - MockRead(false, kMsg1, kLen1, 0), // Sync Read - MockRead(false, 0, 1), // EOF + MockRead(SYNCHRONOUS, kMsg1, kLen1, 0), // Sync Read + MockRead(SYNCHRONOUS, 0, 1), // EOF }; Initialize(reads, arraysize(reads), NULL, 0); @@ -202,14 +202,14 @@ TEST_F(DeterministicSocketDataTest, SingleSyncRead) { TEST_F(DeterministicSocketDataTest, MultipleSyncReads) { MockRead reads[] = { - MockRead(false, kMsg1, kLen1, 0), // Sync Read - MockRead(false, kMsg2, kLen2, 1), // Sync Read - MockRead(false, kMsg3, kLen3, 2), // Sync Read - MockRead(false, kMsg3, kLen3, 3), // Sync Read - MockRead(false, kMsg2, kLen2, 4), // Sync Read - MockRead(false, kMsg3, kLen3, 5), // Sync Read - MockRead(false, kMsg1, kLen1, 6), // Sync Read - MockRead(false, 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); @@ -227,8 +227,8 @@ TEST_F(DeterministicSocketDataTest, MultipleSyncReads) { TEST_F(DeterministicSocketDataTest, SingleAsyncRead) { MockRead reads[] = { - MockRead(true, kMsg1, kLen1, 0), // Async Read - MockRead(false, 0, 1), // EOF + MockRead(ASYNC, kMsg1, kLen1, 0), // Async Read + MockRead(SYNCHRONOUS, 0, 1), // EOF }; Initialize(reads, arraysize(reads), NULL, 0); @@ -238,14 +238,14 @@ TEST_F(DeterministicSocketDataTest, SingleAsyncRead) { TEST_F(DeterministicSocketDataTest, MultipleAsyncReads) { MockRead reads[] = { - MockRead(true, kMsg1, kLen1, 0), // Async Read - MockRead(true, kMsg2, kLen2, 1), // Async Read - MockRead(true, kMsg3, kLen3, 2), // Async Read - MockRead(true, kMsg3, kLen3, 3), // Async Read - MockRead(true, kMsg2, kLen2, 4), // Async Read - MockRead(true, kMsg3, kLen3, 5), // Async Read - MockRead(true, kMsg1, kLen1, 6), // Async Read - MockRead(false, 0, 7), // EOF + MockRead(ASYNC, kMsg1, kLen1, 0), // Async Read + MockRead(ASYNC, kMsg2, kLen2, 1), // Async Read + MockRead(ASYNC, kMsg3, kLen3, 2), // Async Read + MockRead(ASYNC, kMsg3, kLen3, 3), // Async Read + 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 }; Initialize(reads, arraysize(reads), NULL, 0); @@ -261,14 +261,14 @@ TEST_F(DeterministicSocketDataTest, MultipleAsyncReads) { TEST_F(DeterministicSocketDataTest, MixedReads) { MockRead reads[] = { - MockRead(false, kMsg1, kLen1, 0), // Sync Read - MockRead(true, kMsg2, kLen2, 1), // Async Read - MockRead(false, kMsg3, kLen3, 2), // Sync Read - MockRead(true, kMsg3, kLen3, 3), // Async Read - MockRead(false, kMsg2, kLen2, 4), // Sync Read - MockRead(true, kMsg3, kLen3, 5), // Async Read - MockRead(false, kMsg1, kLen1, 6), // Sync Read - MockRead(false, 0, 7), // EOF + MockRead(SYNCHRONOUS, kMsg1, kLen1, 0), // Sync Read + MockRead(ASYNC, kMsg2, kLen2, 1), // Async Read + MockRead(SYNCHRONOUS, kMsg3, kLen3, 2), // Sync Read + MockRead(ASYNC, kMsg3, kLen3, 3), // Async Read + MockRead(SYNCHRONOUS, kMsg2, kLen2, 4), // Sync Read + MockRead(ASYNC, kMsg3, kLen3, 5), // Async Read + MockRead(SYNCHRONOUS, kMsg1, kLen1, 6), // Sync Read + MockRead(SYNCHRONOUS, 0, 7), // EOF }; Initialize(reads, arraysize(reads), NULL, 0); @@ -290,7 +290,7 @@ TEST_F(DeterministicSocketDataTest, MixedReads) { TEST_F(DeterministicSocketDataTest, SingleSyncWriteWhileStopped) { MockWrite writes[] = { - MockWrite(false, kMsg1, kLen1, 0), // Sync Read + MockWrite(SYNCHRONOUS, kMsg1, kLen1, 0), // Sync Read }; Initialize(NULL, 0, writes, arraysize(writes)); @@ -301,7 +301,7 @@ TEST_F(DeterministicSocketDataTest, SingleSyncWriteWhileStopped) { TEST_F(DeterministicSocketDataTest, SingleSyncWriteTooEarly) { MockWrite writes[] = { - MockWrite(false, kMsg1, kLen1, 1), // Sync Write + MockWrite(SYNCHRONOUS, kMsg1, kLen1, 1), // Sync Write }; Initialize(NULL, 0, writes, arraysize(writes)); @@ -313,7 +313,7 @@ TEST_F(DeterministicSocketDataTest, SingleSyncWriteTooEarly) { TEST_F(DeterministicSocketDataTest, SingleSyncWrite) { MockWrite writes[] = { - MockWrite(false, kMsg1, kLen1, 0), // Sync Write + MockWrite(SYNCHRONOUS, kMsg1, kLen1, 0), // Sync Write }; Initialize(NULL, 0, writes, arraysize(writes)); @@ -325,13 +325,13 @@ TEST_F(DeterministicSocketDataTest, SingleSyncWrite) { TEST_F(DeterministicSocketDataTest, MultipleSyncWrites) { MockWrite writes[] = { - MockWrite(false, kMsg1, kLen1, 0), // Sync Write - MockWrite(false, kMsg2, kLen2, 1), // Sync Write - MockWrite(false, kMsg3, kLen3, 2), // Sync Write - MockWrite(false, kMsg3, kLen3, 3), // Sync Write - MockWrite(false, kMsg2, kLen2, 4), // Sync Write - MockWrite(false, kMsg3, kLen3, 5), // Sync Write - MockWrite(false, 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)); @@ -349,7 +349,7 @@ TEST_F(DeterministicSocketDataTest, MultipleSyncWrites) { TEST_F(DeterministicSocketDataTest, SingleAsyncWrite) { MockWrite writes[] = { - MockWrite(true, kMsg1, kLen1, 0), // Async Write + MockWrite(ASYNC, kMsg1, kLen1, 0), // Async Write }; Initialize(NULL, 0, writes, arraysize(writes)); @@ -359,13 +359,13 @@ TEST_F(DeterministicSocketDataTest, SingleAsyncWrite) { TEST_F(DeterministicSocketDataTest, MultipleAsyncWrites) { MockWrite writes[] = { - MockWrite(true, kMsg1, kLen1, 0), // Async Write - MockWrite(true, kMsg2, kLen2, 1), // Async Write - MockWrite(true, kMsg3, kLen3, 2), // Async Write - MockWrite(true, kMsg3, kLen3, 3), // Async Write - MockWrite(true, kMsg2, kLen2, 4), // Async Write - MockWrite(true, kMsg3, kLen3, 5), // Async Write - MockWrite(true, 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)); @@ -381,13 +381,13 @@ TEST_F(DeterministicSocketDataTest, MultipleAsyncWrites) { TEST_F(DeterministicSocketDataTest, MixedWrites) { MockWrite writes[] = { - MockWrite(false, kMsg1, kLen1, 0), // Sync Write - MockWrite(true, kMsg2, kLen2, 1), // Async Write - MockWrite(false, kMsg3, kLen3, 2), // Sync Write - MockWrite(true, kMsg3, kLen3, 3), // Async Write - MockWrite(false, kMsg2, kLen2, 4), // Sync Write - MockWrite(true, kMsg3, kLen3, 5), // Async Write - MockWrite(false, 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)); @@ -409,14 +409,14 @@ TEST_F(DeterministicSocketDataTest, MixedWrites) { TEST_F(DeterministicSocketDataTest, MixedSyncOperations) { MockRead reads[] = { - MockRead(false, kMsg1, kLen1, 0), // Sync Read - MockRead(false, kMsg2, kLen2, 3), // Sync Read - MockRead(false, 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(false, kMsg2, kLen2, 1), // Sync Write - MockWrite(false, 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)); @@ -431,14 +431,14 @@ TEST_F(DeterministicSocketDataTest, MixedSyncOperations) { TEST_F(DeterministicSocketDataTest, MixedAsyncOperations) { MockRead reads[] = { - MockRead(true, kMsg1, kLen1, 0), // Sync Read - MockRead(true, kMsg2, kLen2, 3), // Sync Read - MockRead(true, 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(true, kMsg2, kLen2, 1), // Sync Write - MockWrite(true, 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)); @@ -452,14 +452,14 @@ TEST_F(DeterministicSocketDataTest, MixedAsyncOperations) { TEST_F(DeterministicSocketDataTest, InterleavedAsyncOperations) { // Order of completion is read, write, write, read MockRead reads[] = { - MockRead(true, kMsg1, kLen1, 0), // Async Read - MockRead(true, kMsg2, kLen2, 3), // Async Read - MockRead(true, 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(true, kMsg2, kLen2, 1), // Async Write - MockWrite(true, 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)); @@ -495,14 +495,14 @@ TEST_F(DeterministicSocketDataTest, InterleavedAsyncOperations) { TEST_F(DeterministicSocketDataTest, InterleavedMixedOperations) { // Order of completion is read, write, write, read MockRead reads[] = { - MockRead(false, kMsg1, kLen1, 0), // Sync Read - MockRead(true, kMsg2, kLen2, 3), // Async Read - MockRead(false, 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(true, kMsg2, kLen2, 1), // Async Write - MockWrite(false, 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)); diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc index 2e404122..c48694d 100644 --- a/net/socket/socket_test_util.cc +++ b/net/socket/socket_test_util.cc @@ -107,7 +107,7 @@ void DumpData(const char* data, int data_len) { void DumpMockRead(const MockRead& r) { if (logging::LOG_INFO < logging::GetMinLogLevel()) return; - DVLOG(1) << "Async: " << r.async + DVLOG(1) << "Async: " << (r.mode == ASYNC) << "\nResult: " << r.result; DumpData(r.data, r.data_len); const char* stop = (r.sequence_number & MockRead::STOPLOOP) ? " (STOP)" : ""; @@ -169,9 +169,9 @@ MockRead StaticSocketDataProvider::GetNextRead() { MockWriteResult StaticSocketDataProvider::OnWrite(const std::string& data) { if (!writes_) { // Not using mock writes; succeed synchronously. - return MockWriteResult(false, data.length()); + return MockWriteResult(SYNCHRONOUS, data.length()); } - + LOG(INFO) << "about to write: " << data; DCHECK(!at_write_eof()); // Check that what we are writing matches the expectation. @@ -191,11 +191,11 @@ MockWriteResult StaticSocketDataProvider::OnWrite(const std::string& data) { std::string actual_data(data.substr(0, w->data_len)); EXPECT_EQ(expected_data, actual_data); if (expected_data != actual_data) - return MockWriteResult(false, ERR_UNEXPECTED); + return MockWriteResult(SYNCHRONOUS, ERR_UNEXPECTED); if (result == OK) result = w->data_len; } - return MockWriteResult(w->async, result); + return MockWriteResult(w->mode, result); } void StaticSocketDataProvider::Reset() { @@ -212,7 +212,7 @@ DynamicSocketDataProvider::~DynamicSocketDataProvider() {} MockRead DynamicSocketDataProvider::GetNextRead() { if (reads_.empty()) - return MockRead(false, ERR_UNEXPECTED); + return MockRead(SYNCHRONOUS, ERR_UNEXPECTED); MockRead result = reads_.front(); if (short_read_limit_ == 0 || result.data_len <= short_read_limit_) { reads_.pop_front(); @@ -233,11 +233,11 @@ void DynamicSocketDataProvider::SimulateRead(const char* data, if (!allow_unconsumed_reads_) { EXPECT_TRUE(reads_.empty()) << "Unconsumed read: " << reads_.front().data; } - reads_.push_back(MockRead(true, data, length)); + reads_.push_back(MockRead(ASYNC, data, length)); } -SSLSocketDataProvider::SSLSocketDataProvider(bool async, int result) - : connect(async ? ASYNC : SYNCHRONOUS, result), +SSLSocketDataProvider::SSLSocketDataProvider(IoMode mode, int result) + : connect(mode, result), next_proto_status(SSLClientSocket::kNextProtoUnsupported), was_npn_negotiated(false), protocol_negotiated(SSLClientSocket::kProtoUnknown), @@ -287,7 +287,7 @@ void DelayedSocketData::ForceNextRead() { } MockRead DelayedSocketData::GetNextRead() { - MockRead out = MockRead(true, ERR_IO_PENDING); + MockRead out = MockRead(ASYNC, ERR_IO_PENDING); if (write_delay_ <= 0) out = StaticSocketDataProvider::GetNextRead(); read_in_progress_ = (out.result == ERR_IO_PENDING); @@ -372,7 +372,7 @@ MockRead OrderedSocketData::GetNextRead() { } NET_TRACE(INFO, " *** ") << "Stage " << sequence_number_ - 1 << ": I/O Pending"; - MockRead result = MockRead(true, ERR_IO_PENDING); + MockRead result = MockRead(ASYNC, ERR_IO_PENDING); DumpMockRead(result); blocked_ = true; return result; @@ -475,21 +475,21 @@ MockRead DeterministicSocketData::GetNextRead() { EXPECT_LE(sequence_number_, current_read_.sequence_number); // Synchronous read while stopped is an error - if (stopped() && !current_read_.async) { + if (stopped() && current_read_.mode == SYNCHRONOUS) { LOG(ERROR) << "Unable to perform synchronous IO while stopped"; - return MockRead(false, ERR_UNEXPECTED); + return MockRead(SYNCHRONOUS, ERR_UNEXPECTED); } // Async read which will be called back in a future step. if (sequence_number_ < current_read_.sequence_number) { NET_TRACE(INFO, " *** ") << "Stage " << sequence_number_ << ": I/O Pending"; - MockRead result = MockRead(false, ERR_IO_PENDING); - if (!current_read_.async) { + MockRead result = MockRead(SYNCHRONOUS, ERR_IO_PENDING); + if (current_read_.mode == SYNCHRONOUS) { LOG(ERROR) << "Unable to perform synchronous read: " << current_read_.sequence_number << " at stage: " << sequence_number_; - result = MockRead(false, ERR_UNEXPECTED); + result = MockRead(SYNCHRONOUS, ERR_UNEXPECTED); } if (print_debug_) DumpMockRead(result); @@ -502,7 +502,7 @@ MockRead DeterministicSocketData::GetNextRead() { DumpMockRead(current_read_); // Increment the sequence number if IO is complete - if (!current_read_.async) + if (current_read_.mode == SYNCHRONOUS) NextStep(); DCHECK_NE(ERR_IO_PENDING, current_read_.result); @@ -516,19 +516,19 @@ MockWriteResult DeterministicSocketData::OnWrite(const std::string& data) { current_write_ = next_write; // Synchronous write while stopped is an error - if (stopped() && !next_write.async) { + if (stopped() && next_write.mode == SYNCHRONOUS) { LOG(ERROR) << "Unable to perform synchronous IO while stopped"; - return MockWriteResult(false, ERR_UNEXPECTED); + return MockWriteResult(SYNCHRONOUS, ERR_UNEXPECTED); } // Async write which will be called back in a future step. if (sequence_number_ < next_write.sequence_number) { NET_TRACE(INFO, " *** ") << "Stage " << sequence_number_ << ": I/O Pending"; - if (!next_write.async) { + if (next_write.mode == SYNCHRONOUS) { LOG(ERROR) << "Unable to perform synchronous write: " << next_write.sequence_number << " at stage: " << sequence_number_; - return MockWriteResult(false, ERR_UNEXPECTED); + return MockWriteResult(SYNCHRONOUS, ERR_UNEXPECTED); } } else { NET_TRACE(INFO, " *** ") << "Stage " << sequence_number_ @@ -540,7 +540,7 @@ MockWriteResult DeterministicSocketData::OnWrite(const std::string& data) { // Move to the next step if I/O is synchronous, since the operation will // complete when this method returns. - if (!next_write.async) + if (next_write.mode == SYNCHRONOUS) NextStep(); // This is either a sync write for this step, or an async write. @@ -731,7 +731,7 @@ MockTCPClientSocket::MockTCPClientSocket(const AddressList& addresses, data_(data), read_offset_(0), num_bytes_read_(0), - read_data_(false, ERR_UNEXPECTED), + read_data_(SYNCHRONOUS, ERR_UNEXPECTED), need_read_data_(true), peer_closed_connection_(false), pending_buf_(NULL), @@ -790,7 +790,7 @@ int MockTCPClientSocket::Write(IOBuffer* buf, int buf_len, was_used_to_convey_data_ = true; - if (write_result.async) { + if (write_result.mode == ASYNC) { RunCallbackAsync(callback, write_result.result); return ERR_IO_PENDING; } @@ -803,7 +803,7 @@ int MockTCPClientSocket::Connect(const CompletionCallback& callback) { return OK; connected_ = true; peer_closed_connection_ = false; - if (data_->connect_data().async) { + if (data_->connect_data().mode == ASYNC) { RunCallbackAsync(callback, data_->connect_data().result); return ERR_IO_PENDING; } @@ -861,7 +861,7 @@ void MockTCPClientSocket::OnReadComplete(const MockRead& data) { // The caller is simulating that this IO completes right now. Don't // let CompleteRead() schedule a callback. - read_data_.async = false; + read_data_.mode = SYNCHRONOUS; CompletionCallback callback = pending_callback_; int rv = CompleteRead(); @@ -900,7 +900,7 @@ int MockTCPClientSocket::CompleteRead() { } } - if (read_data_.async) { + if (read_data_.mode == ASYNC) { DCHECK(!callback.is_null()); RunCallbackAsync(callback, result); return ERR_IO_PENDING; @@ -938,7 +938,7 @@ int DeterministicMockTCPClientSocket::CompleteRead() { if (read_data_.result == ERR_IO_PENDING) read_data_ = data_->GetNextRead(); DCHECK_NE(ERR_IO_PENDING, read_data_.result); - // If read_data_.async is true, we do not need to wait, since this is already + // If read_data_.mode is ASYNC, we do not need to wait, since this is already // the callback. Therefore we don't even bother to check it. int result = read_data_.result; @@ -967,7 +967,7 @@ int DeterministicMockTCPClientSocket::Write( std::string data(buf->data(), buf_len); MockWriteResult write_result = data_->OnWrite(data); - if (write_result.async) { + if (write_result.mode == ASYNC) { write_callback_ = callback; write_result_ = write_result.result; DCHECK(!write_callback_.is_null()); @@ -994,7 +994,7 @@ int DeterministicMockTCPClientSocket::Read( read_buf_len_ = buf_len; read_callback_ = callback; - if (read_data_.async || (read_data_.result == ERR_IO_PENDING)) { + if (read_data_.mode == ASYNC || (read_data_.result == ERR_IO_PENDING)) { read_pending_ = true; DCHECK(!read_callback_.is_null()); return ERR_IO_PENDING; @@ -1010,7 +1010,7 @@ int DeterministicMockTCPClientSocket::Connect( if (connected_) return OK; connected_ = true; - if (data_->connect_data().async) { + if (data_->connect_data().mode == ASYNC) { RunCallbackAsync(callback, data_->connect_data().result); return ERR_IO_PENDING; } @@ -1094,7 +1094,7 @@ int MockSSLClientSocket::Connect(const CompletionCallback& callback) { if (rv == OK) { if (data_->connect.result == OK) connected_ = true; - if (data_->connect.async) { + if (data_->connect.mode == ASYNC) { RunCallbackAsync(callback, data_->connect.result); return ERR_IO_PENDING; } @@ -1203,7 +1203,7 @@ MockUDPClientSocket::MockUDPClientSocket(SocketDataProvider* data, : connected_(false), data_(data), read_offset_(0), - read_data_(false, ERR_UNEXPECTED), + read_data_(SYNCHRONOUS, ERR_UNEXPECTED), need_read_data_(true), pending_buf_(NULL), pending_buf_len_(0), @@ -1254,7 +1254,7 @@ int MockUDPClientSocket::Write(IOBuffer* buf, int buf_len, std::string data(buf->data(), buf_len); MockWriteResult write_result = data_->OnWrite(data); - if (write_result.async) { + if (write_result.mode == ASYNC) { RunCallbackAsync(callback, write_result.result); return ERR_IO_PENDING; } @@ -1305,7 +1305,7 @@ void MockUDPClientSocket::OnReadComplete(const MockRead& data) { // The caller is simulating that this IO completes right now. Don't // let CompleteRead() schedule a callback. - read_data_.async = false; + read_data_.mode = SYNCHRONOUS; net::CompletionCallback callback = pending_callback_; int rv = CompleteRead(); @@ -1341,7 +1341,7 @@ int MockUDPClientSocket::CompleteRead() { } } - if (read_data_.async) { + if (read_data_.mode == ASYNC) { DCHECK(!callback.is_null()); RunCallbackAsync(callback, result); return ERR_IO_PENDING; diff --git a/net/socket/socket_test_util.h b/net/socket/socket_test_util.h index 9c1271b..d059e89 100644 --- a/net/socket/socket_test_util.h +++ b/net/socket/socket_test_util.h @@ -53,17 +53,17 @@ class SSLClientSocket; class SSLHostInfo; class StreamSocket; -enum ConnectMode { +enum IoMode { ASYNC, SYNCHRONOUS }; struct MockConnect { // Asynchronous connection success. - MockConnect() : async(true), result(OK) { } - MockConnect(ConnectMode m, int r) : async(m == ASYNC), result(r) { } + MockConnect() : mode(ASYNC), result(OK) { } + MockConnect(IoMode io_mode, int r) : mode(io_mode), result(r) { } - bool async; + IoMode mode; int result; }; @@ -74,44 +74,45 @@ struct MockRead { }; // Default - MockRead() : async(false), result(0), data(NULL), data_len(0), + MockRead() : mode(SYNCHRONOUS), result(0), data(NULL), data_len(0), sequence_number(0), time_stamp(base::Time::Now()) {} // Read failure (no data). - MockRead(bool async, int result) : async(async) , result(result), data(NULL), - data_len(0), sequence_number(0), time_stamp(base::Time::Now()) { } + MockRead(IoMode io_mode, int result) : mode(io_mode), result(result), + data(NULL), data_len(0), sequence_number(0), + time_stamp(base::Time::Now()) { } // Read failure (no data), with sequence information. - MockRead(bool async, int result, int seq) : async(async) , result(result), - data(NULL), data_len(0), sequence_number(seq), + MockRead(IoMode io_mode, int result, int seq) : mode(io_mode), + result(result), data(NULL), data_len(0), sequence_number(seq), time_stamp(base::Time::Now()) { } // Asynchronous read success (inferred data length). - explicit MockRead(const char* data) : async(true), result(0), data(data), + explicit MockRead(const char* data) : mode(ASYNC), result(0), data(data), data_len(strlen(data)), sequence_number(0), time_stamp(base::Time::Now()) { } // Read success (inferred data length). - MockRead(bool async, const char* data) : async(async), result(0), data(data), - data_len(strlen(data)), sequence_number(0), + MockRead(IoMode io_mode, const char* data) : mode(io_mode), result(0), + data(data), data_len(strlen(data)), sequence_number(0), time_stamp(base::Time::Now()) { } // Read success. - MockRead(bool async, const char* data, int data_len) : async(async), + MockRead(IoMode io_mode, const char* data, int data_len) : mode(io_mode), result(0), data(data), data_len(data_len), sequence_number(0), time_stamp(base::Time::Now()) { } // Read success (inferred data length) with sequence information. - MockRead(bool async, int seq, const char* data) : async(async), + MockRead(IoMode io_mode, int seq, const char* data) : mode(io_mode), result(0), data(data), data_len(strlen(data)), sequence_number(seq), time_stamp(base::Time::Now()) { } // Read success with sequence information. - MockRead(bool async, const char* data, int data_len, int seq) : async(async), - result(0), data(data), data_len(data_len), sequence_number(seq), - time_stamp(base::Time::Now()) { } + MockRead(IoMode io_mode, const char* data, int data_len, int seq) : + mode(io_mode), result(0), data(data), data_len(data_len), + sequence_number(seq), time_stamp(base::Time::Now()) { } - bool async; + IoMode mode; int result; const char* data; int data_len; @@ -131,9 +132,11 @@ struct MockRead { typedef MockRead MockWrite; struct MockWriteResult { - MockWriteResult(bool async, int result) : async(async), result(result) {} + MockWriteResult(IoMode io_mode, int result) + : mode(io_mode), + result(result) {} - bool async; + IoMode mode; int result; }; @@ -263,7 +266,7 @@ class DynamicSocketDataProvider : public SocketDataProvider { // SSLSocketDataProviders only need to keep track of the return code from calls // to Connect(). struct SSLSocketDataProvider { - SSLSocketDataProvider(bool async, int result); + SSLSocketDataProvider(IoMode mode, int result); ~SSLSocketDataProvider(); void SetNextProto(SSLClientSocket::NextProto proto); diff --git a/net/socket/socks5_client_socket_unittest.cc b/net/socket/socks5_client_socket_unittest.cc index 72f015a..bf6277d 100644 --- a/net/socket/socks5_client_socket_unittest.cc +++ b/net/socket/socks5_client_socket_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -115,13 +115,13 @@ TEST_F(SOCKS5ClientSocketTest, CompleteHandshake) { }; MockWrite data_writes[] = { - MockWrite(true, kSOCKS5GreetRequest, kSOCKS5GreetRequestLength), - MockWrite(true, kOkRequest, arraysize(kOkRequest)), - MockWrite(true, payload_write.data(), payload_write.size()) }; + MockWrite(ASYNC, kSOCKS5GreetRequest, kSOCKS5GreetRequestLength), + MockWrite(ASYNC, kOkRequest, arraysize(kOkRequest)), + MockWrite(ASYNC, payload_write.data(), payload_write.size()) }; MockRead data_reads[] = { - MockRead(true, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength), - MockRead(true, kSOCKS5OkResponse, kSOCKS5OkResponseLength), - MockRead(true, payload_read.data(), payload_read.size()) }; + MockRead(ASYNC, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength), + MockRead(ASYNC, kSOCKS5OkResponse, kSOCKS5OkResponseLength), + MockRead(ASYNC, payload_read.data(), payload_read.size()) }; user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads), data_writes, arraysize(data_writes), @@ -185,12 +185,12 @@ TEST_F(SOCKS5ClientSocketTest, ConnectAndDisconnectTwice) { for (int i = 0; i < 2; ++i) { MockWrite data_writes[] = { - MockWrite(false, kSOCKS5GreetRequest, kSOCKS5GreetRequestLength), - MockWrite(false, request.data(), request.size()) + MockWrite(SYNCHRONOUS, kSOCKS5GreetRequest, kSOCKS5GreetRequestLength), + MockWrite(SYNCHRONOUS, request.data(), request.size()) }; MockRead data_reads[] = { - MockRead(false, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength), - MockRead(false, kSOCKS5OkResponse, kSOCKS5OkResponseLength) + MockRead(SYNCHRONOUS, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength), + MockRead(SYNCHRONOUS, kSOCKS5OkResponse, kSOCKS5OkResponseLength) }; user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads), @@ -245,12 +245,12 @@ TEST_F(SOCKS5ClientSocketTest, PartialReadWrites) { const char partial1[] = { 0x05, 0x01 }; const char partial2[] = { 0x00 }; MockWrite data_writes[] = { - MockWrite(true, arraysize(partial1)), - MockWrite(true, partial2, arraysize(partial2)), - MockWrite(true, kOkRequest, arraysize(kOkRequest)) }; + MockWrite(ASYNC, arraysize(partial1)), + MockWrite(ASYNC, partial2, arraysize(partial2)), + MockWrite(ASYNC, kOkRequest, arraysize(kOkRequest)) }; MockRead data_reads[] = { - MockRead(true, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength), - MockRead(true, kSOCKS5OkResponse, kSOCKS5OkResponseLength) }; + MockRead(ASYNC, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength), + MockRead(ASYNC, kSOCKS5OkResponse, kSOCKS5OkResponseLength) }; user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads), data_writes, arraysize(data_writes), hostname, 80, &net_log_)); @@ -276,12 +276,12 @@ TEST_F(SOCKS5ClientSocketTest, PartialReadWrites) { const char partial1[] = { 0x05 }; const char partial2[] = { 0x00 }; MockWrite data_writes[] = { - MockWrite(true, kSOCKS5GreetRequest, kSOCKS5GreetRequestLength), - MockWrite(true, kOkRequest, arraysize(kOkRequest)) }; + MockWrite(ASYNC, kSOCKS5GreetRequest, kSOCKS5GreetRequestLength), + MockWrite(ASYNC, kOkRequest, arraysize(kOkRequest)) }; MockRead data_reads[] = { - MockRead(true, partial1, arraysize(partial1)), - MockRead(true, partial2, arraysize(partial2)), - MockRead(true, kSOCKS5OkResponse, kSOCKS5OkResponseLength) }; + MockRead(ASYNC, partial1, arraysize(partial1)), + MockRead(ASYNC, partial2, arraysize(partial2)), + MockRead(ASYNC, kSOCKS5OkResponse, kSOCKS5OkResponseLength) }; user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads), data_writes, arraysize(data_writes), hostname, 80, &net_log_)); @@ -304,14 +304,14 @@ TEST_F(SOCKS5ClientSocketTest, PartialReadWrites) { { const int kSplitPoint = 3; // Break handshake write into two parts. MockWrite data_writes[] = { - MockWrite(true, kSOCKS5GreetRequest, kSOCKS5GreetRequestLength), - MockWrite(true, kOkRequest, kSplitPoint), - MockWrite(true, kOkRequest + kSplitPoint, + MockWrite(ASYNC, kSOCKS5GreetRequest, kSOCKS5GreetRequestLength), + MockWrite(ASYNC, kOkRequest, kSplitPoint), + MockWrite(ASYNC, kOkRequest + kSplitPoint, arraysize(kOkRequest) - kSplitPoint) }; MockRead data_reads[] = { - MockRead(true, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength), - MockRead(true, kSOCKS5OkResponse, kSOCKS5OkResponseLength) }; + MockRead(ASYNC, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength), + MockRead(ASYNC, kSOCKS5OkResponse, kSOCKS5OkResponseLength) }; user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads), data_writes, arraysize(data_writes), hostname, 80, &net_log_)); @@ -333,13 +333,13 @@ TEST_F(SOCKS5ClientSocketTest, PartialReadWrites) { { const int kSplitPoint = 6; // Break the handshake read into two parts. MockWrite data_writes[] = { - MockWrite(true, kSOCKS5GreetRequest, kSOCKS5GreetRequestLength), - MockWrite(true, kOkRequest, arraysize(kOkRequest)) + MockWrite(ASYNC, kSOCKS5GreetRequest, kSOCKS5GreetRequestLength), + MockWrite(ASYNC, kOkRequest, arraysize(kOkRequest)) }; MockRead data_reads[] = { - MockRead(true, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength), - MockRead(true, kSOCKS5OkResponse, kSplitPoint), - MockRead(true, kSOCKS5OkResponse + kSplitPoint, + MockRead(ASYNC, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength), + MockRead(ASYNC, kSOCKS5OkResponse, kSplitPoint), + MockRead(ASYNC, kSOCKS5OkResponse + kSplitPoint, kSOCKS5OkResponseLength - kSplitPoint) }; diff --git a/net/socket/socks_client_socket_pool_unittest.cc b/net/socket/socks_client_socket_pool_unittest.cc index 800b97a..0bb8563 100644 --- a/net/socket/socks_client_socket_pool_unittest.cc +++ b/net/socket/socks_client_socket_pool_unittest.cc @@ -27,18 +27,18 @@ class SOCKSClientSocketPoolTest : public testing::Test { protected: class SOCKS5MockData { public: - explicit SOCKS5MockData(bool async) { + explicit SOCKS5MockData(IoMode mode) { writes_.reset(new MockWrite[3]); - writes_[0] = MockWrite(async, kSOCKS5GreetRequest, + writes_[0] = MockWrite(mode, kSOCKS5GreetRequest, kSOCKS5GreetRequestLength); - writes_[1] = MockWrite(async, kSOCKS5OkRequest, kSOCKS5OkRequestLength); - writes_[2] = MockWrite(async, 0); + writes_[1] = MockWrite(mode, kSOCKS5OkRequest, kSOCKS5OkRequestLength); + writes_[2] = MockWrite(mode, 0); reads_.reset(new MockRead[3]); - reads_[0] = MockRead(async, kSOCKS5GreetResponse, + reads_[0] = MockRead(mode, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength); - reads_[1] = MockRead(async, kSOCKS5OkResponse, kSOCKS5OkResponseLength); - reads_[2] = MockRead(async, 0); + reads_[1] = MockRead(mode, kSOCKS5OkResponse, kSOCKS5OkResponseLength); + reads_[2] = MockRead(mode, 0); data_.reset(new StaticSocketDataProvider(reads_.get(), 3, writes_.get(), 3)); @@ -96,7 +96,7 @@ class SOCKSClientSocketPoolTest : public testing::Test { }; TEST_F(SOCKSClientSocketPoolTest, Simple) { - SOCKS5MockData data(false); + SOCKS5MockData data(SYNCHRONOUS); data.data_provider()->set_connect_data(MockConnect(SYNCHRONOUS, OK)); transport_client_socket_factory_.AddSocketDataProvider(data.data_provider()); @@ -109,7 +109,7 @@ TEST_F(SOCKSClientSocketPoolTest, Simple) { } TEST_F(SOCKSClientSocketPoolTest, Async) { - SOCKS5MockData data(true); + SOCKS5MockData data(ASYNC); transport_client_socket_factory_.AddSocketDataProvider(data.data_provider()); TestCompletionCallback callback; @@ -159,7 +159,7 @@ TEST_F(SOCKSClientSocketPoolTest, AsyncTransportConnectError) { TEST_F(SOCKSClientSocketPoolTest, SOCKSConnectError) { MockRead failed_read[] = { - MockRead(false, 0), + MockRead(SYNCHRONOUS, 0), }; scoped_ptr<SocketDataProvider> socket_data(new StaticSocketDataProvider( failed_read, arraysize(failed_read), NULL, 0)); @@ -178,7 +178,7 @@ TEST_F(SOCKSClientSocketPoolTest, SOCKSConnectError) { TEST_F(SOCKSClientSocketPoolTest, AsyncSOCKSConnectError) { MockRead failed_read[] = { - MockRead(true, 0), + MockRead(ASYNC, 0), }; scoped_ptr<SocketDataProvider> socket_data(new StaticSocketDataProvider( failed_read, arraysize(failed_read), NULL, 0)); @@ -201,11 +201,11 @@ TEST_F(SOCKSClientSocketPoolTest, AsyncSOCKSConnectError) { } TEST_F(SOCKSClientSocketPoolTest, CancelDuringTransportConnect) { - SOCKS5MockData data(false); + SOCKS5MockData data(SYNCHRONOUS); transport_client_socket_factory_.AddSocketDataProvider(data.data_provider()); // We need two connections because the pool base lets one cancelled // connect job proceed for potential future use. - SOCKS5MockData data2(false); + SOCKS5MockData data2(SYNCHRONOUS); transport_client_socket_factory_.AddSocketDataProvider(data2.data_provider()); EXPECT_EQ(0, transport_socket_pool_.cancel_count()); @@ -233,12 +233,12 @@ TEST_F(SOCKSClientSocketPoolTest, CancelDuringTransportConnect) { } TEST_F(SOCKSClientSocketPoolTest, CancelDuringSOCKSConnect) { - SOCKS5MockData data(true); + SOCKS5MockData data(ASYNC); data.data_provider()->set_connect_data(MockConnect(SYNCHRONOUS, OK)); transport_client_socket_factory_.AddSocketDataProvider(data.data_provider()); // We need two connections because the pool base lets one cancelled // connect job proceed for potential future use. - SOCKS5MockData data2(true); + SOCKS5MockData data2(ASYNC); data2.data_provider()->set_connect_data(MockConnect(SYNCHRONOUS, OK)); transport_client_socket_factory_.AddSocketDataProvider(data2.data_provider()); diff --git a/net/socket/socks_client_socket_unittest.cc b/net/socket/socks_client_socket_unittest.cc index 1a6db28..559b373 100644 --- a/net/socket/socks_client_socket_unittest.cc +++ b/net/socket/socks_client_socket_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -127,11 +127,11 @@ TEST_F(SOCKSClientSocketTest, CompleteHandshake) { 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 @@ TEST_F(SOCKSClientSocketTest, HandshakeFailures) { 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 @@ TEST_F(SOCKSClientSocketTest, PartialServerReads) { 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 @@ TEST_F(SOCKSClientSocketTest, PartialClientWrites) { 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 @@ TEST_F(SOCKSClientSocketTest, PartialClientWrites) { // 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 @@ TEST_F(SOCKSClientSocketTest, DisconnectWhileHostResolveInProgress) { 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), diff --git a/net/socket/ssl_client_socket_pool_unittest.cc b/net/socket/ssl_client_socket_pool_unittest.cc index 7da7d18..df893f9 100644 --- a/net/socket/ssl_client_socket_pool_unittest.cc +++ b/net/socket/ssl_client_socket_pool_unittest.cc @@ -217,7 +217,7 @@ TEST_F(SSLClientSocketPoolTest, BasicDirect) { StaticSocketDataProvider data; data.set_connect_data(MockConnect(SYNCHRONOUS, OK)); socket_factory_.AddSocketDataProvider(&data); - SSLSocketDataProvider ssl(false, OK); + SSLSocketDataProvider ssl(SYNCHRONOUS, OK); socket_factory_.AddSSLSocketDataProvider(&ssl); CreatePool(true /* tcp pool */, false, false); @@ -236,7 +236,7 @@ TEST_F(SSLClientSocketPoolTest, BasicDirect) { TEST_F(SSLClientSocketPoolTest, BasicDirectAsync) { StaticSocketDataProvider data; socket_factory_.AddSocketDataProvider(&data); - SSLSocketDataProvider ssl(true, OK); + SSLSocketDataProvider ssl(ASYNC, OK); socket_factory_.AddSSLSocketDataProvider(&ssl); CreatePool(true /* tcp pool */, false, false); @@ -259,7 +259,7 @@ TEST_F(SSLClientSocketPoolTest, BasicDirectAsync) { TEST_F(SSLClientSocketPoolTest, DirectCertError) { StaticSocketDataProvider data; socket_factory_.AddSocketDataProvider(&data); - SSLSocketDataProvider ssl(true, ERR_CERT_COMMON_NAME_INVALID); + SSLSocketDataProvider ssl(ASYNC, ERR_CERT_COMMON_NAME_INVALID); socket_factory_.AddSSLSocketDataProvider(&ssl); CreatePool(true /* tcp pool */, false, false); @@ -282,7 +282,7 @@ TEST_F(SSLClientSocketPoolTest, DirectCertError) { TEST_F(SSLClientSocketPoolTest, DirectSSLError) { StaticSocketDataProvider data; socket_factory_.AddSocketDataProvider(&data); - SSLSocketDataProvider ssl(true, ERR_SSL_PROTOCOL_ERROR); + SSLSocketDataProvider ssl(ASYNC, ERR_SSL_PROTOCOL_ERROR); socket_factory_.AddSSLSocketDataProvider(&ssl); CreatePool(true /* tcp pool */, false, false); @@ -306,7 +306,7 @@ TEST_F(SSLClientSocketPoolTest, DirectSSLError) { TEST_F(SSLClientSocketPoolTest, DirectWithNPN) { StaticSocketDataProvider data; socket_factory_.AddSocketDataProvider(&data); - SSLSocketDataProvider ssl(true, OK); + SSLSocketDataProvider ssl(ASYNC, OK); ssl.SetNextProto(SSLClientSocket::kProtoHTTP11); socket_factory_.AddSSLSocketDataProvider(&ssl); @@ -332,7 +332,7 @@ TEST_F(SSLClientSocketPoolTest, DirectWithNPN) { TEST_F(SSLClientSocketPoolTest, DirectNoSPDY) { StaticSocketDataProvider data; socket_factory_.AddSocketDataProvider(&data); - SSLSocketDataProvider ssl(true, OK); + SSLSocketDataProvider ssl(ASYNC, OK); ssl.SetNextProto(SSLClientSocket::kProtoHTTP11); socket_factory_.AddSSLSocketDataProvider(&ssl); @@ -357,7 +357,7 @@ TEST_F(SSLClientSocketPoolTest, DirectNoSPDY) { TEST_F(SSLClientSocketPoolTest, DirectGotSPDY) { StaticSocketDataProvider data; socket_factory_.AddSocketDataProvider(&data); - SSLSocketDataProvider ssl(true, OK); + SSLSocketDataProvider ssl(ASYNC, OK); ssl.SetNextProto(SSLClientSocket::kProtoSPDY21); socket_factory_.AddSSLSocketDataProvider(&ssl); @@ -389,7 +389,7 @@ TEST_F(SSLClientSocketPoolTest, DirectGotSPDY) { TEST_F(SSLClientSocketPoolTest, DirectGotBonusSPDY) { StaticSocketDataProvider data; socket_factory_.AddSocketDataProvider(&data); - SSLSocketDataProvider ssl(true, OK); + SSLSocketDataProvider ssl(ASYNC, OK); ssl.SetNextProto(SSLClientSocket::kProtoSPDY21); socket_factory_.AddSSLSocketDataProvider(&ssl); @@ -464,7 +464,7 @@ TEST_F(SSLClientSocketPoolTest, SOCKSBasic) { StaticSocketDataProvider data; data.set_connect_data(MockConnect(SYNCHRONOUS, OK)); socket_factory_.AddSocketDataProvider(&data); - SSLSocketDataProvider ssl(false, OK); + SSLSocketDataProvider ssl(SYNCHRONOUS, OK); socket_factory_.AddSSLSocketDataProvider(&ssl); CreatePool(false, true /* http proxy pool */, true /* socks pool */); @@ -483,7 +483,7 @@ TEST_F(SSLClientSocketPoolTest, SOCKSBasic) { TEST_F(SSLClientSocketPoolTest, SOCKSBasicAsync) { StaticSocketDataProvider data; socket_factory_.AddSocketDataProvider(&data); - SSLSocketDataProvider ssl(true, OK); + SSLSocketDataProvider ssl(ASYNC, OK); socket_factory_.AddSSLSocketDataProvider(&ssl); CreatePool(false, true /* http proxy pool */, true /* socks pool */); @@ -547,21 +547,21 @@ TEST_F(SSLClientSocketPoolTest, HttpProxyFailAsync) { TEST_F(SSLClientSocketPoolTest, HttpProxyBasic) { MockWrite writes[] = { - MockWrite(false, + MockWrite(SYNCHRONOUS, "CONNECT host:80 HTTP/1.1\r\n" "Host: host\r\n" "Proxy-Connection: keep-alive\r\n" "Proxy-Authorization: Basic Zm9vOmJhcg==\r\n\r\n"), }; MockRead reads[] = { - MockRead(false, "HTTP/1.1 200 Connection Established\r\n\r\n"), + MockRead(SYNCHRONOUS, "HTTP/1.1 200 Connection Established\r\n\r\n"), }; StaticSocketDataProvider data(reads, arraysize(reads), writes, arraysize(writes)); data.set_connect_data(MockConnect(SYNCHRONOUS, OK)); socket_factory_.AddSocketDataProvider(&data); AddAuthToCache(); - SSLSocketDataProvider ssl(false, OK); + SSLSocketDataProvider ssl(SYNCHRONOUS, OK); socket_factory_.AddSSLSocketDataProvider(&ssl); CreatePool(false, true /* http proxy pool */, true /* socks pool */); @@ -591,7 +591,7 @@ TEST_F(SSLClientSocketPoolTest, HttpProxyBasicAsync) { arraysize(writes)); socket_factory_.AddSocketDataProvider(&data); AddAuthToCache(); - SSLSocketDataProvider ssl(true, OK); + SSLSocketDataProvider ssl(ASYNC, OK); socket_factory_.AddSSLSocketDataProvider(&ssl); CreatePool(false, true /* http proxy pool */, true /* socks pool */); @@ -626,7 +626,7 @@ TEST_F(SSLClientSocketPoolTest, NeedProxyAuth) { StaticSocketDataProvider data(reads, arraysize(reads), writes, arraysize(writes)); socket_factory_.AddSocketDataProvider(&data); - SSLSocketDataProvider ssl(true, OK); + SSLSocketDataProvider ssl(ASYNC, OK); socket_factory_.AddSSLSocketDataProvider(&ssl); CreatePool(false, true /* http proxy pool */, true /* socks pool */); @@ -683,11 +683,11 @@ TEST_F(SSLClientSocketPoolTest, IPPooling) { } MockRead reads[] = { - MockRead(true, ERR_IO_PENDING), + MockRead(ASYNC, ERR_IO_PENDING), }; StaticSocketDataProvider data(reads, arraysize(reads), NULL, 0); socket_factory_.AddSocketDataProvider(&data); - SSLSocketDataProvider ssl(true, OK); + SSLSocketDataProvider ssl(ASYNC, OK); ssl.cert = X509Certificate::CreateFromBytes( reinterpret_cast<const char*>(webkit_der), sizeof(webkit_der)); ssl.SetNextProto(SSLClientSocket::kProtoSPDY21); @@ -769,11 +769,11 @@ TEST_F(SSLClientSocketPoolTest, IPPoolingClientCert) { } MockRead reads[] = { - MockRead(true, ERR_IO_PENDING), + MockRead(ASYNC, ERR_IO_PENDING), }; StaticSocketDataProvider data(reads, arraysize(reads), NULL, 0); socket_factory_.AddSocketDataProvider(&data); - SSLSocketDataProvider ssl(true, OK); + SSLSocketDataProvider ssl(ASYNC, OK); ssl.cert = X509Certificate::CreateFromBytes( reinterpret_cast<const char*>(webkit_der), sizeof(webkit_der)); ssl.client_cert_sent = true; diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc index 7b9436d..e43d83e 100644 --- a/net/socket/ssl_client_socket_unittest.cc +++ b/net/socket/ssl_client_socket_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -616,9 +616,10 @@ TEST_F(SSLClientSocketTest, PrematureApplicationData) { // All reads and writes complete synchronously (async=false). net::MockRead data_reads[] = { - net::MockRead(false, reinterpret_cast<const char*>(application_data), + net::MockRead(net::SYNCHRONOUS, + reinterpret_cast<const char*>(application_data), arraysize(application_data)), - net::MockRead(false, net::OK), + net::MockRead(net::SYNCHRONOUS, net::OK), }; net::StaticSocketDataProvider data(data_reads, arraysize(data_reads), |