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

Unified Diff: net/socket/sequenced_socket_data_unittest.cc

Issue 1129473002: Revert of Add CompleteRead to SequencedSocketData and convert all but 3 tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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
« no previous file with comments | « net/http/http_network_transaction_unittest.cc ('k') | net/socket/socket_test_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/sequenced_socket_data_unittest.cc
diff --git a/net/socket/sequenced_socket_data_unittest.cc b/net/socket/sequenced_socket_data_unittest.cc
index d59420ee27aa5d03c4eb998c28d99e5441084c87..3e1dbd3fc3bb0b8108bce63f2cbe0040f3f3fb9f 100644
--- a/net/socket/sequenced_socket_data_unittest.cc
+++ b/net/socket/sequenced_socket_data_unittest.cc
@@ -194,7 +194,6 @@
void AssertSyncWriteEquals(const char* data, int len);
void AssertAsyncWriteEquals(const char* data, int len);
void AssertWriteReturns(const char* data, int len, int rv);
- void CompleteRead();
// When a given test completes, data_.at_eof() is expected to
// match the value specified here. Most test should consume all
@@ -314,10 +313,6 @@
ASSERT_EQ(len, write_callback_.WaitForResult());
}
-void SequencedSocketDataTest::CompleteRead() {
- data_->CompleteRead();
-}
-
void SequencedSocketDataTest::AssertWriteReturns(const char* data,
int len,
int rv) {
@@ -608,28 +603,6 @@
ASSERT_FALSE(read_callback_.have_result());
}
-TEST_F(SequencedSocketDataTest, CompleteRead) {
- MockRead reads[] = {
- MockRead(ASYNC, ERR_IO_PENDING, 0), MockRead(ASYNC, kMsg1, kLen1, 1),
- };
-
- Initialize(reads, arraysize(reads), nullptr, 0);
-
- AssertReadReturns(kLen1, ERR_IO_PENDING);
- ASSERT_FALSE(read_callback_.have_result());
-
- // Even though the read is scheduled to complete at sequence number 0,
- // verify that the read callback in not called, until CompleteRead() is.
- base::MessageLoop::current()->RunUntilIdle();
- ASSERT_FALSE(read_callback_.have_result());
-
- CompleteRead();
-
- ASSERT_TRUE(read_callback_.have_result());
- ASSERT_EQ(kLen1, read_callback_.WaitForResult());
- AssertReadBufferEquals(kMsg1, kLen1);
-}
-
// ----------- Write
TEST_F(SequencedSocketDataTest, SingleSyncWriteTooEarly) {
« no previous file with comments | « net/http/http_network_transaction_unittest.cc ('k') | net/socket/socket_test_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698