zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid using global task queue factory in RtcpTransciever tests

Browse Source 
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}
This commit is contained in:
Danil Chapovalov
2019-03-20 15:04:52 +01:00
committed by Commit Bot
parent f7f9845d9e
commit dd025d85b0
3 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
modules/rtp_rtcp/source/rtcp_transceiver_impl_unittest.cc
View File

@ -22,7 +22,7 @@
#include "modules/rtp_rtcp/source/time_util.h"
#include "rtc_base/event.h"
#include "rtc_base/fake_clock.h"
#include "rtc_base/task_queue.h"
#include "rtc_base/task_queue_for_test.h"
#include "test/gmock.h"
#include "test/gtest.h"
#include "test/mock_transport.h"
@ -36,7 +36,6 @@ using ::testing::Invoke;
using ::testing::Return;
using ::testing::SizeIs;
using ::testing::StrictMock;
using ::webrtc::VideoBitrateAllocation;
using ::webrtc::CompactNtp;
using ::webrtc::CompactNtpRttToMs;
using ::webrtc::MockRtcpRttStats;
@ -45,7 +44,9 @@ using ::webrtc::NtpTime;
using ::webrtc::RtcpTransceiverConfig;
using ::webrtc::RtcpTransceiverImpl;
using ::webrtc::SaturatedUsToCompactNtp;
using ::webrtc::TaskQueueForTest;
using ::webrtc::TimeMicrosToNtp;
using ::webrtc::VideoBitrateAllocation;
using ::webrtc::rtcp::Bye;
using ::webrtc::rtcp::CompoundPacket;
using ::webrtc::rtcp::ReportBlock;
@ -138,7 +139,7 @@ RtcpTransceiverConfig DefaultTestConfig() {
TEST(RtcpTransceiverImplTest, NeedToStopPeriodicTaskToDestroyOnTaskQueue) {
FakeRtcpTransport transport;
rtc::TaskQueue queue("rtcp");
TaskQueueForTest queue("rtcp");
RtcpTransceiverConfig config = DefaultTestConfig();
config.task_queue = &queue;
config.schedule_periodic_compound_packets = true;
@ -158,7 +159,7 @@ TEST(RtcpTransceiverImplTest, NeedToStopPeriodicTaskToDestroyOnTaskQueue) {
TEST(RtcpTransceiverImplTest, CanDestroyAfterTaskQueue) {
FakeRtcpTransport transport;
auto* queue = new rtc::TaskQueue("rtcp");
auto* queue = new TaskQueueForTest("rtcp");
RtcpTransceiverConfig config = DefaultTestConfig();
config.task_queue = queue;
config.schedule_periodic_compound_packets = true;
@ -172,7 +173,7 @@ TEST(RtcpTransceiverImplTest, CanDestroyAfterTaskQueue) {
}
TEST(RtcpTransceiverImplTest, DelaysSendingFirstCompondPacket) {
rtc::TaskQueue queue("rtcp");
TaskQueueForTest queue("rtcp");
FakeRtcpTransport transport;
RtcpTransceiverConfig config;
config.outgoing_transport = &transport;
@ -197,7 +198,7 @@ TEST(RtcpTransceiverImplTest, DelaysSendingFirstCompondPacket) {
}
TEST(RtcpTransceiverImplTest, PeriodicallySendsPackets) {
rtc::TaskQueue queue("rtcp");
TaskQueueForTest queue("rtcp");
FakeRtcpTransport transport;
RtcpTransceiverConfig config;
config.outgoing_transport = &transport;
@ -231,7 +232,7 @@ TEST(RtcpTransceiverImplTest, PeriodicallySendsPackets) {
}
TEST(RtcpTransceiverImplTest, SendCompoundPacketDelaysPeriodicSendPackets) {
rtc::TaskQueue queue("rtcp");
TaskQueueForTest queue("rtcp");
FakeRtcpTransport transport;
RtcpTransceiverConfig config;
config.outgoing_transport = &transport;
@ -317,7 +318,7 @@ TEST(RtcpTransceiverImplTest, SendsRtcpWhenNetworkStateIsUp) {
}
TEST(RtcpTransceiverImplTest, SendsPeriodicRtcpWhenNetworkStateIsUp) {
rtc::TaskQueue queue("rtcp");
TaskQueueForTest queue("rtcp");
FakeRtcpTransport transport;
RtcpTransceiverConfig config = DefaultTestConfig();
config.schedule_periodic_compound_packets = true;