signalapp/webrtc
signalapp/webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix unit test build

Browse Source
This commit is contained in:
Miriam Zimmerman 2026-05-05 12:53:03 -04:00
parent 134cc43f1f
commit 40f118c9b9
3 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
audio/mock_voe_channel_proxy.h
View File

@ -130,6 +130,12 @@ class MockChannelReceive : public voe::ChannelReceiveInterface {
(override));
MOCK_METHOD(void, SetMaximumBufferPackets, (size_t max_packets), (override));
MOCK_METHOD(void, SetFastAccelerate, (bool enable), (override));
// RingRTC change to configure opus.
MOCK_METHOD(void,
ConfigureDecoder,
(const webrtc::AudioDecoder::Config& config),
(override));
// End RingRTC change
};
class MockChannelSend : public voe::ChannelSendInterface {

29
p2p/base/p2p_transport_channel_unittest.cc
View File

@ -3753,8 +3753,7 @@ TEST_F(P2PTransportChannelPingTest, TestStunPingIntervals) {
ch.MaybeStartGathering();
ch.AddRemoteCandidate(
CreateUdpCandidate(IceCandidateType::kHost, "1.1.1.1", 1, 1));
// RingRTC change to prevent hang.
Connection* conn = WaitForConnectionTo(&ch, "1.1.1.1", 1, &clock);
Connection* conn = WaitForConnectionTo(&ch, "1.1.1.1", 1);
ASSERT_TRUE(conn != nullptr);
EXPECT_TRUE(DefaultWait().Until([&] { return conn->num_pings_sent() == 1; }));
@ -4762,8 +4761,7 @@ TEST_F(P2PTransportChannelPingTest, TestDontPruneWhenWeak) {
ch.MaybeStartGathering();
ch.AddRemoteCandidate(
CreateUdpCandidate(IceCandidateType::kHost, "1.1.1.1", 1, 1));
// RingRTC change to prevent hang.
Connection* conn1 = WaitForConnectionTo(&ch, "1.1.1.1", 1, &clock);
Connection* conn1 = WaitForConnectionTo(&ch, "1.1.1.1", 1);
ASSERT_TRUE(conn1 != nullptr);
EXPECT_EQ(nullptr, ch.selected_connection());
conn1->ReceivedPingResponse(kLowRtt, "id"); // Becomes writable and receiving
@ -5046,8 +5044,7 @@ TEST_F(P2PTransportChannelPingTest, TestPortDestroyedAfterTimeoutAndPruned) {
ch.AddRemoteCandidate(
CreateUdpCandidate(IceCandidateType::kHost, "1.1.1.1", 1, 1));
// RingRTC change to prevent hang.
Connection* conn = WaitForConnectionTo(&ch, "1.1.1.1", 1, &fake_clock);
Connection* conn = WaitForConnectionTo(&ch, "1.1.1.1", 1);
ASSERT_TRUE(conn != nullptr);
// Simulate 2 minutes going by. This should be enough time for the port to
@ -6418,7 +6415,7 @@ TEST(P2PTransportChannel, InjectActiveIceController) {
// RingRTC change to support ICE forking
TEST_F(P2PTransportChannelPingTest, Forking) {
ScopedFakeClock clock;
const Environment env = CreateEnvironment();
const Environment env = CreateTestEnvironment();
// Prepare two transports with a shared gatherer
FakePortAllocator fake_port_allocator1(env, ss());
@ -6437,15 +6434,16 @@ TEST_F(P2PTransportChannelPingTest, Forking) {
EXPECT_EQ(IceGatheringState::kIceGatheringNew, transport1->gathering_state());
transport1->StartGatheringWithSharedGatherer(gatherer);
SIMULATED_WAIT(
IceGatheringState::kIceGatheringComplete == transport1->gathering_state(),
kShortTimeout.ms(), clock);
EXPECT_TRUE(ShortWait().Until(
[&] {
return IceGatheringState::kIceGatheringComplete == transport1->gathering_state();
}));
transport1->SetRemoteIceParameters(kIceParams[1]);
transport1->AddRemoteCandidate(
CreateUdpCandidate(IceCandidateType::kHost, "1.1.1.1", 1, 1));
ASSERT_EQ(1u, transport1->connections().size());
Connection* transport1_conn =
WaitForConnectionTo(transport1.get(), "1.1.1.1", 1, &clock);
WaitForConnectionTo(transport1.get(), "1.1.1.1", 1);
ASSERT_TRUE(transport1_conn);
EXPECT_EQ(gatherer->port_allocator_session()->ice_ufrag(),
transport1_conn->local_candidate().username());
@ -6458,15 +6456,16 @@ TEST_F(P2PTransportChannelPingTest, Forking) {
// Start the second
EXPECT_EQ(IceGatheringState::kIceGatheringNew, transport2->gathering_state());
transport2->StartGatheringWithSharedGatherer(gatherer);
SIMULATED_WAIT(
IceGatheringState::kIceGatheringComplete == transport1->gathering_state(),
kShortTimeout.ms(), clock);
EXPECT_TRUE(ShortWait().Until(
[&] {
return IceGatheringState::kIceGatheringComplete == transport1->gathering_state();
}));
transport2->SetRemoteIceParameters(kIceParams[2]);
transport2->AddRemoteCandidate(
CreateUdpCandidate(IceCandidateType::kHost, "2.2.2.2", 2, 2));
ASSERT_EQ(1u, transport2->connections().size());
Connection* transport2_conn =
WaitForConnectionTo(transport2.get(), "2.2.2.2", 2, &clock);
WaitForConnectionTo(transport2.get(), "2.2.2.2", 2);
EXPECT_EQ(gatherer->port_allocator_session()->ice_ufrag(),
transport2_conn->local_candidate().username());
EXPECT_EQ(gatherer->port_allocator_session()->ice_pwd(),

6
pc/test/mock_voice_media_receive_channel_interface.h
View File

@ -76,6 +76,12 @@ class MockVoiceMediaReceiveChannelInterface
GetReceivedAudioLevel,
(),
(override));
// RingRTC change to configure opus.
MOCK_METHOD(void,
ConfigureDecoders,
(const webrtc::AudioDecoder::Config& config),
(override));
// End RingRTC changes
MOCK_METHOD(bool,
GetStats,
(webrtc::VoiceMediaReceiveInfo * stats, bool reset_legacy),