diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-06 02:19:10 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-06 02:19:10 +0000 |
| commit | d7bd1f86f904275aed0aa483662e1ad72016d9a8 (patch) | |
| tree | e9cdf88998324bb9eb87ccd088506c62f383960d /jingle/glue/thread_wrapper_unittest.cc | |
| parent | f9939d9350f983a8f392036dc052bdbce7659b03 (diff) | |
| download | chromium_src-d7bd1f86f904275aed0aa483662e1ad72016d9a8.zip chromium_src-d7bd1f86f904275aed0aa483662e1ad72016d9a8.tar.gz chromium_src-d7bd1f86f904275aed0aa483662e1ad72016d9a8.tar.bz2 | |
Revert 80567 - P2P Transport implementation.TEST=Unittests.BUG=NoneReview URL: http://codereview.chromium.org/6791023
TBR=sergeyu@chromium.org
Review URL: http://codereview.chromium.org/6799003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80571 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle/glue/thread_wrapper_unittest.cc')
| -rw-r--r-- | jingle/glue/thread_wrapper_unittest.cc | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/jingle/glue/thread_wrapper_unittest.cc b/jingle/glue/thread_wrapper_unittest.cc index 18f8bb4..1c8943a 100644 --- a/jingle/glue/thread_wrapper_unittest.cc +++ b/jingle/glue/thread_wrapper_unittest.cc @@ -49,8 +49,7 @@ TEST_F(ThreadWrapperTest, Create) { EXPECT_EQ(thread(), static_cast<talk_base::Thread*>(wrapper_)); } -MATCHER_P3(MatchMessageAndDeleteData, handler, message_id, data, "") { - delete arg->pdata; +MATCHER_P3(MatchMessage, handler, message_id, data, "") { return arg->phandler == handler && arg->message_id == message_id && arg->pdata == data; @@ -70,13 +69,13 @@ TEST_F(ThreadWrapperTest, Post) { InSequence in_seq; EXPECT_CALL(handler1_, OnMessage( - MatchMessageAndDeleteData(&handler1_, kTestMessage1, data1_))); + MatchMessage(&handler1_, kTestMessage1, data1_))); EXPECT_CALL(handler1_, OnMessage( - MatchMessageAndDeleteData(&handler1_, kTestMessage2, data2_))); + MatchMessage(&handler1_, kTestMessage2, data2_))); EXPECT_CALL(handler2_, OnMessage( - MatchMessageAndDeleteData(&handler2_, kTestMessage1, data3_))); + MatchMessage(&handler2_, kTestMessage1, data3_))); EXPECT_CALL(handler2_, OnMessage( - MatchMessageAndDeleteData(&handler2_, kTestMessage1, data4_))); + MatchMessage(&handler2_, kTestMessage1, data4_))); message_loop_.RunAllPending(); } @@ -97,13 +96,13 @@ TEST_F(ThreadWrapperTest, PostDelayed) { InSequence in_seq; EXPECT_CALL(handler1_, OnMessage( - MatchMessageAndDeleteData(&handler1_, kTestMessage1, data1_))); + MatchMessage(&handler1_, kTestMessage1, data1_))); EXPECT_CALL(handler1_, OnMessage( - MatchMessageAndDeleteData(&handler1_, kTestMessage2, data2_))); + MatchMessage(&handler1_, kTestMessage2, data2_))); EXPECT_CALL(handler2_, OnMessage( - MatchMessageAndDeleteData(&handler2_, kTestMessage1, data3_))); + MatchMessage(&handler2_, kTestMessage1, data3_))); EXPECT_CALL(handler2_, OnMessage( - MatchMessageAndDeleteData(&handler2_, kTestMessage1, data4_))); + MatchMessage(&handler2_, kTestMessage1, data4_))); message_loop_.PostDelayedTask(FROM_HERE, new MessageLoop::QuitTask(), kMaxTestDelay); @@ -122,11 +121,11 @@ TEST_F(ThreadWrapperTest, Clear) { talk_base::MessageData* null_data = NULL; EXPECT_CALL(handler1_, OnMessage( - MatchMessageAndDeleteData(&handler1_, kTestMessage1, null_data))); + MatchMessage(&handler1_, kTestMessage1, null_data))); EXPECT_CALL(handler2_, OnMessage( - MatchMessageAndDeleteData(&handler2_, kTestMessage1, null_data))); + MatchMessage(&handler2_, kTestMessage1, null_data))); EXPECT_CALL(handler2_, OnMessage( - MatchMessageAndDeleteData(&handler2_, kTestMessage2, null_data))); + MatchMessage(&handler2_, kTestMessage2, null_data))); message_loop_.RunAllPending(); } @@ -145,11 +144,11 @@ TEST_F(ThreadWrapperTest, ClearDelayed) { talk_base::MessageData* null_data = NULL; EXPECT_CALL(handler1_, OnMessage( - MatchMessageAndDeleteData(&handler1_, kTestMessage1, null_data))); + MatchMessage(&handler1_, kTestMessage1, null_data))); EXPECT_CALL(handler2_, OnMessage( - MatchMessageAndDeleteData(&handler2_, kTestMessage1, null_data))); + MatchMessage(&handler2_, kTestMessage1, null_data))); EXPECT_CALL(handler2_, OnMessage( - MatchMessageAndDeleteData(&handler2_, kTestMessage1, null_data))); + MatchMessage(&handler2_, kTestMessage1, null_data))); message_loop_.PostDelayedTask(FROM_HERE, new MessageLoop::QuitTask(), kMaxTestDelay); |