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

Unified Diff: remoting/host/log_to_server_host_unittest.cc

Issue 320403002: Pull out common code from client and host versions of LogToServer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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
Index: remoting/host/log_to_server_host_unittest.cc
diff --git a/remoting/host/log_to_server_unittest.cc b/remoting/host/log_to_server_host_unittest.cc
similarity index 94%
rename from remoting/host/log_to_server_unittest.cc
rename to remoting/host/log_to_server_host_unittest.cc
index b131f63a77085f3b91aaf2712846259bfdf2943d..6fec492acdc6d685d0159fe826ad2beac2ee43cd 100644
--- a/remoting/host/log_to_server_unittest.cc
+++ b/remoting/host/log_to_server_host_unittest.cc
@@ -5,7 +5,7 @@
#include "base/message_loop/message_loop.h"
#include "base/message_loop/message_loop_proxy.h"
#include "remoting/host/host_status_monitor_fake.h"
-#include "remoting/host/log_to_server.h"
+#include "remoting/host/log_to_server_host.h"
#include "remoting/jingle_glue/mock_objects.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gmock_mutant.h"
@@ -121,17 +121,17 @@ MATCHER(IsClientDisconnected, "") {
} // namespace
-class LogToServerTest : public testing::Test {
+class LogToServerHostTest : public testing::Test {
public:
- LogToServerTest() {}
+ LogToServerHostTest() {}
virtual void SetUp() OVERRIDE {
message_loop_proxy_ = base::MessageLoopProxy::current();
EXPECT_CALL(signal_strategy_, AddListener(_));
log_to_server_.reset(
- new LogToServer(host_status_monitor_.AsWeakPtr(),
- ServerLogEntry::ME2ME,
- &signal_strategy_,
- kTestBotJid));
+ new LogToServerHost(host_status_monitor_.AsWeakPtr(),
+ ServerLogEntry::ME2ME,
+ &signal_strategy_,
+ kTestBotJid));
EXPECT_CALL(signal_strategy_, RemoveListener(_));
}
@@ -139,11 +139,11 @@ class LogToServerTest : public testing::Test {
base::MessageLoop message_loop_;
scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;
MockSignalStrategy signal_strategy_;
- scoped_ptr<LogToServer> log_to_server_;
+ scoped_ptr<LogToServerHost> log_to_server_;
HostStatusMonitorFake host_status_monitor_;
};
-TEST_F(LogToServerTest, SendNow) {
+TEST_F(LogToServerHostTest, SendNow) {
{
InSequence s;
EXPECT_CALL(signal_strategy_, GetLocalJid())
@@ -166,7 +166,7 @@ TEST_F(LogToServerTest, SendNow) {
message_loop_.Run();
}
-TEST_F(LogToServerTest, SendLater) {
+TEST_F(LogToServerHostTest, SendLater) {
protocol::TransportRoute route;
route.type = protocol::TransportRoute::DIRECT;
log_to_server_->OnClientRouteChange(kClientJid1, "video", route);
@@ -189,7 +189,7 @@ TEST_F(LogToServerTest, SendLater) {
message_loop_.Run();
}
-TEST_F(LogToServerTest, SendTwoEntriesLater) {
+TEST_F(LogToServerHostTest, SendTwoEntriesLater) {
protocol::TransportRoute route1;
route1.type = protocol::TransportRoute::DIRECT;
log_to_server_->OnClientRouteChange(kClientJid1, "video", route1);
@@ -218,7 +218,7 @@ TEST_F(LogToServerTest, SendTwoEntriesLater) {
message_loop_.Run();
}
-TEST_F(LogToServerTest, HandleRouteChangeInUnusualOrder) {
+TEST_F(LogToServerHostTest, HandleRouteChangeInUnusualOrder) {
{
InSequence s;
EXPECT_CALL(signal_strategy_, GetLocalJid())

Powered by Google App Engine
This is Rietveld 408576698