commit dd025d85b0738f1ee1dabb7ec53ba878d1e51bbc
author Danil Chapovalov <danilchap@webrtc.org> Wed Mar 20 15:04:52 2019 +0100
committer Commit Bot <commit-bot@chromium.org> Wed Mar 20 15:20:20 2019 +0000
tree 181f54703bfc933decedc4ae3698371df35cbc23
parent f7f9845d9e5b24c73a70fceb278a20b43e9d9919

Avoid using global task queue factory in RtcpTransciever tests

by not using convenient rtc::TaskQueue constructor
and using TaskQueueForTest instead.

Bug: webrtc:10284
Change-Id: I882ce4d1404a1cb9ab8bf97fca6beac3f89bb41d
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/128604
Reviewed-by: Niels Moller <nisse@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27212}

modules/rtp_rtcp/source/rtcp_transceiver_unittest.cc

diff --git a/modules/rtp_rtcp/source/rtcp_transceiver_unittest.cc b/modules/rtp_rtcp/source/rtcp_transceiver_unittest.cc
index d71918d..12bf49c 100644
--- a/modules/rtp_rtcp/source/rtcp_transceiver_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_transceiver_unittest.cc
@@ -16,21 +16,23 @@
 #include "modules/rtp_rtcp/source/rtcp_packet/sender_report.h"
 #include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
 #include "rtc_base/event.h"
+#include "rtc_base/task_queue_for_test.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
 #include "test/mock_transport.h"
 
 namespace {
 
+using ::testing::_;
 using ::testing::AtLeast;
 using ::testing::Invoke;
 using ::testing::InvokeWithoutArgs;
 using ::testing::IsNull;
 using ::testing::NiceMock;
-using ::testing::_;
 using ::webrtc::MockTransport;
 using ::webrtc::RtcpTransceiver;
 using ::webrtc::RtcpTransceiverConfig;
+using ::webrtc::TaskQueueForTest;
 using ::webrtc::rtcp::TransportFeedback;
 
 class MockMediaReceiverRtcpObserver : public webrtc::MediaReceiverRtcpObserver {
@@ -40,7 +42,7 @@
 
 constexpr int kTimeoutMs = 1000;
 
-void WaitPostedTasks(rtc::TaskQueue* queue) {
+void WaitPostedTasks(TaskQueueForTest* queue) {
   rtc::Event done;
   queue->PostTask([&done] { done.Set(); });
   ASSERT_TRUE(done.Wait(kTimeoutMs));
@@ -48,7 +50,7 @@
 
 TEST(RtcpTransceiverTest, SendsRtcpOnTaskQueueWhenCreatedOffTaskQueue) {
   MockTransport outgoing_transport;
-  rtc::TaskQueue queue("rtcp");
+  TaskQueueForTest queue("rtcp");
   RtcpTransceiverConfig config;
   config.outgoing_transport = &outgoing_transport;
   config.task_queue = &queue;
@@ -65,7 +67,7 @@
 
 TEST(RtcpTransceiverTest, SendsRtcpOnTaskQueueWhenCreatedOnTaskQueue) {
   MockTransport outgoing_transport;
-  rtc::TaskQueue queue("rtcp");
+  TaskQueueForTest queue("rtcp");
   RtcpTransceiverConfig config;
   config.outgoing_transport = &outgoing_transport;
   config.task_queue = &queue;
@@ -85,7 +87,7 @@
 
 TEST(RtcpTransceiverTest, CanBeDestroyedOnTaskQueue) {
   NiceMock<MockTransport> outgoing_transport;
-  rtc::TaskQueue queue("rtcp");
+  TaskQueueForTest queue("rtcp");
   RtcpTransceiverConfig config;
   config.outgoing_transport = &outgoing_transport;
   config.task_queue = &queue;
@@ -100,7 +102,7 @@
 }
 
 TEST(RtcpTransceiverTest, CanBeDestroyedWithoutBlocking) {
-  rtc::TaskQueue queue("rtcp");
+  TaskQueueForTest queue("rtcp");
   NiceMock<MockTransport> outgoing_transport;
   RtcpTransceiverConfig config;
   config.outgoing_transport = &outgoing_transport;
@@ -122,7 +124,7 @@
 
 TEST(RtcpTransceiverTest, MaySendPacketsAfterDestructor) {  // i.e. Be careful!
   NiceMock<MockTransport> outgoing_transport;  // Must outlive queue below.
-  rtc::TaskQueue queue("rtcp");
+  TaskQueueForTest queue("rtcp");
   RtcpTransceiverConfig config;
   config.outgoing_transport = &outgoing_transport;
   config.task_queue = &queue;
@@ -153,7 +155,7 @@
 TEST(RtcpTransceiverTest, DoesntPostToRtcpObserverAfterCallToRemove) {
   const uint32_t kRemoteSsrc = 1234;
   MockTransport null_transport;
-  rtc::TaskQueue queue("rtcp");
+  TaskQueueForTest queue("rtcp");
   RtcpTransceiverConfig config;
   config.outgoing_transport = &null_transport;
   config.task_queue = &queue;
@@ -180,7 +182,7 @@
 TEST(RtcpTransceiverTest, RemoveMediaReceiverRtcpObserverIsNonBlocking) {
   const uint32_t kRemoteSsrc = 1234;
   MockTransport null_transport;
-  rtc::TaskQueue queue("rtcp");
+  TaskQueueForTest queue("rtcp");
   RtcpTransceiverConfig config;
   config.outgoing_transport = &null_transport;
   config.task_queue = &queue;
@@ -204,7 +206,7 @@
 
 TEST(RtcpTransceiverTest, CanCallSendCompoundPacketFromAnyThread) {
   MockTransport outgoing_transport;
-  rtc::TaskQueue queue("rtcp");
+  TaskQueueForTest queue("rtcp");
   RtcpTransceiverConfig config;
   config.outgoing_transport = &outgoing_transport;
   config.task_queue = &queue;
@@ -224,7 +226,7 @@
   // Call from the same queue transceiver use for processing.
   queue.PostTask([&] { rtcp_transceiver.SendCompoundPacket(); });
   // Call from unrelated task queue.
-  rtc::TaskQueue queue_send("send_packet");
+  TaskQueueForTest queue_send("send_packet");
   queue_send.PostTask([&] { rtcp_transceiver.SendCompoundPacket(); });
 
   WaitPostedTasks(&queue_send);
@@ -233,7 +235,7 @@
 
 TEST(RtcpTransceiverTest, DoesntSendPacketsAfterStopCallback) {
   NiceMock<MockTransport> outgoing_transport;
-  rtc::TaskQueue queue("rtcp");
+  TaskQueueForTest queue("rtcp");
   RtcpTransceiverConfig config;
   config.outgoing_transport = &outgoing_transport;
   config.task_queue = &queue;
@@ -253,7 +255,7 @@
 TEST(RtcpTransceiverTest, SendsTransportFeedbackOnTaskQueue) {
   static constexpr uint32_t kSenderSsrc = 12345;
   MockTransport outgoing_transport;
-  rtc::TaskQueue queue("rtcp");
+  TaskQueueForTest queue("rtcp");
   RtcpTransceiverConfig config;
   config.feedback_ssrc = kSenderSsrc;
   config.outgoing_transport = &outgoing_transport;