Change MockRead and MockWrite (et. al.) to take an IoMode enum, instead

net/socket/deterministic_socket_data_unittest.cc

 // 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.
 
 #include "net/socket/socket_test_util.h"
 
 #include "testing/platform_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 //-----------------------------------------------------------------------------
@@ skipping 147 matching lines @@
   memcpy(buf->data(), data, len);
 
   // Issue the read, which will complete asynchronously
   ASSERT_EQ(rv, sock_->Write(buf, len, write_callback_.callback()));
 }
 
 // ----------- Read
 
 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);
 
   data_->SetStopped(true);
   AssertReadReturns(kMsg1, kLen1, ERR_UNEXPECTED);
 }
 
 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);
 
   data_->StopAfter(2);
   ASSERT_FALSE(data_->stopped());
   AssertReadReturns(kMsg1, kLen1, ERR_UNEXPECTED);
 }
 
 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);
   // Make sure we don't stop before we've read all the data
   data_->StopAfter(1);
   AssertSyncReadEquals(kMsg1, kLen1);
 }
 
 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);
 
   // Make sure we don't stop before we've read all the data
   data_->StopAfter(10);
   AssertSyncReadEquals(kMsg1, kLen1);
   AssertSyncReadEquals(kMsg2, kLen2);
   AssertSyncReadEquals(kMsg3, kLen3);
   AssertSyncReadEquals(kMsg3, kLen3);
   AssertSyncReadEquals(kMsg2, kLen2);
   AssertSyncReadEquals(kMsg3, kLen3);
   AssertSyncReadEquals(kMsg1, kLen1);
 }
 
 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);
 
   AssertAsyncReadEquals(kMsg1, kLen1);
 }
 
 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);
 
   AssertAsyncReadEquals(kMsg1, kLen1);
   AssertAsyncReadEquals(kMsg2, kLen2);
   AssertAsyncReadEquals(kMsg3, kLen3);
   AssertAsyncReadEquals(kMsg3, kLen3);
   AssertAsyncReadEquals(kMsg2, kLen2);
   AssertAsyncReadEquals(kMsg3, kLen3);
   AssertAsyncReadEquals(kMsg1, kLen1);
 }
 
 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);
 
   data_->StopAfter(1);
   AssertSyncReadEquals(kMsg1, kLen1);
   AssertAsyncReadEquals(kMsg2, kLen2);
   data_->StopAfter(1);
   AssertSyncReadEquals(kMsg3, kLen3);
   AssertAsyncReadEquals(kMsg3, kLen3);
   data_->StopAfter(1);
   AssertSyncReadEquals(kMsg2, kLen2);
   AssertAsyncReadEquals(kMsg3, kLen3);
   data_->StopAfter(1);
   AssertSyncReadEquals(kMsg1, kLen1);
 }
 
 // ----------- Write
 
 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));
 
   data_->SetStopped(true);
   AssertWriteReturns(kMsg1, kLen1, ERR_UNEXPECTED);
 }
 
 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));
 
   data_->StopAfter(2);
   ASSERT_FALSE(data_->stopped());
   AssertWriteReturns(kMsg1, kLen1, ERR_UNEXPECTED);
 }
 
 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));
 
   // Make sure we don't stop before we've read all the data
   data_->StopAfter(1);
   AssertSyncWriteEquals(kMsg1, kLen1);
 }
 
 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));
 
   // Make sure we don't stop before we've read all the data
   data_->StopAfter(10);
   AssertSyncWriteEquals(kMsg1, kLen1);
   AssertSyncWriteEquals(kMsg2, kLen2);
   AssertSyncWriteEquals(kMsg3, kLen3);
   AssertSyncWriteEquals(kMsg3, kLen3);
   AssertSyncWriteEquals(kMsg2, kLen2);
   AssertSyncWriteEquals(kMsg3, kLen3);
   AssertSyncWriteEquals(kMsg1, kLen1);
 }
 
 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));
 
   AssertAsyncWriteEquals(kMsg1, kLen1);
 }
 
 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));
 
   AssertAsyncWriteEquals(kMsg1, kLen1);
   AssertAsyncWriteEquals(kMsg2, kLen2);
   AssertAsyncWriteEquals(kMsg3, kLen3);
   AssertAsyncWriteEquals(kMsg3, kLen3);
   AssertAsyncWriteEquals(kMsg2, kLen2);
   AssertAsyncWriteEquals(kMsg3, kLen3);
   AssertAsyncWriteEquals(kMsg1, kLen1);
 }
 
 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));
 
   data_->StopAfter(1);
   AssertSyncWriteEquals(kMsg1, kLen1);
   AssertAsyncWriteEquals(kMsg2, kLen2);
   data_->StopAfter(1);
   AssertSyncWriteEquals(kMsg3, kLen3);
   AssertAsyncWriteEquals(kMsg3, kLen3);
   data_->StopAfter(1);
   AssertSyncWriteEquals(kMsg2, kLen2);
   AssertAsyncWriteEquals(kMsg3, kLen3);
   data_->StopAfter(1);
   AssertSyncWriteEquals(kMsg1, kLen1);
 }
 
 // ----------- Mixed Reads and Writes
 
 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));
 
   // Make sure we don't stop before we've read/written everything
   data_->StopAfter(10);
   AssertSyncReadEquals(kMsg1, kLen1);
   AssertSyncWriteEquals(kMsg2, kLen2);
   AssertSyncWriteEquals(kMsg3, kLen3);
   AssertSyncReadEquals(kMsg2, kLen2);
 }
 
 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));
 
   AssertAsyncReadEquals(kMsg1, kLen1);
   AssertAsyncWriteEquals(kMsg2, kLen2);
   AssertAsyncWriteEquals(kMsg3, kLen3);
   AssertAsyncReadEquals(kMsg2, kLen2);
 }
 
 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));
 
   // Issue the write, which will block until the read completes
   AssertWriteReturns(kMsg2, kLen2, ERR_IO_PENDING);
 
   // Issue the read which will return first
   AssertReadReturns(kMsg1, kLen1, ERR_IO_PENDING);
 
@@ skipping 15 matching lines @@
   ASSERT_EQ(kLen3, write_callback_.WaitForResult());
 
   data_->RunFor(1);
   ASSERT_EQ(kLen2, read_callback_.WaitForResult());
   AssertReadBufferEquals(kMsg2, kLen2);
 }
 
 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));
 
   // Issue the write, which will block until the read completes
   AssertWriteReturns(kMsg2, kLen2, ERR_IO_PENDING);
 
   // Issue the writes which will complete immediately
   data_->StopAfter(1);
   AssertSyncReadEquals(kMsg1, kLen1);
 
   data_->RunFor(1);
   ASSERT_EQ(kLen2, write_callback_.WaitForResult());
 
   // Issue the read, which will block until the write completes
   AssertReadReturns(kMsg2, kLen2, ERR_IO_PENDING);
 
   // Issue the writes which will complete immediately
   data_->StopAfter(1);
   AssertSyncWriteEquals(kMsg3, kLen3);
 
   data_->RunFor(1);
   ASSERT_EQ(kLen2, read_callback_.WaitForResult());
   AssertReadBufferEquals(kMsg2, kLen2);
 }
 
 }  // namespace net