summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authorsimonmorris@chromium.org <simonmorris@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-24 01:12:45 +0000
committersimonmorris@chromium.org <simonmorris@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-24 01:12:45 +0000
commit7033be5dc709e51a28fc16b8359cd41ccd2e5523 (patch)
tree33ff56cb44f7328bafcd206c210099962c14503a /remoting
parent61165fd4fe8fa33c275e4c43ae2628fb85960822 (diff)
downloadchromium_src-7033be5dc709e51a28fc16b8359cd41ccd2e5523.zip
chromium_src-7033be5dc709e51a28fc16b8359cd41ccd2e5523.tar.gz
chromium_src-7033be5dc709e51a28fc16b8359cd41ccd2e5523.tar.bz2
[Chromoting] Fix unit test warnings introduced in r146455.
Review URL: https://chromiumcodereview.appspot.com/10815023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148018 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r--remoting/protocol/jingle_session_unittest.cc12
1 files changed, 12 insertions, 0 deletions
diff --git a/remoting/protocol/jingle_session_unittest.cc b/remoting/protocol/jingle_session_unittest.cc
index 95a1de5..c72da08 100644
--- a/remoting/protocol/jingle_session_unittest.cc
+++ b/remoting/protocol/jingle_session_unittest.cc
@@ -23,6 +23,7 @@
#include "testing/gtest/include/gtest/gtest.h"
using testing::_;
+using testing::AtLeast;
using testing::AtMost;
using testing::DeleteArg;
using testing::DoAll;
@@ -236,6 +237,7 @@ class JingleSessionTest : public testing::Test {
&JingleSessionTest::OnHostChannelCreated, base::Unretained(this)));
int counter = 2;
+ ExpectRouteChange();
EXPECT_CALL(client_channel_callback_, OnDone(_))
.WillOnce(QuitThreadOnCounter(&counter));
EXPECT_CALL(host_channel_callback_, OnDone(_))
@@ -246,6 +248,15 @@ class JingleSessionTest : public testing::Test {
EXPECT_TRUE(host_socket_.get());
}
+ void ExpectRouteChange() {
+ EXPECT_CALL(host_session_event_handler_,
+ OnSessionRouteChange(kChannelName, _))
+ .Times(AtLeast(1));
+ EXPECT_CALL(client_session_event_handler_,
+ OnSessionRouteChange(kChannelName, _))
+ .Times(AtLeast(1));
+ }
+
scoped_ptr<JingleThreadMessageLoop> message_loop_;
scoped_ptr<FakeSignalStrategy> host_signal_strategy_;
@@ -381,6 +392,7 @@ TEST_F(JingleSessionTest, TestFailedChannelAuth) {
.WillOnce(QuitThread());
EXPECT_CALL(client_channel_callback_, OnDone(_))
.Times(AtMost(1));
+ ExpectRouteChange();
message_loop_->Run();