diff options
author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-13 20:52:04 +0000 |
---|---|---|
committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-13 20:52:04 +0000 |
commit | c92ea3a284db20edcfecb5ff151351e47e1d2e84 (patch) | |
tree | fbe9e4350ca72f2750078946e61c8a1a9f29b031 /jingle | |
parent | 0af7b151111d085a4b1be4fd31485297f8d41bf2 (diff) | |
download | chromium_src-c92ea3a284db20edcfecb5ff151351e47e1d2e84.zip chromium_src-c92ea3a284db20edcfecb5ff151351e47e1d2e84.tar.gz chromium_src-c92ea3a284db20edcfecb5ff151351e47e1d2e84.tar.bz2 |
[Jingle] Fix jingle_unittests failures
BUG=55427
TEST=
Review URL: http://codereview.chromium.org/6838026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81473 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle')
-rw-r--r-- | jingle/notifier/listener/talk_mediator_unittest.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/jingle/notifier/listener/talk_mediator_unittest.cc b/jingle/notifier/listener/talk_mediator_unittest.cc index 4cdb884..7b93d64 100644 --- a/jingle/notifier/listener/talk_mediator_unittest.cc +++ b/jingle/notifier/listener/talk_mediator_unittest.cc @@ -58,16 +58,19 @@ TEST_F(TalkMediatorImplTest, SetAuthToken) { 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) { @@ -165,7 +168,8 @@ TEST_F(TalkMediatorImplTest, MediatorThreadCallbacks) { mock->ReceiveNotification(incoming_data); // Shouldn't trigger a call to the delegate since we disconnect - // it before we logout. + // it before we logout the mediator thread. + talk1->Logout(); talk1.reset(); } |