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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: remoting/protocol/ice_transport_unittest.cc

Issue 1662673002: Add MessageChanneFactory interface and use it in ChannelDispatcherBase. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@framing
Patch Set: Created 4 years, 11 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/ice_transport.cc ('k') | remoting/protocol/message_channel_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/ice_transport_unittest.cc
diff --git a/remoting/protocol/ice_transport_unittest.cc b/remoting/protocol/ice_transport_unittest.cc
index 212c1f39350d9db3316b643e0a68f2d7e79305fe..b459458ae9260f5cf5946dc1fab9653b74af264a 100644
--- a/remoting/protocol/ice_transport_unittest.cc
+++ b/remoting/protocol/ice_transport_unittest.cc
@@ -18,8 +18,8 @@
#include "remoting/protocol/chromium_port_allocator.h"
#include "remoting/protocol/connection_tester.h"
#include "remoting/protocol/fake_authenticator.h"
-#include "remoting/protocol/p2p_stream_socket.h"
-#include "remoting/protocol/stream_channel_factory.h"
+#include "remoting/protocol/message_channel_factory.h"
+#include "remoting/protocol/message_pipe.h"
#include "remoting/protocol/transport_context.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -51,7 +51,7 @@ ACTION_P2(QuitRunLoopOnCounter, run_loop, counter) {
class MockChannelCreatedCallback {
public:
- MOCK_METHOD1(OnDone, void(P2PStreamSocket* socket));
+ MOCK_METHOD1(OnDone, void(MessagePipe* socket));
};
class TestTransportEventHandler : public IceTransport::EventHandler {
@@ -89,8 +89,8 @@ class IceTransportTest : public testing::Test {
}
void TearDown() override {
- client_socket_.reset();
- host_socket_.reset();
+ client_message_pipe_.reset();
+ host_message_pipe_.reset();
client_transport_.reset();
host_transport_.reset();
message_loop_.RunUntilIdle();
@@ -156,21 +156,22 @@ class IceTransportTest : public testing::Test {
run_loop_->Run();
- EXPECT_TRUE(client_socket_.get());
- EXPECT_TRUE(host_socket_.get());
+ EXPECT_TRUE(client_message_pipe_.get());
+ EXPECT_TRUE(host_message_pipe_.get());
}
- void OnClientChannelCreated(scoped_ptr<P2PStreamSocket> socket) {
- client_socket_ = std::move(socket);
- client_channel_callback_.OnDone(client_socket_.get());
+ void OnClientChannelCreated(scoped_ptr<MessagePipe> message_pipe) {
+ client_message_pipe_ = std::move(message_pipe);
+ client_channel_callback_.OnDone(client_message_pipe_.get());
}
- void OnHostChannelCreated(scoped_ptr<P2PStreamSocket> socket) {
- host_socket_ = std::move(socket);
- host_channel_callback_.OnDone(host_socket_.get());
+ void OnHostChannelCreated(scoped_ptr<MessagePipe> message_pipe) {
+ host_message_pipe_ = std::move(message_pipe);
+ host_channel_callback_.OnDone(host_message_pipe_.get());
}
void OnTransportError(ErrorCode error) {
+ LOG(ERROR) << "Transport Error";
error_ = error;
run_loop_->Quit();
}
@@ -194,8 +195,8 @@ class IceTransportTest : public testing::Test {
MockChannelCreatedCallback client_channel_callback_;
MockChannelCreatedCallback host_channel_callback_;
- scoped_ptr<P2PStreamSocket> client_socket_;
- scoped_ptr<P2PStreamSocket> host_socket_;
+ scoped_ptr<MessagePipe> client_message_pipe_;
+ scoped_ptr<MessagePipe> host_message_pipe_;
ErrorCode error_ = OK;
};
@@ -203,20 +204,19 @@ class IceTransportTest : public testing::Test {
TEST_F(IceTransportTest, DataStream) {
InitializeConnection();
- client_transport_->GetStreamChannelFactory()->CreateChannel(
+ client_transport_->GetChannelFactory()->CreateChannel(
kChannelName, base::Bind(&IceTransportTest::OnClientChannelCreated,
base::Unretained(this)));
- host_transport_->GetStreamChannelFactory()->CreateChannel(
+ host_transport_->GetChannelFactory()->CreateChannel(
kChannelName, base::Bind(&IceTransportTest::OnHostChannelCreated,
base::Unretained(this)));
WaitUntilConnected();
- StreamConnectionTester tester(host_socket_.get(), client_socket_.get(),
- kMessageSize, kMessages);
- tester.Start();
- message_loop_.Run();
- tester.CheckResults();
+ MessagePipeConnectionTester tester(host_message_pipe_.get(),
+ client_message_pipe_.get(), kMessageSize,
+ kMessages);
+ tester.RunAndCheckResults();
}
TEST_F(IceTransportTest, MuxDataStream) {
@@ -231,11 +231,10 @@ TEST_F(IceTransportTest, MuxDataStream) {
WaitUntilConnected();
- StreamConnectionTester tester(host_socket_.get(), client_socket_.get(),
- kMessageSize, kMessages);
- tester.Start();
- message_loop_.Run();
- tester.CheckResults();
+ MessagePipeConnectionTester tester(host_message_pipe_.get(),
+ client_message_pipe_.get(), kMessageSize,
+ kMessages);
+ tester.RunAndCheckResults();
}
TEST_F(IceTransportTest, FailedChannelAuth) {
@@ -245,23 +244,24 @@ TEST_F(IceTransportTest, FailedChannelAuth) {
InitializeConnection();
- client_transport_->GetStreamChannelFactory()->CreateChannel(
+ client_transport_->GetChannelFactory()->CreateChannel(
kChannelName, base::Bind(&IceTransportTest::OnClientChannelCreated,
base::Unretained(this)));
- host_transport_->GetStreamChannelFactory()->CreateChannel(
+ host_transport_->GetChannelFactory()->CreateChannel(
kChannelName, base::Bind(&IceTransportTest::OnHostChannelCreated,
base::Unretained(this)));
run_loop_.reset(new base::RunLoop());
- EXPECT_CALL(host_channel_callback_, OnDone(nullptr))
- .WillOnce(QuitRunLoop(run_loop_.get()));
+ // The callback should never be called.
+ EXPECT_CALL(host_channel_callback_, OnDone(_)).Times(0);
run_loop_->Run();
- EXPECT_FALSE(host_socket_);
+ EXPECT_FALSE(host_message_pipe_);
+ EXPECT_EQ(CHANNEL_CONNECTION_ERROR, error_);
- client_transport_->GetStreamChannelFactory()->CancelChannelCreation(
+ client_transport_->GetChannelFactory()->CancelChannelCreation(
kChannelName);
}
@@ -274,35 +274,35 @@ TEST_F(IceTransportTest, TestBrokenTransport) {
InitializeConnection();
- client_transport_->GetStreamChannelFactory()->CreateChannel(
+ client_transport_->GetChannelFactory()->CreateChannel(
kChannelName, base::Bind(&IceTransportTest::OnClientChannelCreated,
base::Unretained(this)));
- host_transport_->GetStreamChannelFactory()->CreateChannel(
+ host_transport_->GetChannelFactory()->CreateChannel(
kChannelName, base::Bind(&IceTransportTest::OnHostChannelCreated,
base::Unretained(this)));
message_loop_.RunUntilIdle();
// Verify that neither of the two ends of the channel is connected.
- EXPECT_FALSE(client_socket_);
- EXPECT_FALSE(host_socket_);
+ EXPECT_FALSE(client_message_pipe_);
+ EXPECT_FALSE(host_message_pipe_);
- client_transport_->GetStreamChannelFactory()->CancelChannelCreation(
+ client_transport_->GetChannelFactory()->CancelChannelCreation(
kChannelName);
- host_transport_->GetStreamChannelFactory()->CancelChannelCreation(
+ host_transport_->GetChannelFactory()->CancelChannelCreation(
kChannelName);
}
TEST_F(IceTransportTest, TestCancelChannelCreation) {
InitializeConnection();
- client_transport_->GetStreamChannelFactory()->CreateChannel(
+ client_transport_->GetChannelFactory()->CreateChannel(
kChannelName, base::Bind(&IceTransportTest::OnClientChannelCreated,
base::Unretained(this)));
- client_transport_->GetStreamChannelFactory()->CancelChannelCreation(
+ client_transport_->GetChannelFactory()->CancelChannelCreation(
kChannelName);
- EXPECT_TRUE(!client_socket_.get());
+ EXPECT_TRUE(!client_message_pipe_.get());
}
// Verify that we can still connect even when there is a delay in signaling
@@ -312,20 +312,19 @@ TEST_F(IceTransportTest, TestDelayedSignaling) {
InitializeConnection();
- client_transport_->GetStreamChannelFactory()->CreateChannel(
+ client_transport_->GetChannelFactory()->CreateChannel(
kChannelName, base::Bind(&IceTransportTest::OnClientChannelCreated,
base::Unretained(this)));
- host_transport_->GetStreamChannelFactory()->CreateChannel(
+ host_transport_->GetChannelFactory()->CreateChannel(
kChannelName, base::Bind(&IceTransportTest::OnHostChannelCreated,
base::Unretained(this)));
WaitUntilConnected();
- StreamConnectionTester tester(host_socket_.get(), client_socket_.get(),
- kMessageSize, kMessages);
- tester.Start();
- message_loop_.Run();
- tester.CheckResults();
+ MessagePipeConnectionTester tester(host_message_pipe_.get(),
+ client_message_pipe_.get(), kMessageSize,
+ kMessages);
+ tester.RunAndCheckResults();
}
« no previous file with comments | « remoting/protocol/ice_transport.cc ('k') | remoting/protocol/message_channel_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698