Delete Session and SessionManager object synchronously.

remoting/protocol/pepper_session_unittest.cc

 // Copyright (c) 2012 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/protocol/pepper_session.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "base/test/test_timeouts.h"
@@ skipping 208 matching lines @@
 
     client_session_ = client_server_->Connect(
         kHostJid, authenticator.Pass(),
         CandidateSessionConfig::CreateDefault(),
         base::Bind(&MockSessionCallback::OnStateChange,
                    base::Unretained(&client_connection_callback_)));
 
     message_loop_.RunAllPending();
   }
 
-  void CreateChannel() {
+  void CreateChannel(bool expect_fail) {
     client_session_->CreateStreamChannel(kChannelName, base::Bind(
         &PepperSessionTest::OnClientChannelCreated, base::Unretained(this)));
     host_session_->CreateStreamChannel(kChannelName, base::Bind(
         &PepperSessionTest::OnHostChannelCreated, base::Unretained(this)));
 
     int counter = 2;
     EXPECT_CALL(client_channel_callback_, OnDone(_))
         .WillOnce(QuitThreadOnCounter(&counter));
     EXPECT_CALL(host_channel_callback_, OnDone(_))
         .WillOnce(QuitThreadOnCounter(&counter));
     message_loop_.Run();
+
+    if (expect_fail) {
+      EXPECT_TRUE(!client_socket_.get() || host_socket_.get());

[Wez, 2012/02/23 19:33:42]

Do you mean !(client_socket_.get() || host_socket_.get()) here?

Given that you've written the expect success case as two EXPECT_TRUE()s you
could just have these be EXPECT_FALSE()?

[Sergey Ulanov, 2012/02/23 22:10:06]

I meant (!client_socket_.get()) || (!host_socket_.get()). Fixed.

+    } else {
+      EXPECT_TRUE(client_socket_.get());
+      EXPECT_TRUE(host_socket_.get());
+    }
   }
 
   JingleThreadMessageLoop message_loop_;
 
   scoped_ptr<FakeSignalStrategy> host_signal_strategy_;
   scoped_ptr<FakeSignalStrategy> client_signal_strategy_;
 
   scoped_ptr<PepperSessionManager> host_server_;
   MockSessionManagerListener host_server_listener_;
   scoped_ptr<PepperSessionManager> client_server_;
@@ skipping 71 matching lines @@
   CreateSessionManagers(3, FakeAuthenticator::REJECT);
   InitiateConnection(3, FakeAuthenticator::ACCEPT, true);
 }
 
 // Verify that data can sent over stream channel.
 TEST_F(PepperSessionTest, TestStreamChannel) {
   CreateSessionManagers(1, FakeAuthenticator::ACCEPT);
   ASSERT_NO_FATAL_FAILURE(
       InitiateConnection(1, FakeAuthenticator::ACCEPT, false));
 
-  ASSERT_NO_FATAL_FAILURE(CreateChannel());
+  ASSERT_NO_FATAL_FAILURE(CreateChannel(false));
 
   StreamConnectionTester tester(host_socket_.get(), client_socket_.get(),
                                 kMessageSize, kMessages);
   tester.Start();
   message_loop_.Run();
   tester.CheckResults();
 }
 
 // Verify that we can connect channels with multistep auth.
 TEST_F(PepperSessionTest, TestMultistepAuthStreamChannel) {
   CreateSessionManagers(3, FakeAuthenticator::ACCEPT);
   ASSERT_NO_FATAL_FAILURE(
       InitiateConnection(3, FakeAuthenticator::ACCEPT, false));
 
-  ASSERT_NO_FATAL_FAILURE(CreateChannel());
+  ASSERT_NO_FATAL_FAILURE(CreateChannel(false));
 
   StreamConnectionTester tester(host_socket_.get(), client_socket_.get(),
                                 kMessageSize, kMessages);
   tester.Start();
   message_loop_.Run();
   tester.CheckResults();
 }
 
+// Verify that data can sent over stream channel.

[Wez, 2012/02/23 19:33:42]

typo: ... can be sent ...

[Sergey Ulanov, 2012/02/23 22:10:06]

The comment was incorrect.

+TEST_F(PepperSessionTest, TestFailedChannelAuth) {
+  CreateSessionManagers(1, FakeAuthenticator::ACCEPT);
+  ASSERT_NO_FATAL_FAILURE(
+      InitiateConnection(1, FakeAuthenticator::REJECT_CHANNEL, false));
+
+  ASSERT_NO_FATAL_FAILURE(CreateChannel(true));
+}
+
 }  // namespace protocol
 }  // namespace remoting