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

Unified Diff: jingle/notifier/listener/talk_mediator_unittest.cc

Issue 6833031: Changed the jingle network code in ChromeAsyncSocket to use the client socket pool. This also all... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Lint fix Created 9 years, 8 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: jingle/notifier/listener/talk_mediator_unittest.cc
===================================================================
--- jingle/notifier/listener/talk_mediator_unittest.cc (revision 81429)
+++ jingle/notifier/listener/talk_mediator_unittest.cc (working copy)
@@ -58,16 +58,19 @@
NewMockedTalkMediator(new MockMediatorThread()));
talk1->SetAuthToken("chromium@gmail.com", "token", "fake_service");
EXPECT_TRUE(talk1->state_.initialized);
+ talk1->Logout();
scoped_ptr<TalkMediatorImpl> talk2(
NewMockedTalkMediator(new MockMediatorThread()));
talk2->SetAuthToken("chromium@mail.google.com", "token", "fake_service");
EXPECT_TRUE(talk2->state_.initialized);
+ talk2->Logout();
scoped_ptr<TalkMediatorImpl> talk3(
NewMockedTalkMediator(new MockMediatorThread()));
talk3->SetAuthToken("chromium@mail.google.com", "token", "fake_service");
EXPECT_TRUE(talk3->state_.initialized);
+ talk3->Logout();
}
TEST_F(TalkMediatorImplTest, LoginWiring) {
@@ -132,7 +135,7 @@
EXPECT_EQ(2, mock->send_calls);
}
-TEST_F(TalkMediatorImplTest, MediatorThreadCallbacks) {
+TEST_F(TalkMediatorImplTest, DISABLED_MediatorThreadCallbacks) {
// The TalkMediatorImpl owns the mock.
MockMediatorThread* mock = new MockMediatorThread();
scoped_ptr<TalkMediatorImpl> talk1(NewMockedTalkMediator(mock));

Powered by Google App Engine
This is Rietveld 408576698