diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 22:34:00 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 22:34:00 +0000 |
| commit | fb578635ffff99206af1cf78f9c698a524a61479 (patch) | |
| tree | 1d5735a69073bdeaae2a49d43ac6e51067e94ed2 /remoting/protocol/message_reader_unittest.cc | |
| parent | 115dcfe4de38512d865f5de3dfff89e0f6adc726 (diff) | |
| download | chromium_src-fb578635ffff99206af1cf78f9c698a524a61479.zip chromium_src-fb578635ffff99206af1cf78f9c698a524a61479.tar.gz chromium_src-fb578635ffff99206af1cf78f9c698a524a61479.tar.bz2 | |
remoting: Update calls froms RunAllPending() to RunUntilIdle().
BUG=131220
TEST=remoting_unittests
R=sergeyu@chromium.org,wez@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11364031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165528 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol/message_reader_unittest.cc')
| -rw-r--r-- | remoting/protocol/message_reader_unittest.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/remoting/protocol/message_reader_unittest.cc b/remoting/protocol/message_reader_unittest.cc index b3e6289..59e22f2 100644 --- a/remoting/protocol/message_reader_unittest.cc +++ b/remoting/protocol/message_reader_unittest.cc @@ -117,7 +117,7 @@ TEST_F(MessageReaderTest, OneMessage_Delay) { .WillOnce(SaveArg<0>(&done_task)); InitReader(); - message_loop_.RunAllPending(); + message_loop_.RunUntilIdle(); Mock::VerifyAndClearExpectations(&callback_); Mock::VerifyAndClearExpectations(&socket_); @@ -142,7 +142,7 @@ TEST_F(MessageReaderTest, OneMessage_Instant) { .WillOnce(CallDoneTask()); InitReader(); - message_loop_.RunAllPending(); + message_loop_.RunUntilIdle(); EXPECT_TRUE(socket_.read_pending()); EXPECT_EQ(1U, messages_.size()); @@ -162,7 +162,7 @@ TEST_F(MessageReaderTest, TwoMessages_Together) { .WillOnce(SaveArg<0>(&done_task2)); InitReader(); - message_loop_.RunAllPending(); + message_loop_.RunUntilIdle(); Mock::VerifyAndClearExpectations(&callback_); Mock::VerifyAndClearExpectations(&socket_); @@ -175,12 +175,12 @@ TEST_F(MessageReaderTest, TwoMessages_Together) { EXPECT_FALSE(socket_.read_pending()); done_task1.Run(); - message_loop_.RunAllPending(); + message_loop_.RunUntilIdle(); EXPECT_FALSE(socket_.read_pending()); done_task2.Run(); - message_loop_.RunAllPending(); + message_loop_.RunUntilIdle(); EXPECT_TRUE(socket_.read_pending()); } @@ -199,7 +199,7 @@ TEST_F(MessageReaderTest, TwoMessages_Instant) { .WillOnce(SaveArg<0>(&done_task2)); InitReader(); - message_loop_.RunAllPending(); + message_loop_.RunUntilIdle(); Mock::VerifyAndClearExpectations(&callback_); Mock::VerifyAndClearExpectations(&socket_); @@ -227,7 +227,7 @@ TEST_F(MessageReaderTest, TwoMessages_Instant2) { .WillOnce(CallDoneTask()); InitReader(); - message_loop_.RunAllPending(); + message_loop_.RunUntilIdle(); EXPECT_TRUE(socket_.read_pending()); } @@ -243,7 +243,7 @@ TEST_F(MessageReaderTest, TwoMessages_Separately) { .WillOnce(SaveArg<0>(&done_task)); InitReader(); - message_loop_.RunAllPending(); + message_loop_.RunUntilIdle(); Mock::VerifyAndClearExpectations(&callback_); Mock::VerifyAndClearExpectations(&socket_); @@ -255,7 +255,7 @@ TEST_F(MessageReaderTest, TwoMessages_Separately) { EXPECT_FALSE(socket_.read_pending()); done_task.Run(); - message_loop_.RunAllPending(); + message_loop_.RunUntilIdle(); EXPECT_TRUE(socket_.read_pending()); @@ -264,7 +264,7 @@ TEST_F(MessageReaderTest, TwoMessages_Separately) { .Times(1) .WillOnce(SaveArg<0>(&done_task)); AddMessage(kTestMessage2); - message_loop_.RunAllPending(); + message_loop_.RunUntilIdle(); EXPECT_TRUE(CompareResult(messages_[1], kTestMessage2)); @@ -300,7 +300,7 @@ TEST_F(MessageReaderTest, ReadFromCallback) { .WillOnce(Invoke(this, &MessageReaderTest::OnSecondMessage)); InitReader(); - message_loop_.RunAllPending(); + message_loop_.RunUntilIdle(); EXPECT_TRUE(socket_.read_pending()); } @@ -319,7 +319,7 @@ TEST_F(MessageReaderTest, DeleteFromCallback) { .WillOnce(Invoke(this, &MessageReaderTest::DeleteReader)); InitReader(); - message_loop_.RunAllPending(); + message_loop_.RunUntilIdle(); } } // namespace protocol |