summaryrefslogtreecommitdiffstats
path: root/net/socket
diff options
context:
space:
mode:
Diffstat (limited to 'net/socket')
-rw-r--r--net/socket/socket_test_util.cc5
-rw-r--r--net/socket/socket_test_util.h6
2 files changed, 8 insertions, 3 deletions
diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc
index 99a200f..5cae82e 100644
--- a/net/socket/socket_test_util.cc
+++ b/net/socket/socket_test_util.cc
@@ -475,11 +475,12 @@ void DynamicSocketDataProvider::Reset() {
reads_.clear();
}
-void DynamicSocketDataProvider::SimulateRead(const char* data) {
+void DynamicSocketDataProvider::SimulateRead(const char* data,
+ const size_t length) {
if (!allow_unconsumed_reads_) {
EXPECT_TRUE(reads_.empty()) << "Unconsumed read: " << reads_.front().data;
}
- reads_.push_back(MockRead(data));
+ reads_.push_back(MockRead(true, data, length));
}
DelayedSocketData::DelayedSocketData(
diff --git a/net/socket/socket_test_util.h b/net/socket/socket_test_util.h
index f50cf7d..6e0698f 100644
--- a/net/socket/socket_test_util.h
+++ b/net/socket/socket_test_util.h
@@ -5,6 +5,7 @@
#ifndef NET_SOCKET_SOCKET_TEST_UTIL_H_
#define NET_SOCKET_SOCKET_TEST_UTIL_H_
+#include <cstring>
#include <deque>
#include <string>
#include <vector>
@@ -211,7 +212,10 @@ class DynamicSocketDataProvider : public SocketDataProvider {
protected:
// The next time there is a read from this socket, it will return |data|.
// Before calling SimulateRead next time, the previous data must be consumed.
- void SimulateRead(const char* data);
+ void SimulateRead(const char* data, size_t length);
+ void SimulateRead(const char* data) {
+ SimulateRead(data, std::strlen(data));
+ }
private:
std::deque<MockRead> reads_;