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

Unified Diff: remoting/protocol/channel_socket_adapter_unittest.cc

Issue 1197853003: Add P2PDatagramSocket and P2PStreamSocket interfaces. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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 | « remoting/protocol/channel_socket_adapter.cc ('k') | remoting/protocol/client_video_dispatcher_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/channel_socket_adapter_unittest.cc
diff --git a/remoting/protocol/channel_socket_adapter_unittest.cc b/remoting/protocol/channel_socket_adapter_unittest.cc
index 96992be18e5893d112099139febd69b13983fb85..85e73a19a9edd010fe970e7725150dac81698666 100644
--- a/remoting/protocol/channel_socket_adapter_unittest.cc
+++ b/remoting/protocol/channel_socket_adapter_unittest.cc
@@ -88,7 +88,7 @@ class TransportChannelSocketAdapterTest : public testing::Test {
TEST_F(TransportChannelSocketAdapterTest, Read) {
scoped_refptr<IOBuffer> buffer(new IOBuffer(kBufferSize));
- int result = target_->Read(buffer.get(), kBufferSize, callback_);
+ int result = target_->Recv(buffer.get(), kBufferSize, callback_);
ASSERT_EQ(net::ERR_IO_PENDING, result);
channel_.SignalReadPacket(&channel_, kTestData, kTestDataSize,
@@ -100,30 +100,30 @@ TEST_F(TransportChannelSocketAdapterTest, Read) {
TEST_F(TransportChannelSocketAdapterTest, ReadClose) {
scoped_refptr<IOBuffer> buffer(new IOBuffer(kBufferSize));
- int result = target_->Read(buffer.get(), kBufferSize, callback_);
+ int result = target_->Recv(buffer.get(), kBufferSize, callback_);
ASSERT_EQ(net::ERR_IO_PENDING, result);
target_->Close(kTestError);
EXPECT_EQ(kTestError, callback_result_);
- // All Read() calls after Close() should return the error.
- EXPECT_EQ(kTestError, target_->Read(buffer.get(), kBufferSize, callback_));
+ // All Recv() calls after Close() should return the error.
+ EXPECT_EQ(kTestError, target_->Recv(buffer.get(), kBufferSize, callback_));
}
-// Verify that Write sends the packet and returns correct result.
-TEST_F(TransportChannelSocketAdapterTest, Write) {
+// Verify that Send sends the packet and returns correct result.
+TEST_F(TransportChannelSocketAdapterTest, Send) {
scoped_refptr<IOBuffer> buffer(new IOBuffer(kTestDataSize));
EXPECT_CALL(channel_, SendPacket(buffer->data(), kTestDataSize, _, 0))
.WillOnce(Return(kTestDataSize));
- int result = target_->Write(buffer.get(), kTestDataSize, callback_);
+ int result = target_->Send(buffer.get(), kTestDataSize, callback_);
EXPECT_EQ(kTestDataSize, result);
}
-// Verify that the message is still sent if Write() is called while
+// Verify that the message is still sent if Send() is called while
// socket is not open yet. The result is the packet is lost.
-TEST_F(TransportChannelSocketAdapterTest, WritePending) {
+TEST_F(TransportChannelSocketAdapterTest, SendPending) {
scoped_refptr<IOBuffer> buffer(new IOBuffer(kTestDataSize));
EXPECT_CALL(channel_, SendPacket(buffer->data(), kTestDataSize, _, 0))
@@ -133,7 +133,7 @@ TEST_F(TransportChannelSocketAdapterTest, WritePending) {
EXPECT_CALL(channel_, GetError())
.WillOnce(Return(EWOULDBLOCK));
- int result = target_->Write(buffer.get(), kTestDataSize, callback_);
+ int result = target_->Send(buffer.get(), kTestDataSize, callback_);
ASSERT_EQ(net::OK, result);
}
« no previous file with comments | « remoting/protocol/channel_socket_adapter.cc ('k') | remoting/protocol/client_video_dispatcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698