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

Unified Diff: remoting/protocol/jingle_session_unittest.cc

Issue 10815023: [Chromoting] Fix unit test warnings introduced in r146455. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Set expectations more accurately." Created 8 years, 5 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/jingle_session_unittest.cc
diff --git a/remoting/protocol/jingle_session_unittest.cc b/remoting/protocol/jingle_session_unittest.cc
index 95a1de50a6e0b23a7a9f945bcc776ad60965e7b9..c72da080f548f3fb4e04a28f17c27a16aa54db0e 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();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698