Use SignalingAddress in SignalStrategy insterface.

remoting/host/host_status_logger_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/host/host_status_logger.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "remoting/host/fake_host_status_monitor.h"
 #include "remoting/signaling/mock_signal_strategy.h"
@@ skipping 106 matching lines @@
   if (log_entry->NextChild()) {
     return false;
   }
   return true;
 }
 
 }  // namespace
 
 class HostStatusLoggerTest : public testing::Test {
  public:
-  HostStatusLoggerTest() {}
+  HostStatusLoggerTest() : signal_strategy_(SignalingAddress(kHostJid)) {}
   void SetUp() override {
     EXPECT_CALL(signal_strategy_, AddListener(_));
     host_status_logger_.reset(
         new HostStatusLogger(host_status_monitor_.AsWeakPtr(),
                              ServerLogEntry::ME2ME,
                              &signal_strategy_,
                              kTestBotJid));
     EXPECT_CALL(signal_strategy_, RemoveListener(_));
   }
 
  protected:
   base::MessageLoop message_loop_;
   MockSignalStrategy signal_strategy_;
   std::unique_ptr<HostStatusLogger> host_status_logger_;
   FakeHostStatusMonitor host_status_monitor_;
 };
 
 TEST_F(HostStatusLoggerTest, SendNow) {
   base::RunLoop run_loop;
   {
     InSequence s;
-    EXPECT_CALL(signal_strategy_, GetLocalJid())
-        .WillRepeatedly(Return(kHostJid));
     EXPECT_CALL(signal_strategy_, AddListener(_));
     EXPECT_CALL(signal_strategy_, GetNextId());
     EXPECT_CALL(signal_strategy_, SendStanzaPtr(IsClientConnected("direct")))
         .WillOnce(DoAll(DeleteArg<0>(), Return(true)));
     EXPECT_CALL(signal_strategy_, RemoveListener(_))
         .WillOnce(QuitRunLoop(&run_loop))
         .RetiresOnSaturation();
   }
   host_status_logger_->SetSignalingStateForTest(SignalStrategy::CONNECTED);
   protocol::TransportRoute route;
   route.type = protocol::TransportRoute::DIRECT;
   host_status_logger_->OnClientRouteChange(kClientJid1, "video", route);
   host_status_logger_->OnClientAuthenticated(kClientJid1);
   host_status_logger_->OnClientConnected(kClientJid1);
   host_status_logger_->SetSignalingStateForTest(
       SignalStrategy::DISCONNECTED);
   run_loop.Run();
 }
 
 TEST_F(HostStatusLoggerTest, SendLater) {
   base::RunLoop run_loop;
   protocol::TransportRoute route;
   route.type = protocol::TransportRoute::DIRECT;
   host_status_logger_->OnClientRouteChange(kClientJid1, "video", route);
   host_status_logger_->OnClientAuthenticated(kClientJid1);
   host_status_logger_->OnClientConnected(kClientJid1);
+
   {
     InSequence s;
-    EXPECT_CALL(signal_strategy_, GetLocalJid())
-        .WillRepeatedly(Return(kHostJid));
     EXPECT_CALL(signal_strategy_, AddListener(_));
     EXPECT_CALL(signal_strategy_, GetNextId());
     EXPECT_CALL(signal_strategy_, SendStanzaPtr(IsClientConnected("direct")))
         .WillOnce(DoAll(DeleteArg<0>(), Return(true)));
     EXPECT_CALL(signal_strategy_, RemoveListener(_))
         .WillOnce(QuitRunLoop(&run_loop))
         .RetiresOnSaturation();
   }
   host_status_logger_->SetSignalingStateForTest(SignalStrategy::CONNECTED);
   host_status_logger_->SetSignalingStateForTest(SignalStrategy::DISCONNECTED);
   run_loop.Run();
 }
 
 TEST_F(HostStatusLoggerTest, SendTwoEntriesLater) {
   base::RunLoop run_loop;
   protocol::TransportRoute route1;
   route1.type = protocol::TransportRoute::DIRECT;
   host_status_logger_->OnClientRouteChange(kClientJid1, "video", route1);
   host_status_logger_->OnClientAuthenticated(kClientJid1);
   host_status_logger_->OnClientConnected(kClientJid1);
   protocol::TransportRoute route2;
   route2.type = protocol::TransportRoute::STUN;
   host_status_logger_->OnClientRouteChange(kClientJid2, "video", route2);
   host_status_logger_->OnClientAuthenticated(kClientJid2);
   host_status_logger_->OnClientConnected(kClientJid2);
+
   {
     InSequence s;
-    EXPECT_CALL(signal_strategy_, GetLocalJid())
-        .WillRepeatedly(Return(kHostJid));
     EXPECT_CALL(signal_strategy_, AddListener(_));
     EXPECT_CALL(signal_strategy_, GetNextId());
     EXPECT_CALL(signal_strategy_,
         SendStanzaPtr(IsTwoClientsConnected("direct", "stun")))
             .WillOnce(DoAll(DeleteArg<0>(), Return(true)));
     EXPECT_CALL(signal_strategy_, RemoveListener(_))
         .WillOnce(QuitRunLoop(&run_loop))
         .RetiresOnSaturation();
   }
   host_status_logger_->SetSignalingStateForTest(SignalStrategy::CONNECTED);
   host_status_logger_->SetSignalingStateForTest(SignalStrategy::DISCONNECTED);
   run_loop.Run();
 }
 
 TEST_F(HostStatusLoggerTest, HandleRouteChangeInUnusualOrder) {
   base::RunLoop run_loop;
+
   {
     InSequence s;
-    EXPECT_CALL(signal_strategy_, GetLocalJid())
-        .WillRepeatedly(Return(kHostJid));
     EXPECT_CALL(signal_strategy_, AddListener(_));
     EXPECT_CALL(signal_strategy_, GetNextId());
     EXPECT_CALL(signal_strategy_, SendStanzaPtr(IsClientConnected("direct")))
         .WillOnce(DoAll(DeleteArg<0>(), Return(true)));
     EXPECT_CALL(signal_strategy_, GetNextId());
     EXPECT_CALL(signal_strategy_, SendStanzaPtr(IsClientDisconnected()))
         .WillOnce(DoAll(DeleteArg<0>(), Return(true)));
     EXPECT_CALL(signal_strategy_, GetNextId());
     EXPECT_CALL(signal_strategy_, SendStanzaPtr(IsClientConnected("stun")))
         .WillOnce(DoAll(DeleteArg<0>(), Return(true)));
@@ skipping 11 matching lines @@
   route2.type = protocol::TransportRoute::STUN;
   host_status_logger_->OnClientRouteChange(kClientJid2, "video", route2);
   host_status_logger_->OnClientDisconnected(kClientJid1);
   host_status_logger_->OnClientAuthenticated(kClientJid2);
   host_status_logger_->OnClientConnected(kClientJid2);
   host_status_logger_->SetSignalingStateForTest(SignalStrategy::DISCONNECTED);
   run_loop.Run();
 }
 
 }  // namespace remoting