jingle/notifier/base/xmpp_connection_unittest.cc - Issue 10382003: Changes needed to roll libjingle r141

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: jingle/notifier/base/xmpp_connection_unittest.cc

Issue 10382003: Changes needed to roll libjingle r141 (Closed) Base URL: http://src.chromium.org/svn/trunk/src/

Patch Set: Created 8 years, 7 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

« jingle/notifier/base/notifier_options_util.cc ('K') | « jingle/notifier/base/notifier_options_util.cc ('k') | jingle/notifier/communicator/single_login_attempt.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: jingle/notifier/base/xmpp_connection_unittest.cc

===================================================================

--- jingle/notifier/base/xmpp_connection_unittest.cc (revision 136430)

+++ jingle/notifier/base/xmpp_connection_unittest.cc (working copy)

@@ -47,17 +47,19 @@

std::string(const std::vector<std::string>&, bool));

MOCK_METHOD1(CreateSaslMechanism,

buzz::SaslMechanism*(const std::string&));

- MOCK_METHOD4(StartPreXmppAuth,

+ MOCK_METHOD5(StartPreXmppAuth,

void(const buzz::Jid&,

const talk_base::SocketAddress&,

const talk_base::CryptString&,

+ const std::string&,

const std::string&));

MOCK_CONST_METHOD0(IsAuthDone, bool());

MOCK_CONST_METHOD0(IsAuthorized, bool());

MOCK_CONST_METHOD0(HadError, bool());

MOCK_CONST_METHOD0(GetError, int());

MOCK_CONST_METHOD0(GetCaptchaChallenge, buzz::CaptchaChallenge());

- MOCK_CONST_METHOD0(GetAuthCookie, std::string());

+ MOCK_CONST_METHOD0(GetAuthToken, std::string());

+ MOCK_CONST_METHOD0(GetAuthMechanism, std::string());

};

class MockXmppConnectionDelegate : public XmppConnection::Delegate {

@@ -113,7 +115,7 @@

}

TEST_F(XmppConnectionTest, PreAuthFailure) {

- EXPECT_CALL(*mock_pre_xmpp_auth_, StartPreXmppAuth(_, _, _, _));

+ EXPECT_CALL(*mock_pre_xmpp_auth_, StartPreXmppAuth(_, _, _, _,_));

EXPECT_CALL(*mock_pre_xmpp_auth_, IsAuthDone()).WillOnce(Return(true));

EXPECT_CALL(*mock_pre_xmpp_auth_, IsAuthorized()).WillOnce(Return(false));

EXPECT_CALL(*mock_pre_xmpp_auth_, HadError()).WillOnce(Return(true));

@@ -132,10 +134,11 @@

}

TEST_F(XmppConnectionTest, FailureAfterPreAuth) {

- EXPECT_CALL(*mock_pre_xmpp_auth_, StartPreXmppAuth(_, _, _, _));

+ EXPECT_CALL(*mock_pre_xmpp_auth_, StartPreXmppAuth(_, _, _, _,_));

EXPECT_CALL(*mock_pre_xmpp_auth_, IsAuthDone()).WillOnce(Return(true));

EXPECT_CALL(*mock_pre_xmpp_auth_, IsAuthorized()).WillOnce(Return(true));

- EXPECT_CALL(*mock_pre_xmpp_auth_, GetAuthCookie()).WillOnce(Return(""));

+ EXPECT_CALL(*mock_pre_xmpp_auth_, GetAuthMechanism()).WillOnce(Return(""));

+ EXPECT_CALL(*mock_pre_xmpp_auth_, GetAuthToken()).WillOnce(Return(""));

EXPECT_CALL(mock_xmpp_connection_delegate_,

OnError(buzz::XmppEngine::ERROR_NONE, 0, NULL));