Move signaling connection creation out of ChromotingHost.

remoting/host/log_to_server_unittest.cc

 // Copyright (c) 2011 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 "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "remoting/jingle_glue/mock_objects.h"
 #include "remoting/host/log_to_server.h"
 #include "testing/gmock_mutant.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 13 matching lines @@
   message_loop->PostTask(FROM_HERE, MessageLoop::QuitClosure());
 }
 
 }  // namespace
 
 class LogToServerTest : public testing::Test {
  public:
   LogToServerTest() {}
   virtual void SetUp() OVERRIDE {
     message_loop_proxy_ = base::MessageLoopProxy::current();
-    log_to_server_.reset(new LogToServer(message_loop_proxy_));
+    EXPECT_CALL(signal_strategy_, AddListener(_));
+    log_to_server_.reset(new LogToServer(&signal_strategy_));
+    EXPECT_CALL(signal_strategy_, RemoveListener(_));
   }
 
  protected:
+  MessageLoop message_loop_;
   scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;
+  MockSignalStrategy signal_strategy_;
   scoped_ptr<LogToServer> log_to_server_;
-  MessageLoop message_loop_;
-  MockSignalStrategy signal_strategy_;
 };
 
 TEST_F(LogToServerTest, SendNow) {
   {
     InSequence s;
     EXPECT_CALL(signal_strategy_, GetLocalJid())
         .WillRepeatedly(Return("host@domain.com/1234"));
     EXPECT_CALL(signal_strategy_, AddListener(_));
     EXPECT_CALL(signal_strategy_, GetNextId());
     EXPECT_CALL(signal_strategy_, SendStanza(_))
         .WillOnce(DoAll(DeleteArg<0>(), Return(true)));
     EXPECT_CALL(signal_strategy_, RemoveListener(_))
         .WillOnce(QuitMainMessageLoop(&message_loop_))
         .RetiresOnSaturation();
   }
-  log_to_server_->OnSignallingConnected(&signal_strategy_);
+  log_to_server_->OnSignalStrategyStateChange(SignalStrategy::CONNECTED);
   log_to_server_->OnClientAuthenticated("client@domain.com/5678");
-  log_to_server_->OnSignallingDisconnected();
+  log_to_server_->OnSignalStrategyStateChange(SignalStrategy::DISCONNECTED);
   message_loop_.Run();
 }
 
 TEST_F(LogToServerTest, SendLater) {
   {
     InSequence s;
     EXPECT_CALL(signal_strategy_, GetLocalJid())
         .WillRepeatedly(Return("host@domain.com/1234"));
     EXPECT_CALL(signal_strategy_, AddListener(_));
     EXPECT_CALL(signal_strategy_, GetNextId());
     EXPECT_CALL(signal_strategy_, SendStanza(_))
         .WillOnce(DoAll(DeleteArg<0>(), Return(true)));
     EXPECT_CALL(signal_strategy_, RemoveListener(_))
         .WillOnce(QuitMainMessageLoop(&message_loop_))
         .RetiresOnSaturation();
   }
   log_to_server_->OnClientAuthenticated("client@domain.com/5678");
-  log_to_server_->OnSignallingConnected(&signal_strategy_);
-  log_to_server_->OnSignallingDisconnected();
+  log_to_server_->OnSignalStrategyStateChange(SignalStrategy::CONNECTED);

[Wez, 2012/01/03 16:25:04]

nit: This test should really verify that the stanza is not sent until CONNECTED
is notified.

[Sergey Ulanov, 2012/01/03 21:51:02]

Done.

+  log_to_server_->OnSignalStrategyStateChange(SignalStrategy::DISCONNECTED);
   message_loop_.Run();
 }
 
 TEST_F(LogToServerTest, SendTwoEntriesLater) {
   {
     InSequence s;
     EXPECT_CALL(signal_strategy_, GetLocalJid())
         .WillRepeatedly(Return("host@domain.com/1234"));
     EXPECT_CALL(signal_strategy_, AddListener(_));
     EXPECT_CALL(signal_strategy_, GetNextId());
     EXPECT_CALL(signal_strategy_, SendStanza(_))
         .WillOnce(DoAll(DeleteArg<0>(), Return(true)));
     EXPECT_CALL(signal_strategy_, RemoveListener(_))
         .WillOnce(QuitMainMessageLoop(&message_loop_))
         .RetiresOnSaturation();
   }
   log_to_server_->OnClientAuthenticated("client@domain.com/5678");
   log_to_server_->OnClientAuthenticated("client2@domain.com/6789");
-  log_to_server_->OnSignallingConnected(&signal_strategy_);
-  log_to_server_->OnSignallingDisconnected();
+  log_to_server_->OnSignalStrategyStateChange(SignalStrategy::CONNECTED);
+  log_to_server_->OnSignalStrategyStateChange(SignalStrategy::DISCONNECTED);
   message_loop_.Run();
 }
 
 }  // namespace remoting