Index: net/socket/deterministic_socket_data_unittest.cc |
=================================================================== |
--- net/socket/deterministic_socket_data_unittest.cc (revision 123143) |
+++ net/socket/deterministic_socket_data_unittest.cc (working copy) |
@@ -165,8 +165,8 @@ |
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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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)); |