mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-13 05:40:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Stop using Googletest legacy APIs.

Browse source 
Googletest recently started replacing the term Test Case by Test Suite.
From now on, the preferred API is TestSuite*; the older TestCase* API
will be slowly deprecated.

This CL moves WebRTC to the new set of APIs.

More info in [1].

This CL has been generated with this script:

declare -A items
items[TYPED_TEST_CASE]=TYPED_TEST_SUITE
items[TYPED_TEST_CASE_P]=TYPED_TEST_SUITE_P
items[REGISTER_TYPED_TEST_CASE_P]=REGISTER_TYPED_TEST_SUITE_P
items[INSTANTIATE_TYPED_TEST_CASE_P]=INSTANTIATE_TYPED_TEST_SUITE_P
items[INSTANTIATE_TEST_CASE_P]=INSTANTIATE_TEST_SUITE_P
for i in "${!items[@]}"
do
  git ls-files | xargs sed -i "s/\b$i\b/${items[$i]}/g"
done
git cl format

[1] - https://github.com/google/googletest/blob/master/googletest/docs/primer.md#beware-of-the-nomenclature

Bug: None
Change-Id: I5ae191e3046caf347aeee01554d5743548ab0e3f
Reviewed-on: https://webrtc-review.googlesource.com/c/118701
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26494}
This commit is contained in:
Mirko Bonadei 2019-01-31 12:20:57 +01:00 committed by Commit Bot
parent 12e5d392cc
commit c84f661b10
77 changed files with 354 additions and 347 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
audio/transport_feedback_packet_loss_tracker_unittest.cc
View file

@ -561,8 +561,8 @@ TEST(TransportFeedbackPacketLossTrackerTest, TimeCantFlowBackwards) {
// to weed out potential bugs with wrap-around handling. // to weed out potential bugs with wrap-around handling.
constexpr uint16_t kBases[] = {0x0000, 0x3456, 0xc032, 0xfffe}; constexpr uint16_t kBases[] = {0x0000, 0x3456, 0xc032, 0xfffe};
INSTANTIATE_TEST_CASE_P(_, INSTANTIATE_TEST_SUITE_P(_,
TransportFeedbackPacketLossTrackerTest, TransportFeedbackPacketLossTrackerTest,
testing::ValuesIn(kBases)); testing::ValuesIn(kBases));
} // namespace webrtc } // namespace webrtc

4
call/rtp_video_sender_unittest.cc
View file

@ -141,9 +141,9 @@ class RtpVideoSenderTest : public ::testing::Test,
test::ScopedFieldTrials field_trial_; test::ScopedFieldTrials field_trial_;
}; };
INSTANTIATE_TEST_CASE_P(Default, RtpVideoSenderTest, ::testing::Values("")); INSTANTIATE_TEST_SUITE_P(Default, RtpVideoSenderTest, ::testing::Values(""));
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
TaskQueueTrial, TaskQueueTrial,
RtpVideoSenderTest, RtpVideoSenderTest,
::testing::Values("WebRTC-TaskQueueCongestionControl/Enabled/")); ::testing::Values("WebRTC-TaskQueueCongestionControl/Enabled/"));

2
common_audio/real_fourier_unittest.cc
View file

@ -68,7 +68,7 @@ class RealFourierTest : public ::testing::Test {
}; };
using FftTypes = ::testing::Types<RealFourierOoura>; using FftTypes = ::testing::Types<RealFourierOoura>;
TYPED_TEST_CASE(RealFourierTest, FftTypes); TYPED_TEST_SUITE(RealFourierTest, FftTypes);
TYPED_TEST(RealFourierTest, SimpleForwardTransform) { TYPED_TEST(RealFourierTest, SimpleForwardTransform) {
this->real_buffer_[0] = 1.0f; this->real_buffer_[0] = 1.0f;

2
common_audio/resampler/push_sinc_resampler_unittest.cc
View file

@ -255,7 +255,7 @@ TEST_P(PushSincResamplerTest, ResampleFloat) {
// Thresholds chosen arbitrarily based on what each resampling reported during // Thresholds chosen arbitrarily based on what each resampling reported during
// testing. All thresholds are in dbFS, http://en.wikipedia.org/wiki/DBFS. // testing. All thresholds are in dbFS, http://en.wikipedia.org/wiki/DBFS.
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
PushSincResamplerTest, PushSincResamplerTest,
PushSincResamplerTest, PushSincResamplerTest,
::testing::Values( ::testing::Values(

2
common_audio/resampler/sinc_resampler_unittest.cc
View file

@ -340,7 +340,7 @@ static const double kResamplingRMSError = -14.58;
// Thresholds chosen arbitrarily based on what each resampling reported during // Thresholds chosen arbitrarily based on what each resampling reported during
// testing. All thresholds are in dbFS, http://en.wikipedia.org/wiki/DBFS. // testing. All thresholds are in dbFS, http://en.wikipedia.org/wiki/DBFS.
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
SincResamplerTest, SincResamplerTest,
SincResamplerTest, SincResamplerTest,
testing::Values( testing::Values(

10
common_video/video_frame_unittest.cc
View file

@ -489,10 +489,10 @@ TEST_P(TestPlanarYuvBuffer, PastesIntoBuffer) {
} }
} }
INSTANTIATE_TEST_CASE_P(, INSTANTIATE_TEST_SUITE_P(,
TestPlanarYuvBuffer, TestPlanarYuvBuffer,
::testing::Values(VideoFrameBuffer::Type::kI420, ::testing::Values(VideoFrameBuffer::Type::kI420,
VideoFrameBuffer::Type::kI010)); VideoFrameBuffer::Type::kI010));
class TestPlanarYuvBufferRotate class TestPlanarYuvBufferRotate
: public ::testing::TestWithParam< : public ::testing::TestWithParam<
@ -507,7 +507,7 @@ TEST_P(TestPlanarYuvBufferRotate, Rotates) {
CheckRotate(640, 480, rotation, *rotated_buffer->ToI420()); CheckRotate(640, 480, rotation, *rotated_buffer->ToI420());
} }
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
Rotate, Rotate,
TestPlanarYuvBufferRotate, TestPlanarYuvBufferRotate,
::testing::Combine(::testing::Values(kVideoRotation_0, ::testing::Combine(::testing::Values(kVideoRotation_0,

8
logging/rtc_event_log/encoder/delta_encoding_unittest.cc
View file

@ -443,7 +443,7 @@ TEST_P(DeltaEncodingTest, ZeroDelta) {
TestEncodingAndDecoding(base, values); TestEncodingAndDecoding(base, values);
} }
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
SignednessOverrideAndNumberOfValuesInSequence, SignednessOverrideAndNumberOfValuesInSequence,
DeltaEncodingTest, DeltaEncodingTest,
::testing::Combine(::testing::Values(DeltaSignedness::kNoOverride, ::testing::Combine(::testing::Values(DeltaSignedness::kNoOverride,
@ -555,7 +555,7 @@ TEST_P(DeltaEncodingCompressionQualityTest,
} }
} }
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
SignednessOverrideAndDeltaMaxBitWidthAndNumberOfValuesInSequence, SignednessOverrideAndDeltaMaxBitWidthAndNumberOfValuesInSequence,
DeltaEncodingCompressionQualityTest, DeltaEncodingCompressionQualityTest,
::testing::Combine( ::testing::Combine(
@ -616,7 +616,7 @@ TEST_P(DeltaEncodingFuzzerLikeTest, Test) {
TestEncodingAndDecoding(base, values); TestEncodingAndDecoding(base, values);
} }
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
SignednessOverrideAndDeltaMaxBitWidthAndNumberOfValuesInSequence, SignednessOverrideAndDeltaMaxBitWidthAndNumberOfValuesInSequence,
DeltaEncodingFuzzerLikeTest, DeltaEncodingFuzzerLikeTest,
::testing::Combine( ::testing::Combine(
@ -679,7 +679,7 @@ TEST_P(DeltaEncodingSpecificEdgeCasesTest, ReverseSequence) {
TestEncodingAndDecoding(base, values); TestEncodingAndDecoding(base, values);
} }
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
_, _,
DeltaEncodingSpecificEdgeCasesTest, DeltaEncodingSpecificEdgeCasesTest,
::testing::Combine( ::testing::Combine(

10
logging/rtc_event_log/encoder/rtc_event_log_encoder_common_unittest.cc
View file

@ -27,7 +27,7 @@ class SignednessConversionTest : public testing::Test {
static_assert(std::is_signed<T>::value, ""); static_assert(std::is_signed<T>::value, "");
}; };
TYPED_TEST_CASE_P(SignednessConversionTest); TYPED_TEST_SUITE_P(SignednessConversionTest);
TYPED_TEST_P(SignednessConversionTest, CorrectlyConvertsLegalValues) { TYPED_TEST_P(SignednessConversionTest, CorrectlyConvertsLegalValues) {
using T = TypeParam; using T = TypeParam;
@ -72,13 +72,13 @@ TYPED_TEST_P(SignednessConversionTest, FailsOnConvertingIllegalValues) {
} }
} }
REGISTER_TYPED_TEST_CASE_P(SignednessConversionTest, REGISTER_TYPED_TEST_SUITE_P(SignednessConversionTest,
CorrectlyConvertsLegalValues, CorrectlyConvertsLegalValues,
FailsOnConvertingIllegalValues); FailsOnConvertingIllegalValues);
using Types = ::testing::Types<int8_t, int16_t, int32_t, int64_t>; using Types = ::testing::Types<int8_t, int16_t, int32_t, int64_t>;
INSTANTIATE_TYPED_TEST_CASE_P(_, SignednessConversionTest, Types); INSTANTIATE_TYPED_TEST_SUITE_P(_, SignednessConversionTest, Types);
} // namespace } // namespace
} // namespace webrtc_event_logging } // namespace webrtc_event_logging

2
logging/rtc_event_log/encoder/rtc_event_log_encoder_unittest.cc
View file

@ -939,7 +939,7 @@ TEST_P(RtcEventLogEncoderTest, RtcEventVideoSendStreamConfig) {
verifier_.VerifyLoggedVideoSendConfig(*event, video_send_configs[0]); verifier_.VerifyLoggedVideoSendConfig(*event, video_send_configs[0]);
} }
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
RandomSeeds, RandomSeeds,
RtcEventLogEncoderTest, RtcEventLogEncoderTest,
::testing::Combine(/* Random seed*: */ ::testing::Values(1, 2, 3, 4, 5), ::testing::Combine(/* Random seed*: */ ::testing::Values(1, 2, 3, 4, 5),

4
logging/rtc_event_log/rtc_event_log_unittest.cc
View file

@ -725,7 +725,7 @@ TEST_P(RtcEventLogSession, StartLoggingInTheMiddle) {
ReadAndVerifyLog(); ReadAndVerifyLog();
} }
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
RtcEventLogTest, RtcEventLogTest,
RtcEventLogSession, RtcEventLogSession,
::testing::Combine( ::testing::Combine(
@ -822,7 +822,7 @@ TEST_P(RtcEventLogCircularBufferTest, KeepsMostRecentEvents) {
} }
} }
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
RtcEventLogTest, RtcEventLogTest,
RtcEventLogCircularBufferTest, RtcEventLogCircularBufferTest,
::testing::Values(RtcEventLog::EncodingType::Legacy, ::testing::Values(RtcEventLog::EncodingType::Legacy,

6
media/base/video_adapter_unittest.cc
View file

@ -125,9 +125,9 @@ class VideoAdapterTest : public testing::Test,
const bool use_new_format_request_; const bool use_new_format_request_;
}; };
INSTANTIATE_TEST_CASE_P(OnOutputFormatRequests, INSTANTIATE_TEST_SUITE_P(OnOutputFormatRequests,
VideoAdapterTest, VideoAdapterTest,
::testing::Values(true, false)); ::testing::Values(true, false));
// Do not adapt the frame rate or the resolution. Expect no frame drop, no // Do not adapt the frame rate or the resolution. Expect no frame drop, no
// cropping, and no resolution change. // cropping, and no resolution change.

6
modules/audio_coding/codecs/builtin_audio_encoder_factory_unittest.cc
View file

@ -103,9 +103,9 @@ TEST_P(AudioEncoderFactoryTest, CanRunAllSupportedEncoders) {
} }
} }
INSTANTIATE_TEST_CASE_P(BuiltinAudioEncoderFactoryTest, INSTANTIATE_TEST_SUITE_P(BuiltinAudioEncoderFactoryTest,
AudioEncoderFactoryTest, AudioEncoderFactoryTest,
::testing::Values(CreateBuiltinAudioEncoderFactory())); ::testing::Values(CreateBuiltinAudioEncoderFactory()));
TEST(BuiltinAudioEncoderFactoryTest, SupportsTheExpectedFormats) { TEST(BuiltinAudioEncoderFactoryTest, SupportsTheExpectedFormats) {
using ::testing::ElementsAreArray; using ::testing::ElementsAreArray;

2
modules/audio_coding/codecs/ilbc/ilbc_unittest.cc
View file

@ -103,7 +103,7 @@ TEST_P(SplitIlbcTest, NumFrames) {
// Also test the maximum number of frames in one packet for 20 and 30 ms. // Also test the maximum number of frames in one packet for 20 and 30 ms.
// The maximum is defined by the largest payload length that can be uniquely // The maximum is defined by the largest payload length that can be uniquely
// resolved to a frame size of either 38 bytes (20 ms) or 50 bytes (30 ms). // resolved to a frame size of either 38 bytes (20 ms) or 50 bytes (30 ms).
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
IlbcTest, IlbcTest,
SplitIlbcTest, SplitIlbcTest,
::testing::Values(std::pair<int, int>(1, 20), // 1 frame, 20 ms. ::testing::Values(std::pair<int, int>(1, 20), // 1 frame, 20 ms.

4
modules/audio_coding/codecs/isac/fix/test/isac_speed_test.cc
View file

@ -112,6 +112,8 @@ const coding_param param_set[] = {
string("pcm"), string("pcm"),
true)}; true)};
INSTANTIATE_TEST_CASE_P(AllTest, IsacSpeedTest, ::testing::ValuesIn(param_set)); INSTANTIATE_TEST_SUITE_P(AllTest,
IsacSpeedTest,
::testing::ValuesIn(param_set));
} // namespace webrtc } // namespace webrtc

2
modules/audio_coding/codecs/isac/unittest.cc
View file

@ -252,6 +252,6 @@ std::vector<IsacTestParam> TestCases() {
return cases; return cases;
} }
INSTANTIATE_TEST_CASE_P(, IsacCommonTest, testing::ValuesIn(TestCases())); INSTANTIATE_TEST_SUITE_P(, IsacCommonTest, testing::ValuesIn(TestCases()));
} // namespace webrtc } // namespace webrtc

2
modules/audio_coding/codecs/legacy_encoded_audio_frame_unittest.cc
View file

@ -160,7 +160,7 @@ TEST_P(SplitBySamplesTest, PayloadSizes) {
} }
} }
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
LegacyEncodedAudioFrame, LegacyEncodedAudioFrame,
SplitBySamplesTest, SplitBySamplesTest,
::testing::Values(NetEqDecoder::kDecoderPCMu, ::testing::Values(NetEqDecoder::kDecoderPCMu,

2
modules/audio_coding/codecs/opus/opus_fec_test.cc
View file

@ -238,6 +238,6 @@ const coding_param param_set[] = {
string("pcm"))}; string("pcm"))};
// 64 kbps, stereo // 64 kbps, stereo
INSTANTIATE_TEST_CASE_P(AllTest, OpusFecTest, ::testing::ValuesIn(param_set)); INSTANTIATE_TEST_SUITE_P(AllTest, OpusFecTest, ::testing::ValuesIn(param_set));
} // namespace webrtc } // namespace webrtc

4
modules/audio_coding/codecs/opus/opus_speed_test.cc
View file

@ -140,6 +140,8 @@ const coding_param param_set[] = {
string("pcm"), string("pcm"),
true)}; true)};
INSTANTIATE_TEST_CASE_P(AllTest, OpusSpeedTest, ::testing::ValuesIn(param_set)); INSTANTIATE_TEST_SUITE_P(AllTest,
OpusSpeedTest,
::testing::ValuesIn(param_set));
} // namespace webrtc } // namespace webrtc

6
modules/audio_coding/codecs/opus/opus_unittest.cc
View file

@ -810,8 +810,8 @@ TEST_P(OpusTest, OpusDecodeRepacketized) {
EXPECT_EQ(0, WebRtcOpus_DecoderFree(opus_decoder_)); EXPECT_EQ(0, WebRtcOpus_DecoderFree(opus_decoder_));
} }
INSTANTIATE_TEST_CASE_P(VariousMode, INSTANTIATE_TEST_SUITE_P(VariousMode,
OpusTest, OpusTest,
Combine(Values(1, 2, 4), Values(0, 1))); Combine(Values(1, 2, 4), Values(0, 1)));
} // namespace webrtc } // namespace webrtc

2
modules/audio_coding/codecs/opus/test/audio_ring_buffer_unittest.cc
View file

@ -82,7 +82,7 @@ TEST_P(AudioRingBufferTest, ReadDataMatchesWrittenData) {
EXPECT_EQ(input.channels()[i][j], output.channels()[i][j]); EXPECT_EQ(input.channels()[i][j], output.channels()[i][j]);
} }
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
AudioRingBufferTest, AudioRingBufferTest,
AudioRingBufferTest, AudioRingBufferTest,
::testing::Combine(::testing::Values(10, 20, 42), // num_write_chunk_frames ::testing::Combine(::testing::Values(10, 20, 42), // num_write_chunk_frames

10
modules/audio_coding/neteq/audio_multi_vector_unittest.cc
View file

@ -309,9 +309,9 @@ TEST_P(AudioMultiVectorTest, CopyChannel) {
} }
} }
INSTANTIATE_TEST_CASE_P(TestNumChannels, INSTANTIATE_TEST_SUITE_P(TestNumChannels,
AudioMultiVectorTest, AudioMultiVectorTest,
::testing::Values(static_cast<size_t>(1), ::testing::Values(static_cast<size_t>(1),
static_cast<size_t>(2), static_cast<size_t>(2),
static_cast<size_t>(5))); static_cast<size_t>(5)));
} // namespace webrtc } // namespace webrtc

30
modules/audio_coding/neteq/neteq_stereo_unittest.cc
View file

@ -364,24 +364,24 @@ void PrintTo(const TestParameters& p, ::std::ostream* os) {
// Instantiate the tests. Each test is instantiated using the function above, // Instantiate the tests. Each test is instantiated using the function above,
// so that all different parameter combinations are tested. // so that all different parameter combinations are tested.
INSTANTIATE_TEST_CASE_P(MultiChannel, INSTANTIATE_TEST_SUITE_P(MultiChannel,
NetEqStereoTestNoJitter, NetEqStereoTestNoJitter,
::testing::ValuesIn(GetTestParameters())); ::testing::ValuesIn(GetTestParameters()));
INSTANTIATE_TEST_CASE_P(MultiChannel, INSTANTIATE_TEST_SUITE_P(MultiChannel,
NetEqStereoTestPositiveDrift, NetEqStereoTestPositiveDrift,
::testing::ValuesIn(GetTestParameters())); ::testing::ValuesIn(GetTestParameters()));
INSTANTIATE_TEST_CASE_P(MultiChannel, INSTANTIATE_TEST_SUITE_P(MultiChannel,
NetEqStereoTestNegativeDrift, NetEqStereoTestNegativeDrift,
::testing::ValuesIn(GetTestParameters())); ::testing::ValuesIn(GetTestParameters()));
INSTANTIATE_TEST_CASE_P(MultiChannel, INSTANTIATE_TEST_SUITE_P(MultiChannel,
NetEqStereoTestDelays, NetEqStereoTestDelays,
::testing::ValuesIn(GetTestParameters())); ::testing::ValuesIn(GetTestParameters()));
INSTANTIATE_TEST_CASE_P(MultiChannel, INSTANTIATE_TEST_SUITE_P(MultiChannel,
NetEqStereoTestLosses, NetEqStereoTestLosses,
::testing::ValuesIn(GetTestParameters())); ::testing::ValuesIn(GetTestParameters()));
} // namespace webrtc } // namespace webrtc

4
modules/audio_device/audio_device_unittest.cc
View file

@ -1112,14 +1112,14 @@ TEST_P(AudioDeviceTest, DISABLED_MeasureLoopbackLatency) {
#ifdef WEBRTC_WIN #ifdef WEBRTC_WIN
// Test two different audio layers (or rather two different Core Audio // Test two different audio layers (or rather two different Core Audio
// implementations) for Windows. // implementations) for Windows.
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
AudioLayerWin, AudioLayerWin,
AudioDeviceTest, AudioDeviceTest,
::testing::Values(AudioDeviceModule::kPlatformDefaultAudio, ::testing::Values(AudioDeviceModule::kPlatformDefaultAudio,
AudioDeviceModule::kWindowsCoreAudio2)); AudioDeviceModule::kWindowsCoreAudio2));
#else #else
// For all platforms but Windows, only test the default audio layer. // For all platforms but Windows, only test the default audio layer.
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
AudioLayer, AudioLayer,
AudioDeviceTest, AudioDeviceTest,
::testing::Values(AudioDeviceModule::kPlatformDefaultAudio)); ::testing::Values(AudioDeviceModule::kPlatformDefaultAudio));

86
modules/audio_processing/agc2/rnn_vad/pitch_search_internal_unittest.cc
View file

@ -88,7 +88,7 @@ TEST_P(ComputePitchGainThresholdTest, BitExactness) {
} }
} }
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
RnnVadTest, RnnVadTest,
ComputePitchGainThresholdTest, ComputePitchGainThresholdTest,
::testing::Values( ::testing::Values(
@ -219,48 +219,48 @@ TEST_P(CheckLowerPitchPeriodsAndComputePitchGainTest, BitExactness) {
} }
} }
INSTANTIATE_TEST_CASE_P(RnnVadTest, INSTANTIATE_TEST_SUITE_P(RnnVadTest,
CheckLowerPitchPeriodsAndComputePitchGainTest, CheckLowerPitchPeriodsAndComputePitchGainTest,
::testing::Values(std::make_tuple(kTestPitchPeriods[0], ::testing::Values(std::make_tuple(kTestPitchPeriods[0],
kTestPitchPeriods[0], kTestPitchPeriods[0],
kTestPitchGains[0], kTestPitchGains[0],
91, 91,
-0.0188608f), -0.0188608f),
std::make_tuple(kTestPitchPeriods[0], std::make_tuple(kTestPitchPeriods[0],
kTestPitchPeriods[0], kTestPitchPeriods[0],
kTestPitchGains[1], kTestPitchGains[1],
91, 91,
-0.0188608f), -0.0188608f),
std::make_tuple(kTestPitchPeriods[0], std::make_tuple(kTestPitchPeriods[0],
kTestPitchPeriods[1], kTestPitchPeriods[1],
kTestPitchGains[0], kTestPitchGains[0],
91, 91,
-0.0188608f), -0.0188608f),
std::make_tuple(kTestPitchPeriods[0], std::make_tuple(kTestPitchPeriods[0],
kTestPitchPeriods[1], kTestPitchPeriods[1],
kTestPitchGains[1], kTestPitchGains[1],
91, 91,
-0.0188608f), -0.0188608f),
std::make_tuple(kTestPitchPeriods[1], std::make_tuple(kTestPitchPeriods[1],
kTestPitchPeriods[0], kTestPitchPeriods[0],
kTestPitchGains[0], kTestPitchGains[0],
475, 475,
-0.0904344f), -0.0904344f),
std::make_tuple(kTestPitchPeriods[1], std::make_tuple(kTestPitchPeriods[1],
kTestPitchPeriods[0], kTestPitchPeriods[0],
kTestPitchGains[1], kTestPitchGains[1],
475, 475,
-0.0904344f), -0.0904344f),
std::make_tuple(kTestPitchPeriods[1], std::make_tuple(kTestPitchPeriods[1],
kTestPitchPeriods[1], kTestPitchPeriods[1],
kTestPitchGains[0], kTestPitchGains[0],
475, 475,
-0.0904344f), -0.0904344f),
std::make_tuple(kTestPitchPeriods[1], std::make_tuple(kTestPitchPeriods[1],
kTestPitchPeriods[1], kTestPitchPeriods[1],
kTestPitchGains[1], kTestPitchGains[1],
475, 475,
-0.0904344f))); -0.0904344f)));
} // namespace test } // namespace test
} // namespace rnn_vad } // namespace rnn_vad

4
modules/audio_processing/audio_processing_impl_locking_unittest.cc
View file

@ -1109,12 +1109,12 @@ TEST_P(AudioProcessingImplLockTest, LockTest) {
} }
// Instantiate tests from the extreme test configuration set. // Instantiate tests from the extreme test configuration set.
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
DISABLED_AudioProcessingImplLockExtensive, DISABLED_AudioProcessingImplLockExtensive,
AudioProcessingImplLockTest, AudioProcessingImplLockTest,
::testing::ValuesIn(TestConfig::GenerateExtensiveTestConfigs())); ::testing::ValuesIn(TestConfig::GenerateExtensiveTestConfigs()));
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
AudioProcessingImplLockBrief, AudioProcessingImplLockBrief,
AudioProcessingImplLockTest, AudioProcessingImplLockTest,
::testing::ValuesIn(TestConfig::GenerateBriefTestConfigs())); ::testing::ValuesIn(TestConfig::GenerateBriefTestConfigs()));

2
modules/audio_processing/audio_processing_performance_unittest.cc
View file

@ -621,7 +621,7 @@ TEST_P(CallSimulator, DISABLED_ApiCallDurationTest) {
EXPECT_TRUE(Run()); EXPECT_TRUE(Run());
} }
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
AudioProcessingPerformanceTest, AudioProcessingPerformanceTest,
CallSimulator, CallSimulator,
::testing::ValuesIn(SimulationConfig::GenerateSimulationConfigs())); ::testing::ValuesIn(SimulationConfig::GenerateSimulationConfigs()));

4
modules/audio_processing/audio_processing_unittest.cc
View file

@ -2413,7 +2413,7 @@ TEST_P(AudioProcessingTest, Formats) {
} }
#if defined(WEBRTC_AUDIOPROC_FLOAT_PROFILE) #if defined(WEBRTC_AUDIOPROC_FLOAT_PROFILE)
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
CommonFormats, CommonFormats,
AudioProcessingTest, AudioProcessingTest,
testing::Values(std::make_tuple(48000, 48000, 48000, 48000, 0, 0), testing::Values(std::make_tuple(48000, 48000, 48000, 48000, 0, 0),
@ -2469,7 +2469,7 @@ INSTANTIATE_TEST_CASE_P(
std::make_tuple(16000, 16000, 16000, 16000, 0, 0))); std::make_tuple(16000, 16000, 16000, 16000, 0, 0)));
#elif defined(WEBRTC_AUDIOPROC_FIXED_PROFILE) #elif defined(WEBRTC_AUDIOPROC_FIXED_PROFILE)
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
CommonFormats, CommonFormats,
AudioProcessingTest, AudioProcessingTest,
testing::Values(std::make_tuple(48000, 48000, 48000, 48000, 20, 0), testing::Values(std::make_tuple(48000, 48000, 48000, 48000, 20, 0),

2
modules/audio_processing/gain_controller2_unittest.cc
View file

@ -227,7 +227,7 @@ TEST_P(FixedDigitalTest, CheckSaturationBehaviorWithLimiter) {
} }
static_assert(test::kLimiterMaxInputLevelDbFs < 10, ""); static_assert(test::kLimiterMaxInputLevelDbFs < 10, "");
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
GainController2, GainController2,
FixedDigitalTest, FixedDigitalTest,
::testing::Values( ::testing::Values(

12
modules/remote_bitrate_estimator/bwe_simulations.cc
View file

@ -50,12 +50,12 @@ class BweSimulation : public BweTest,
RTC_DISALLOW_COPY_AND_ASSIGN(BweSimulation); RTC_DISALLOW_COPY_AND_ASSIGN(BweSimulation);
}; };
INSTANTIATE_TEST_CASE_P(VideoSendersTest, INSTANTIATE_TEST_SUITE_P(VideoSendersTest,
BweSimulation, BweSimulation,
::testing::Values(kRembEstimator, ::testing::Values(kRembEstimator,
kSendSideEstimator, kSendSideEstimator,
kNadaEstimator, kNadaEstimator,
kBbrEstimator)); kBbrEstimator));
TEST_P(BweSimulation, SprintUplinkTest) { TEST_P(BweSimulation, SprintUplinkTest) {
AdaptiveVideoSource source(0, 30, 300, 0, 0); AdaptiveVideoSource source(0, 30, 300, 0, 0);

6
modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc
View file

@ -56,9 +56,9 @@ class BweFeedbackTest
RTC_DISALLOW_COPY_AND_ASSIGN(BweFeedbackTest); RTC_DISALLOW_COPY_AND_ASSIGN(BweFeedbackTest);
}; };
INSTANTIATE_TEST_CASE_P(VideoSendersTest, INSTANTIATE_TEST_SUITE_P(VideoSendersTest,
BweFeedbackTest, BweFeedbackTest,
::testing::Values(kRembEstimator, kSendSideEstimator)); ::testing::Values(kRembEstimator, kSendSideEstimator));
TEST_P(BweFeedbackTest, ConstantCapacity) { TEST_P(BweFeedbackTest, ConstantCapacity) {
AdaptiveVideoSource source(0, 30, 300, 0, 0); AdaptiveVideoSource source(0, 30, 300, 0, 0);

2
modules/rtp_rtcp/source/rtp_fec_unittest.cc
View file

@ -216,7 +216,7 @@ class UlpfecForwardErrorCorrection : public ForwardErrorCorrection {
using FecTypes = using FecTypes =
Types<FlexfecForwardErrorCorrection, UlpfecForwardErrorCorrection>; Types<FlexfecForwardErrorCorrection, UlpfecForwardErrorCorrection>;
TYPED_TEST_CASE(RtpFecTest, FecTypes); TYPED_TEST_SUITE(RtpFecTest, FecTypes);
TYPED_TEST(RtpFecTest, WillProtectMediaPacketsWithLargeSequenceNumberGap) { TYPED_TEST(RtpFecTest, WillProtectMediaPacketsWithLargeSequenceNumberGap) {
constexpr int kNumImportantPackets = 0; constexpr int kNumImportantPackets = 0;

2
modules/rtp_rtcp/source/rtp_format_h264_unittest.cc
View file

@ -202,7 +202,7 @@ TEST_P(RtpPacketizerH264ModeTest,
EXPECT_THAT(packets, SizeIs(1)); EXPECT_THAT(packets, SizeIs(1));
} }
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
PacketMode, PacketMode,
RtpPacketizerH264ModeTest, RtpPacketizerH264ModeTest,
::testing::Values(H264PacketizationMode::SingleNalUnit, ::testing::Values(H264PacketizationMode::SingleNalUnit,

24
modules/rtp_rtcp/source/rtp_sender_unittest.cc
View file

@ -2286,16 +2286,16 @@ TEST_P(RtpSenderTest, SendsKeepAlive) {
EXPECT_EQ(kSeqNum + 1, rtp_sender_->SequenceNumber()); EXPECT_EQ(kSeqNum + 1, rtp_sender_->SequenceNumber());
} }
INSTANTIATE_TEST_CASE_P(WithAndWithoutOverhead, INSTANTIATE_TEST_SUITE_P(WithAndWithoutOverhead,
RtpSenderTest, RtpSenderTest,
::testing::Bool()); ::testing::Bool());
INSTANTIATE_TEST_CASE_P(WithAndWithoutOverhead, INSTANTIATE_TEST_SUITE_P(WithAndWithoutOverhead,
RtpSenderTestWithoutPacer, RtpSenderTestWithoutPacer,
::testing::Bool()); ::testing::Bool());
INSTANTIATE_TEST_CASE_P(WithAndWithoutOverhead, INSTANTIATE_TEST_SUITE_P(WithAndWithoutOverhead,
RtpSenderVideoTest, RtpSenderVideoTest,
::testing::Bool()); ::testing::Bool());
INSTANTIATE_TEST_CASE_P(WithAndWithoutOverhead, INSTANTIATE_TEST_SUITE_P(WithAndWithoutOverhead,
RtpSenderAudioTest, RtpSenderAudioTest,
::testing::Bool()); ::testing::Bool());
} // namespace webrtc } // namespace webrtc

6
modules/video_coding/codecs/multiplex/test/multiplex_adapter_unittest.cc
View file

@ -323,8 +323,8 @@ TEST_P(TestMultiplexAdapter, ImageIndexIncreases) {
} }
} }
INSTANTIATE_TEST_CASE_P(TestMultiplexAdapter, INSTANTIATE_TEST_SUITE_P(TestMultiplexAdapter,
TestMultiplexAdapter, TestMultiplexAdapter,
::testing::Bool()); ::testing::Bool());
} // namespace webrtc } // namespace webrtc

24
modules/video_coding/codecs/test/video_encoder_decoder_instantiation_tests.cc
View file

@ -96,20 +96,20 @@ class VideoEncoderDecoderInstantiationTest
std::vector<std::unique_ptr<VideoDecoder>> decoders_; std::vector<std::unique_ptr<VideoDecoder>> decoders_;
}; };
INSTANTIATE_TEST_CASE_P(MultipleEncoders, INSTANTIATE_TEST_SUITE_P(MultipleEncoders,
VideoEncoderDecoderInstantiationTest, VideoEncoderDecoderInstantiationTest,
::testing::Combine(::testing::Range(1, 4), ::testing::Combine(::testing::Range(1, 4),
::testing::Range(1, 2))); ::testing::Range(1, 2)));
INSTANTIATE_TEST_CASE_P(MultipleDecoders, INSTANTIATE_TEST_SUITE_P(MultipleDecoders,
VideoEncoderDecoderInstantiationTest, VideoEncoderDecoderInstantiationTest,
::testing::Combine(::testing::Range(1, 2), ::testing::Combine(::testing::Range(1, 2),
::testing::Range(1, 9))); ::testing::Range(1, 9)));
INSTANTIATE_TEST_CASE_P(MultipleEncodersDecoders, INSTANTIATE_TEST_SUITE_P(MultipleEncodersDecoders,
VideoEncoderDecoderInstantiationTest, VideoEncoderDecoderInstantiationTest,
::testing::Combine(::testing::Range(1, 4), ::testing::Combine(::testing::Range(1, 4),
::testing::Range(1, 9))); ::testing::Range(1, 9)));
// TODO(brandtr): Check that the factories actually support the codecs before // TODO(brandtr): Check that the factories actually support the codecs before
// trying to instantiate. Currently, we will just crash with a Java exception // trying to instantiate. Currently, we will just crash with a Java exception

2
modules/video_coding/codecs/test/videocodec_test_parameterized.cc
View file

@ -77,7 +77,7 @@ class VideoCodecTestParameterized
const VideoCodecType codec_type_; const VideoCodecType codec_type_;
}; };
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
CodecSettings, CodecSettings,
VideoCodecTestParameterized, VideoCodecTestParameterized,
::testing::Combine(::testing::ValuesIn(kBitrates), ::testing::Combine(::testing::ValuesIn(kBitrates),

6
modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc
View file

@ -713,9 +713,9 @@ class TemporalLayersReferenceTest : public TemporalLayersTest,
BufferState altref_state; BufferState altref_state;
}; };
INSTANTIATE_TEST_CASE_P(DefaultTemporalLayersTest, INSTANTIATE_TEST_SUITE_P(DefaultTemporalLayersTest,
TemporalLayersReferenceTest, TemporalLayersReferenceTest,
::testing::Range(1, kMaxTemporalStreams + 1)); ::testing::Range(1, kMaxTemporalStreams + 1));
TEST_P(TemporalLayersReferenceTest, ValidFrameConfigs) { TEST_P(TemporalLayersReferenceTest, ValidFrameConfigs) {
const int num_layers = GetParam(); const int num_layers = GetParam();

6
modules/video_coding/codecs/vp9/svc_rate_allocator_unittest.cc
View file

@ -254,8 +254,8 @@ TEST_P(SvcRateAllocatorTestParametrizedContentType, PaddingBitrate) {
EXPECT_EQ(allocation.GetSpatialLayerSum(2), 0UL); EXPECT_EQ(allocation.GetSpatialLayerSum(2), 0UL);
} }
INSTANTIATE_TEST_CASE_P(_, INSTANTIATE_TEST_SUITE_P(_,
SvcRateAllocatorTestParametrizedContentType, SvcRateAllocatorTestParametrizedContentType,
::testing::Bool()); ::testing::Bool());
} // namespace webrtc } // namespace webrtc

8
modules/video_coding/codecs/vp9/test/vp9_impl_unittest.cc
View file

@ -1238,10 +1238,10 @@ TEST_P(TestVp9ImplWithLayering, ExternalRefControl) {
} }
} }
INSTANTIATE_TEST_CASE_P(, INSTANTIATE_TEST_SUITE_P(,
TestVp9ImplWithLayering, TestVp9ImplWithLayering,
::testing::Combine(::testing::Values(1, 2, 3), ::testing::Combine(::testing::Values(1, 2, 3),
::testing::Values(1, 2, 3))); ::testing::Values(1, 2, 3)));
class TestVp9ImplFrameDropping : public TestVp9Impl { class TestVp9ImplFrameDropping : public TestVp9Impl {
protected: protected:

2
modules/video_coding/utility/quality_scaler_unittest.cc
View file

@ -117,7 +117,7 @@ class QualityScalerTest : public ::testing::Test,
std::unique_ptr<MockAdaptationObserver> observer_; std::unique_ptr<MockAdaptationObserver> observer_;
}; };
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
FieldTrials, FieldTrials,
QualityScalerTest, QualityScalerTest,
::testing::Values( ::testing::Values(

6
modules/video_coding/utility/simulcast_rate_allocator_unittest.cc
View file

@ -538,9 +538,9 @@ class ScreenshareRateAllocationTest : public SimulcastRateAllocatorTest {
} }
}; };
INSTANTIATE_TEST_CASE_P(ScreenshareTest, INSTANTIATE_TEST_SUITE_P(ScreenshareTest,
ScreenshareRateAllocationTest, ScreenshareRateAllocationTest,
::testing::Bool()); ::testing::Bool());
TEST_P(ScreenshareRateAllocationTest, BitrateBelowTl0) { TEST_P(ScreenshareRateAllocationTest, BitrateBelowTl0) {
SetupConferenceScreenshare(GetParam()); SetupConferenceScreenshare(GetParam());

6
modules/video_coding/video_packet_buffer_unittest.cc
View file

@ -583,9 +583,9 @@ class TestPacketBufferH264Parameterized
TestPacketBufferH264Parameterized() : TestPacketBufferH264(GetParam()) {} TestPacketBufferH264Parameterized() : TestPacketBufferH264(GetParam()) {}
}; };
INSTANTIATE_TEST_CASE_P(SpsPpsIdrIsKeyframe, INSTANTIATE_TEST_SUITE_P(SpsPpsIdrIsKeyframe,
TestPacketBufferH264Parameterized, TestPacketBufferH264Parameterized,
::testing::Values(false, true)); ::testing::Values(false, true));
TEST_P(TestPacketBufferH264Parameterized, DontRemoveMissingPacketOnClearTo) { TEST_P(TestPacketBufferH264Parameterized, DontRemoveMissingPacketOnClearTo) {
EXPECT_TRUE(InsertH264(0, kKeyFrame, kFirst, kLast, 0)); EXPECT_TRUE(InsertH264(0, kKeyFrame, kFirst, kLast, 0));

4
p2p/base/dtls_transport_unittest.cc
View file

@ -455,7 +455,7 @@ TEST_P(DtlsTransportVersionTest, TestCipherSuiteNegotiation) {
} }
// Will test every combination of 1.0/1.2 on the client and server. // Will test every combination of 1.0/1.2 on the client and server.
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
TestCipherSuiteNegotiation, TestCipherSuiteNegotiation,
DtlsTransportVersionTest, DtlsTransportVersionTest,
::testing::Combine(::testing::Values(rtc::SSL_PROTOCOL_DTLS_10, ::testing::Combine(::testing::Values(rtc::SSL_PROTOCOL_DTLS_10,
@ -707,7 +707,7 @@ TEST_P(DtlsEventOrderingTest, TestEventOrdering) {
::testing::get<1>(GetParam())); ::testing::get<1>(GetParam()));
} }
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
TestEventOrdering, TestEventOrdering,
DtlsEventOrderingTest, DtlsEventOrderingTest,
::testing::Combine( ::testing::Combine(

10
pc/jsep_session_description_unittest.cc
View file

@ -425,8 +425,8 @@ TEST_P(EnumerateAllSdpTypesTest, TestIdentity) {
EXPECT_EQ(type, webrtc::SdpTypeFromString(str)); EXPECT_EQ(type, webrtc::SdpTypeFromString(str));
} }
INSTANTIATE_TEST_CASE_P(JsepSessionDescriptionTest, INSTANTIATE_TEST_SUITE_P(JsepSessionDescriptionTest,
EnumerateAllSdpTypesTest, EnumerateAllSdpTypesTest,
Values(SdpType::kOffer, Values(SdpType::kOffer,
SdpType::kPrAnswer, SdpType::kPrAnswer,
SdpType::kAnswer)); SdpType::kAnswer));

8
pc/jsep_transport_unittest.cc
View file

@ -638,9 +638,9 @@ TEST_P(JsepTransport2WithRtcpMux, InvalidDtlsRoleNegotiation) {
} }
} }
INSTANTIATE_TEST_CASE_P(JsepTransport2Test, INSTANTIATE_TEST_SUITE_P(JsepTransport2Test,
JsepTransport2WithRtcpMux, JsepTransport2WithRtcpMux,
testing::Bool()); testing::Bool());
// Test that a reoffer in the opposite direction is successful as long as the // Test that a reoffer in the opposite direction is successful as long as the
// role isn't changing. Doesn't test every possible combination like the test // role isn't changing. Doesn't test every possible combination like the test
@ -1231,7 +1231,7 @@ TEST_P(JsepTransport2HeaderExtensionTest, EncryptedHeaderExtensionNegotiation) {
TestSendRecvPacketWithEncryptedHeaderExtension(); TestSendRecvPacketWithEncryptedHeaderExtension();
} }
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
JsepTransport2Test, JsepTransport2Test,
JsepTransport2HeaderExtensionTest, JsepTransport2HeaderExtensionTest,
::testing::Values( ::testing::Values(

26
pc/media_session_unittest.cc
View file

@ -4044,12 +4044,12 @@ TEST_P(MediaProtocolTest, TestAudioVideoAcceptance) {
EXPECT_EQ(GetParam(), vcd->protocol()); EXPECT_EQ(GetParam(), vcd->protocol());
} }
INSTANTIATE_TEST_CASE_P(MediaProtocolPatternTest, INSTANTIATE_TEST_SUITE_P(MediaProtocolPatternTest,
MediaProtocolTest, MediaProtocolTest,
::testing::ValuesIn(kMediaProtocols)); ::testing::ValuesIn(kMediaProtocols));
INSTANTIATE_TEST_CASE_P(MediaProtocolDtlsPatternTest, INSTANTIATE_TEST_SUITE_P(MediaProtocolDtlsPatternTest,
MediaProtocolTest, MediaProtocolTest,
::testing::ValuesIn(kMediaProtocolsDtls)); ::testing::ValuesIn(kMediaProtocolsDtls));
TEST_F(MediaSessionDescriptionFactoryTest, TestSetAudioCodecs) { TEST_F(MediaSessionDescriptionFactoryTest, TestSetAudioCodecs) {
TransportDescriptionFactory tdf; TransportDescriptionFactory tdf;
@ -4372,12 +4372,12 @@ TEST_P(AudioCodecsOfferTest, TestCodecsInOffer) {
TestAudioCodecsOffer(GetParam()); TestAudioCodecsOffer(GetParam());
} }
INSTANTIATE_TEST_CASE_P(MediaSessionDescriptionFactoryTest, INSTANTIATE_TEST_SUITE_P(MediaSessionDescriptionFactoryTest,
AudioCodecsOfferTest, AudioCodecsOfferTest,
::testing::Values(RtpTransceiverDirection::kSendOnly, ::testing::Values(RtpTransceiverDirection::kSendOnly,
RtpTransceiverDirection::kRecvOnly, RtpTransceiverDirection::kRecvOnly,
RtpTransceiverDirection::kSendRecv, RtpTransceiverDirection::kSendRecv,
RtpTransceiverDirection::kInactive)); RtpTransceiverDirection::kInactive));
class AudioCodecsAnswerTest class AudioCodecsAnswerTest
: public ::testing::TestWithParam<::testing::tuple<RtpTransceiverDirection, : public ::testing::TestWithParam<::testing::tuple<RtpTransceiverDirection,
@ -4390,7 +4390,7 @@ TEST_P(AudioCodecsAnswerTest, TestCodecsInAnswer) {
::testing::get<2>(GetParam())); ::testing::get<2>(GetParam()));
} }
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
MediaSessionDescriptionFactoryTest, MediaSessionDescriptionFactoryTest,
AudioCodecsAnswerTest, AudioCodecsAnswerTest,
::testing::Combine(::testing::Values(RtpTransceiverDirection::kSendOnly, ::testing::Combine(::testing::Values(RtpTransceiverDirection::kSendOnly,

10
pc/peer_connection_bundle_unittest.cc
View file

@ -458,7 +458,7 @@ TEST_P(PeerConnectionBundleMatrixTest,
// and multiplex audio/video from the start. // and multiplex audio/video from the start.
// For all other policies, bundling should only be enabled if negotiated by the // For all other policies, bundling should only be enabled if negotiated by the
// answer. // answer.
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
PeerConnectionBundleTest, PeerConnectionBundleTest,
PeerConnectionBundleMatrixTest, PeerConnectionBundleMatrixTest,
Combine(Values(SdpSemantics::kPlanB, SdpSemantics::kUnifiedPlan), Combine(Values(SdpSemantics::kPlanB, SdpSemantics::kUnifiedPlan),
@ -861,10 +861,10 @@ TEST_P(PeerConnectionBundleTest, RemoveContentFromBundleGroup) {
callee->SetLocalDescription(CloneSessionDescription(answer.get()))); callee->SetLocalDescription(CloneSessionDescription(answer.get())));
} }
INSTANTIATE_TEST_CASE_P(PeerConnectionBundleTest, INSTANTIATE_TEST_SUITE_P(PeerConnectionBundleTest,
PeerConnectionBundleTest, PeerConnectionBundleTest,
Values(SdpSemantics::kPlanB, Values(SdpSemantics::kPlanB,
SdpSemantics::kUnifiedPlan)); SdpSemantics::kUnifiedPlan));
// According to RFC5888, if an endpoint understands the semantics of an // According to RFC5888, if an endpoint understands the semantics of an
// "a=group", it MUST return an answer with that group. So, an empty BUNDLE // "a=group", it MUST return an answer with that group. So, an empty BUNDLE

10
pc/peer_connection_crypto_unittest.cc
View file

@ -640,7 +640,7 @@ TEST_P(PeerConnectionCryptoDtlsCertGenTest, TestCertificateGeneration) {
} }
} }
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
PeerConnectionCryptoTest, PeerConnectionCryptoTest,
PeerConnectionCryptoDtlsCertGenTest, PeerConnectionCryptoDtlsCertGenTest,
Combine(Values(SdpSemantics::kPlanB, SdpSemantics::kUnifiedPlan), Combine(Values(SdpSemantics::kPlanB, SdpSemantics::kUnifiedPlan),
@ -746,9 +746,9 @@ TEST_P(PeerConnectionCryptoTest, SessionErrorIfFingerprintInvalid) {
"Session error code: ERROR_CONTENT."); "Session error code: ERROR_CONTENT.");
} }
INSTANTIATE_TEST_CASE_P(PeerConnectionCryptoTest, INSTANTIATE_TEST_SUITE_P(PeerConnectionCryptoTest,
PeerConnectionCryptoTest, PeerConnectionCryptoTest,
Values(SdpSemantics::kPlanB, Values(SdpSemantics::kPlanB,
SdpSemantics::kUnifiedPlan)); SdpSemantics::kUnifiedPlan));
} // namespace webrtc } // namespace webrtc

8
pc/peer_connection_data_channel_unittest.cc
View file

@ -416,9 +416,9 @@ TEST_P(PeerConnectionDataChannelTest,
"Failed to set local offer sdp: Failed to create data channel."); "Failed to set local offer sdp: Failed to create data channel.");
} }
INSTANTIATE_TEST_CASE_P(PeerConnectionDataChannelTest, INSTANTIATE_TEST_SUITE_P(PeerConnectionDataChannelTest,
PeerConnectionDataChannelTest, PeerConnectionDataChannelTest,
Values(SdpSemantics::kPlanB, Values(SdpSemantics::kPlanB,
SdpSemantics::kUnifiedPlan)); SdpSemantics::kUnifiedPlan));
} // namespace webrtc } // namespace webrtc

8
pc/peer_connection_end_to_end_unittest.cc
View file

@ -726,7 +726,7 @@ TEST_P(PeerConnectionEndToEndTest, CloseDataChannelRemotelyWhileNotReferenced) {
} }
#endif // HAVE_SCTP #endif // HAVE_SCTP
INSTANTIATE_TEST_CASE_P(PeerConnectionEndToEndTest, INSTANTIATE_TEST_SUITE_P(PeerConnectionEndToEndTest,
PeerConnectionEndToEndTest, PeerConnectionEndToEndTest,
Values(SdpSemantics::kPlanB, Values(SdpSemantics::kPlanB,
SdpSemantics::kUnifiedPlan)); SdpSemantics::kUnifiedPlan));

10
pc/peer_connection_ice_unittest.cc
View file

@ -872,7 +872,7 @@ TEST_P(PeerConnectionIceUfragPwdAnswerTest, TestIncludedInAnswer) {
EXPECT_NE(answer_transport_desc->ice_pwd, local_transport_desc->ice_pwd); EXPECT_NE(answer_transport_desc->ice_pwd, local_transport_desc->ice_pwd);
} }
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
PeerConnectionIceTest, PeerConnectionIceTest,
PeerConnectionIceUfragPwdAnswerTest, PeerConnectionIceUfragPwdAnswerTest,
Combine(Values(SdpSemantics::kPlanB, SdpSemantics::kUnifiedPlan), Combine(Values(SdpSemantics::kPlanB, SdpSemantics::kUnifiedPlan),
@ -970,10 +970,10 @@ TEST_P(PeerConnectionIceTest,
EXPECT_EQ(cricket::ICEROLE_CONTROLLED, GetIceRole(callee)); EXPECT_EQ(cricket::ICEROLE_CONTROLLED, GetIceRole(callee));
} }
INSTANTIATE_TEST_CASE_P(PeerConnectionIceTest, INSTANTIATE_TEST_SUITE_P(PeerConnectionIceTest,
PeerConnectionIceTest, PeerConnectionIceTest,
Values(SdpSemantics::kPlanB, Values(SdpSemantics::kPlanB,
SdpSemantics::kUnifiedPlan)); SdpSemantics::kUnifiedPlan));
class PeerConnectionIceConfigTest : public testing::Test { class PeerConnectionIceConfigTest : public testing::Test {
protected: protected:

12
pc/peer_connection_integrationtest.cc
View file

@ -3943,7 +3943,7 @@ constexpr uint32_t kFlagsIPv6NoStun =
constexpr uint32_t kFlagsIPv4Stun = constexpr uint32_t kFlagsIPv4Stun =
cricket::PORTALLOCATOR_DISABLE_TCP | cricket::PORTALLOCATOR_DISABLE_RELAY; cricket::PORTALLOCATOR_DISABLE_TCP | cricket::PORTALLOCATOR_DISABLE_RELAY;
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
PeerConnectionIntegrationTest, PeerConnectionIntegrationTest,
PeerConnectionIntegrationIceStatesTest, PeerConnectionIntegrationIceStatesTest,
Combine(Values(SdpSemantics::kPlanB, SdpSemantics::kUnifiedPlan), Combine(Values(SdpSemantics::kPlanB, SdpSemantics::kUnifiedPlan),
@ -4915,10 +4915,10 @@ TEST_P(PeerConnectionIntegrationTest,
EXPECT_LT(0, callee_ice_event_count); EXPECT_LT(0, callee_ice_event_count);
} }
INSTANTIATE_TEST_CASE_P(PeerConnectionIntegrationTest, INSTANTIATE_TEST_SUITE_P(PeerConnectionIntegrationTest,
PeerConnectionIntegrationTest, PeerConnectionIntegrationTest,
Values(SdpSemantics::kPlanB, Values(SdpSemantics::kPlanB,
SdpSemantics::kUnifiedPlan)); SdpSemantics::kUnifiedPlan));
// Tests that verify interoperability between Plan B and Unified Plan // Tests that verify interoperability between Plan B and Unified Plan
// PeerConnections. // PeerConnections.
@ -5036,7 +5036,7 @@ TEST_P(PeerConnectionIntegrationInteropTest,
ASSERT_TRUE(ExpectNewFrames(media_expectations)); ASSERT_TRUE(ExpectNewFrames(media_expectations));
} }
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
PeerConnectionIntegrationTest, PeerConnectionIntegrationTest,
PeerConnectionIntegrationInteropTest, PeerConnectionIntegrationInteropTest,
Values(std::make_tuple(SdpSemantics::kPlanB, SdpSemantics::kUnifiedPlan), Values(std::make_tuple(SdpSemantics::kPlanB, SdpSemantics::kUnifiedPlan),

8
pc/peer_connection_interface_unittest.cc
View file

@ -3948,10 +3948,10 @@ TEST_P(PeerConnectionInterfaceTest, ExtmapAllowMixedIsConfigurable) {
EXPECT_TRUE(offer->description()->extmap_allow_mixed()); EXPECT_TRUE(offer->description()->extmap_allow_mixed());
} }
INSTANTIATE_TEST_CASE_P(PeerConnectionInterfaceTest, INSTANTIATE_TEST_SUITE_P(PeerConnectionInterfaceTest,
PeerConnectionInterfaceTest, PeerConnectionInterfaceTest,
Values(SdpSemantics::kPlanB, Values(SdpSemantics::kPlanB,
SdpSemantics::kUnifiedPlan)); SdpSemantics::kUnifiedPlan));
class PeerConnectionMediaConfigTest : public testing::Test { class PeerConnectionMediaConfigTest : public testing::Test {
protected: protected:

2
pc/peer_connection_jsep_unittest.cc
View file

@ -1065,7 +1065,7 @@ TEST_P(RecycleMediaSectionTest, PendingRemoteRejectedAndNotRejectedLocal) {
// for the media section. This is needed for full test coverage because // for the media section. This is needed for full test coverage because
// MediaSession has separate functions for processing audio and video media // MediaSession has separate functions for processing audio and video media
// sections. // sections.
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
PeerConnectionJsepTest, PeerConnectionJsepTest,
RecycleMediaSectionTest, RecycleMediaSectionTest,
Combine(Values(cricket::MEDIA_TYPE_AUDIO, cricket::MEDIA_TYPE_VIDEO), Combine(Values(cricket::MEDIA_TYPE_AUDIO, cricket::MEDIA_TYPE_VIDEO),

32
pc/peer_connection_media_unittest.cc
View file

@ -536,7 +536,7 @@ TEST_P(PeerConnectionMediaOfferDirectionTest, VerifyDirection) {
// Note that in these tests, MD_INACTIVE indicates that no media section is // Note that in these tests, MD_INACTIVE indicates that no media section is
// included in the offer, not that the media direction is inactive. // included in the offer, not that the media direction is inactive.
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
PeerConnectionMediaTest, PeerConnectionMediaTest,
PeerConnectionMediaOfferDirectionTest, PeerConnectionMediaOfferDirectionTest,
Combine( Combine(
@ -652,16 +652,16 @@ TEST_P(PeerConnectionMediaAnswerDirectionTest, VerifyRejected) {
EXPECT_EQ((offer_to_receive_ == 0 && !send_media_), audio_content->rejected); EXPECT_EQ((offer_to_receive_ == 0 && !send_media_), audio_content->rejected);
} }
INSTANTIATE_TEST_CASE_P(PeerConnectionMediaTest, INSTANTIATE_TEST_SUITE_P(PeerConnectionMediaTest,
PeerConnectionMediaAnswerDirectionTest, PeerConnectionMediaAnswerDirectionTest,
Combine(Values(SdpSemantics::kPlanB, Combine(Values(SdpSemantics::kPlanB,
SdpSemantics::kUnifiedPlan), SdpSemantics::kUnifiedPlan),
Values(RtpTransceiverDirection::kInactive, Values(RtpTransceiverDirection::kInactive,
RtpTransceiverDirection::kSendOnly, RtpTransceiverDirection::kSendOnly,
RtpTransceiverDirection::kRecvOnly, RtpTransceiverDirection::kRecvOnly,
RtpTransceiverDirection::kSendRecv), RtpTransceiverDirection::kSendRecv),
Bool(), Bool(),
Values(-1, 0, 1))); Values(-1, 0, 1)));
TEST_P(PeerConnectionMediaTest, OfferHasDifferentDirectionForAudioVideo) { TEST_P(PeerConnectionMediaTest, OfferHasDifferentDirectionForAudioVideo) {
auto caller = CreatePeerConnection(); auto caller = CreatePeerConnection();
@ -830,7 +830,7 @@ constexpr char kMLinesOutOfOrder[] =
"The order of m-lines in answer doesn't match order in offer. Rejecting " "The order of m-lines in answer doesn't match order in offer. Rejecting "
"answer."; "answer.";
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
PeerConnectionMediaTest, PeerConnectionMediaTest,
PeerConnectionMediaInvalidMediaTest, PeerConnectionMediaInvalidMediaTest,
Combine(Values(SdpSemantics::kPlanB, SdpSemantics::kUnifiedPlan), Combine(Values(SdpSemantics::kPlanB, SdpSemantics::kUnifiedPlan),
@ -1239,9 +1239,9 @@ TEST_P(PeerConnectionMediaTest, MediaTransportNotPropagatedToVoiceEngine) {
ASSERT_EQ(nullptr, callee_video->media_transport()); ASSERT_EQ(nullptr, callee_video->media_transport());
} }
INSTANTIATE_TEST_CASE_P(PeerConnectionMediaTest, INSTANTIATE_TEST_SUITE_P(PeerConnectionMediaTest,
PeerConnectionMediaTest, PeerConnectionMediaTest,
Values(SdpSemantics::kPlanB, Values(SdpSemantics::kPlanB,
SdpSemantics::kUnifiedPlan)); SdpSemantics::kUnifiedPlan));
} // namespace webrtc } // namespace webrtc

8
pc/peer_connection_rtp_unittest.cc
View file

@ -1814,9 +1814,9 @@ TEST_P(PeerConnectionRtpTest, CreateTwoSendersWithSameTrack) {
} }
} }
INSTANTIATE_TEST_CASE_P(PeerConnectionRtpTest, INSTANTIATE_TEST_SUITE_P(PeerConnectionRtpTest,
PeerConnectionRtpTest, PeerConnectionRtpTest,
Values(SdpSemantics::kPlanB, Values(SdpSemantics::kPlanB,
SdpSemantics::kUnifiedPlan)); SdpSemantics::kUnifiedPlan));
} // namespace webrtc } // namespace webrtc

28
pc/peer_connection_signaling_unittest.cc
View file

@ -402,16 +402,16 @@ TEST_P(PeerConnectionSignalingStateTest, SetRemoteAnswer) {
} }
} }
INSTANTIATE_TEST_CASE_P(PeerConnectionSignalingTest, INSTANTIATE_TEST_SUITE_P(PeerConnectionSignalingTest,
PeerConnectionSignalingStateTest, PeerConnectionSignalingStateTest,
Combine(Values(SdpSemantics::kPlanB, Combine(Values(SdpSemantics::kPlanB,
SdpSemantics::kUnifiedPlan), SdpSemantics::kUnifiedPlan),
Values(SignalingState::kStable, Values(SignalingState::kStable,
SignalingState::kHaveLocalOffer, SignalingState::kHaveLocalOffer,
SignalingState::kHaveLocalPrAnswer, SignalingState::kHaveLocalPrAnswer,
SignalingState::kHaveRemoteOffer, SignalingState::kHaveRemoteOffer,
SignalingState::kHaveRemotePrAnswer), SignalingState::kHaveRemotePrAnswer),
Bool())); Bool()));
// Test that CreateAnswer fails if a round of offer/answer has been done and // Test that CreateAnswer fails if a round of offer/answer has been done and
// the PeerConnection is in the stable state. // the PeerConnection is in the stable state.
@ -522,10 +522,10 @@ TEST_P(PeerConnectionSignalingTest, CreateOffersAndShutdown) {
} }
} }
INSTANTIATE_TEST_CASE_P(PeerConnectionSignalingTest, INSTANTIATE_TEST_SUITE_P(PeerConnectionSignalingTest,
PeerConnectionSignalingTest, PeerConnectionSignalingTest,
Values(SdpSemantics::kPlanB, Values(SdpSemantics::kPlanB,
SdpSemantics::kUnifiedPlan)); SdpSemantics::kUnifiedPlan));
class PeerConnectionSignalingUnifiedPlanTest class PeerConnectionSignalingUnifiedPlanTest
: public PeerConnectionSignalingBaseTest { : public PeerConnectionSignalingBaseTest {

12
pc/rtp_media_utils_unittest.cc
View file

@ -57,9 +57,9 @@ TEST_P(EnumerateAllDirectionsTest, TestReversedIdentity) {
RtpTransceiverDirectionReversed(direction))); RtpTransceiverDirectionReversed(direction)));
} }
INSTANTIATE_TEST_CASE_P(RtpTransceiverDirectionTest, INSTANTIATE_TEST_SUITE_P(RtpTransceiverDirectionTest,
EnumerateAllDirectionsTest, EnumerateAllDirectionsTest,
ValuesIn(kAllDirections)); ValuesIn(kAllDirections));
class EnumerateAllDirectionsAndBool class EnumerateAllDirectionsAndBool
: public ::testing::TestWithParam< : public ::testing::TestWithParam<
@ -89,8 +89,8 @@ TEST_P(EnumerateAllDirectionsAndBool, TestWithRecvSet) {
EXPECT_EQ(recv, RtpTransceiverDirectionHasRecv(result)); EXPECT_EQ(recv, RtpTransceiverDirectionHasRecv(result));
} }
INSTANTIATE_TEST_CASE_P(RtpTransceiverDirectionTest, INSTANTIATE_TEST_SUITE_P(RtpTransceiverDirectionTest,
EnumerateAllDirectionsAndBool, EnumerateAllDirectionsAndBool,
Combine(ValuesIn(kAllDirections), Bool())); Combine(ValuesIn(kAllDirections), Bool()));
} // namespace webrtc } // namespace webrtc

12
pc/sdp_serializer_unittest.cc
View file

@ -231,9 +231,9 @@ const char* kSimulcastMalformedStrings[] = {
"", "",
}; };
INSTANTIATE_TEST_CASE_P(SimulcastDeserializationErrors, INSTANTIATE_TEST_SUITE_P(SimulcastDeserializationErrors,
SimulcastSdpSerializerTest, SimulcastSdpSerializerTest,
ValuesIn(kSimulcastMalformedStrings)); ValuesIn(kSimulcastMalformedStrings));
// Test a simple serialization scenario. // Test a simple serialization scenario.
TEST_F(SimulcastSdpSerializerTest, Serialize_SimpleCase) { TEST_F(SimulcastSdpSerializerTest, Serialize_SimpleCase) {
@ -471,8 +471,8 @@ const char* kRidDescriptionMalformedStrings[] = {
"1 recv ;;", "1 recv ;;",
}; };
INSTANTIATE_TEST_CASE_P(RidDescriptionDeserializationErrors, INSTANTIATE_TEST_SUITE_P(RidDescriptionDeserializationErrors,
RidDescriptionSdpSerializerTest, RidDescriptionSdpSerializerTest,
ValuesIn(kRidDescriptionMalformedStrings)); ValuesIn(kRidDescriptionMalformedStrings));
} // namespace webrtc } // namespace webrtc

6
pc/srtp_transport_unittest.cc
View file

@ -399,9 +399,9 @@ TEST_F(SrtpTransportTest,
} }
// Run all tests both with and without external auth enabled. // Run all tests both with and without external auth enabled.
INSTANTIATE_TEST_CASE_P(ExternalAuth, INSTANTIATE_TEST_SUITE_P(ExternalAuth,
SrtpTransportTestWithExternalAuth, SrtpTransportTestWithExternalAuth,
::testing::Values(true, false)); ::testing::Values(true, false));
// Test directly setting the params with bogus keys. // Test directly setting the params with bogus keys.
TEST_F(SrtpTransportTest, TestSetParamsKeyTooShort) { TEST_F(SrtpTransportTest, TestSetParamsKeyTooShort) {

2
pc/stats_collector_unittest.cc
View file

@ -1750,6 +1750,6 @@ TEST_P(StatsCollectorTrackTest, VerifyVideoReceiveSsrcStatsNew) {
ExtractSsrcStatsValue(reports, StatsReport::kStatsValueNameQpSum)); ExtractSsrcStatsValue(reports, StatsReport::kStatsValueNameQpSum));
} }
INSTANTIATE_TEST_CASE_P(HasStream, StatsCollectorTrackTest, ::testing::Bool()); INSTANTIATE_TEST_SUITE_P(HasStream, StatsCollectorTrackTest, ::testing::Bool());
} // namespace webrtc } // namespace webrtc

6
pc/webrtc_sdp_unittest.cc
View file

@ -3020,9 +3020,9 @@ TEST_P(WebRtcSdpExtmapTest, DeserializeSessionDescriptionWithInvalidExtmap) {
TestDeserializeExtmap(true, true, encrypted); TestDeserializeExtmap(true, true, encrypted);
} }
INSTANTIATE_TEST_CASE_P(Encrypted, INSTANTIATE_TEST_SUITE_P(Encrypted,
WebRtcSdpExtmapTest, WebRtcSdpExtmapTest,
::testing::Values(false, true)); ::testing::Values(false, true));
TEST_F(WebRtcSdpTest, DeserializeSessionDescriptionWithoutEndLineBreak) { TEST_F(WebRtcSdpTest, DeserializeSessionDescriptionWithoutEndLineBreak) {
JsepSessionDescription jdesc(kDummyType); JsepSessionDescription jdesc(kDummyType);

6
rtc_base/numerics/percentile_filter_unittest.cc
View file

@ -34,9 +34,9 @@ class PercentileFilterTest : public ::testing::TestWithParam<float> {
RTC_DISALLOW_COPY_AND_ASSIGN(PercentileFilterTest); RTC_DISALLOW_COPY_AND_ASSIGN(PercentileFilterTest);
}; };
INSTANTIATE_TEST_CASE_P(PercentileFilterTests, INSTANTIATE_TEST_SUITE_P(PercentileFilterTests,
PercentileFilterTest, PercentileFilterTest,
::testing::Values(0.0f, 0.1f, 0.5f, 0.9f, 1.0f)); ::testing::Values(0.0f, 0.1f, 0.5f, 0.9f, 1.0f));
TEST(PercentileFilterTest, MinFilter) { TEST(PercentileFilterTest, MinFilter) {
PercentileFilter<int64_t> filter(0.0f); PercentileFilter<int64_t> filter(0.0f);

2
rtc_base/ssl_adapter_unittest.cc
View file

@ -53,7 +53,7 @@ class MockCertVerifier : public rtc::SSLCertificateVerifier {
MOCK_METHOD1(Verify, bool(const rtc::SSLCertificate&)); MOCK_METHOD1(Verify, bool(const rtc::SSLCertificate&));
}; };
// TODO(benwright) - Move to using INSTANTIATE_TEST_CASE_P instead of using // TODO(benwright) - Move to using INSTANTIATE_TEST_SUITE_P instead of using
// duplicate test cases for simple parameter changes. // duplicate test cases for simple parameter changes.
class SSLAdapterTestDummyClient : public sigslot::has_slots<> { class SSLAdapterTestDummyClient : public sigslot::has_slots<> {
public: public:

4
rtc_base/ssl_stream_adapter_unittest.cc
View file

@ -1456,7 +1456,7 @@ TEST_P(SSLStreamAdapterTestDTLS, TestGetSslCipherSuiteDtls12Server) {
// The RSA keysizes here might look strange, why not include the RFC's size // The RSA keysizes here might look strange, why not include the RFC's size
// 2048?. The reason is test case slowness; testing two sizes to exercise // 2048?. The reason is test case slowness; testing two sizes to exercise
// parametrization is sufficient. // parametrization is sufficient.
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
SSLStreamAdapterTestsTLS, SSLStreamAdapterTestsTLS,
SSLStreamAdapterTestTLS, SSLStreamAdapterTestTLS,
Combine(Values(rtc::KeyParams::RSA(1024, 65537), Combine(Values(rtc::KeyParams::RSA(1024, 65537),
@ -1465,7 +1465,7 @@ INSTANTIATE_TEST_CASE_P(
Values(rtc::KeyParams::RSA(1024, 65537), Values(rtc::KeyParams::RSA(1024, 65537),
rtc::KeyParams::RSA(1152, 65537), rtc::KeyParams::RSA(1152, 65537),
rtc::KeyParams::ECDSA(rtc::EC_NIST_P256)))); rtc::KeyParams::ECDSA(rtc::EC_NIST_P256))));
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
SSLStreamAdapterTestsDTLS, SSLStreamAdapterTestsDTLS,
SSLStreamAdapterTestDTLS, SSLStreamAdapterTestDTLS,
Combine(Values(rtc::KeyParams::RSA(1024, 65537), Combine(Values(rtc::KeyParams::RSA(1024, 65537),

16
rtc_base/string_to_number_unittest.cc
View file

@ -36,7 +36,7 @@ using IntegerTypes =
template <typename T> template <typename T>
class BasicNumberTest : public ::testing::Test {}; class BasicNumberTest : public ::testing::Test {};
TYPED_TEST_CASE_P(BasicNumberTest); TYPED_TEST_SUITE_P(BasicNumberTest);
TYPED_TEST_P(BasicNumberTest, TestValidNumbers) { TYPED_TEST_P(BasicNumberTest, TestValidNumbers) {
using T = TypeParam; using T = TypeParam;
@ -93,16 +93,16 @@ TYPED_TEST_P(BasicNumberTest, TestInvalidInputs) {
EXPECT_EQ(absl::nullopt, StringToNumber<T>("5 ")); EXPECT_EQ(absl::nullopt, StringToNumber<T>("5 "));
} }
REGISTER_TYPED_TEST_CASE_P(BasicNumberTest, REGISTER_TYPED_TEST_SUITE_P(BasicNumberTest,
TestValidNumbers, TestValidNumbers,
TestInvalidNumbers, TestInvalidNumbers,
TestInvalidInputs); TestInvalidInputs);
} // namespace } // namespace
INSTANTIATE_TYPED_TEST_CASE_P(StringToNumberTest_Integers, INSTANTIATE_TYPED_TEST_SUITE_P(StringToNumberTest_Integers,
BasicNumberTest, BasicNumberTest,
IntegerTypes); IntegerTypes);
TEST(StringToNumberTest, TestSpecificValues) { TEST(StringToNumberTest, TestSpecificValues) {
EXPECT_EQ(absl::nullopt, StringToNumber<uint8_t>("256")); EXPECT_EQ(absl::nullopt, StringToNumber<uint8_t>("256"));

2
rtc_base/unique_id_generator_unittest.cc
View file

@ -32,7 +32,7 @@ using test_types = ::testing::Types<UniqueNumberGenerator<uint8_t>,
UniqueRandomIdGenerator, UniqueRandomIdGenerator,
UniqueStringGenerator>; UniqueStringGenerator>;
TYPED_TEST_CASE(UniqueIdGeneratorTest, test_types); TYPED_TEST_SUITE(UniqueIdGeneratorTest, test_types);
TYPED_TEST(UniqueIdGeneratorTest, ElementsDoNotRepeat) { TYPED_TEST(UniqueIdGeneratorTest, ElementsDoNotRepeat) {
typedef TypeParam Generator; typedef TypeParam Generator;

57
test/scenario/scenario_tests/bbr_performance.cc
View file

@ -211,11 +211,12 @@ TEST_P(BbrScenarioTest, ReceivesVideo) {
s.RunFor(TimeDelta::ms(kRunTimeMs)); s.RunFor(TimeDelta::ms(kRunTimeMs));
} }
INSTANTIATE_TEST_CASE_P(Selected, INSTANTIATE_TEST_SUITE_P(Selected,
BbrScenarioTest, BbrScenarioTest,
Values(make_tuple("rs:1,bw:150,dl:100,ct:100", "bbr"))); Values(make_tuple("rs:1,bw:150,dl:100,ct:100",
"bbr")));
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
OneWayTuning, OneWayTuning,
BbrScenarioTest, BbrScenarioTest,
Values(make_tuple("bw:150,dl:100", "bbr,iw:,eg:100%,notr"), Values(make_tuple("bw:150,dl:100", "bbr,iw:,eg:100%,notr"),
@ -223,34 +224,34 @@ INSTANTIATE_TEST_CASE_P(
make_tuple("bw:150,dl:100", "bbr,iw:8000,eg:100%"), make_tuple("bw:150,dl:100", "bbr,iw:8000,eg:100%"),
make_tuple("bw:150,dl:100", "bbr,iw:8000,eg:80%"))); make_tuple("bw:150,dl:100", "bbr,iw:8000,eg:80%")));
INSTANTIATE_TEST_CASE_P(OneWayTuned, INSTANTIATE_TEST_SUITE_P(OneWayTuned,
BbrScenarioTest, BbrScenarioTest,
Values(make_tuple("bw:150,dl:100", "bbr"), Values(make_tuple("bw:150,dl:100", "bbr"),
make_tuple("bw:150,dl:100", ""), make_tuple("bw:150,dl:100", ""),
make_tuple("bw:800,dl:100", "bbr"), make_tuple("bw:800,dl:100", "bbr"),
make_tuple("bw:800,dl:100", ""))); make_tuple("bw:800,dl:100", "")));
INSTANTIATE_TEST_CASE_P(OneWayDegraded, INSTANTIATE_TEST_SUITE_P(OneWayDegraded,
BbrScenarioTest, BbrScenarioTest,
Values(make_tuple("bw:150,dl:100,dn:30,pl:5%", "bbr"), Values(make_tuple("bw:150,dl:100,dn:30,pl:5%", "bbr"),
make_tuple("bw:150,dl:100,dn:30,pl:5%", ""), make_tuple("bw:150,dl:100,dn:30,pl:5%", ""),
make_tuple("bw:150,ct:100,dl:100", "bbr"), make_tuple("bw:150,ct:100,dl:100", "bbr"),
make_tuple("bw:150,ct:100,dl:100", ""), make_tuple("bw:150,ct:100,dl:100", ""),
make_tuple("bw:800,dl:100,dn:30,pl:5%", "bbr"), make_tuple("bw:800,dl:100,dn:30,pl:5%", "bbr"),
make_tuple("bw:800,dl:100,dn:30,pl:5%", ""), make_tuple("bw:800,dl:100,dn:30,pl:5%", ""),
make_tuple("bw:800,ct:600,dl:100", "bbr"), make_tuple("bw:800,ct:600,dl:100", "bbr"),
make_tuple("bw:800,ct:600,dl:100", ""))); make_tuple("bw:800,ct:600,dl:100", "")));
INSTANTIATE_TEST_CASE_P(TwoWay, INSTANTIATE_TEST_SUITE_P(TwoWay,
BbrScenarioTest, BbrScenarioTest,
Values(make_tuple("ret,bw:150,dl:100", "bbr"), Values(make_tuple("ret,bw:150,dl:100", "bbr"),
make_tuple("ret,bw:150,dl:100", ""), make_tuple("ret,bw:150,dl:100", ""),
make_tuple("ret,bw:800,dl:100", "bbr"), make_tuple("ret,bw:800,dl:100", "bbr"),
make_tuple("ret,bw:800,dl:100", ""), make_tuple("ret,bw:800,dl:100", ""),
make_tuple("ret,bw:150,dl:50", "bbr"), make_tuple("ret,bw:150,dl:50", "bbr"),
make_tuple("ret,bw:150,dl:50", ""))); make_tuple("ret,bw:150,dl:50", "")));
} // namespace test } // namespace test
} // namespace webrtc } // namespace webrtc

2
video/end_to_end_tests/call_operation_tests.cc
View file

@ -31,7 +31,7 @@ class CallOperationEndToEndTest
test::ScopedFieldTrials field_trial_; test::ScopedFieldTrials field_trial_;
}; };
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
FieldTrials, FieldTrials,
CallOperationEndToEndTest, CallOperationEndToEndTest,
::testing::Values("WebRTC-TaskQueueCongestionControl/Enabled/", ::testing::Values("WebRTC-TaskQueueCongestionControl/Enabled/",

11
video/end_to_end_tests/codec_tests.cc
View file

@ -110,10 +110,11 @@ class CodecObserver : public test::EndToEndTest,
int frame_counter_; int frame_counter_;
}; };
INSTANTIATE_TEST_CASE_P(GenericDescriptor, INSTANTIATE_TEST_SUITE_P(
CodecEndToEndTest, GenericDescriptor,
::testing::Values("WebRTC-GenericDescriptor/Disabled/", CodecEndToEndTest,
"WebRTC-GenericDescriptor/Enabled/")); ::testing::Values("WebRTC-GenericDescriptor/Disabled/",
"WebRTC-GenericDescriptor/Enabled/"));
TEST_P(CodecEndToEndTest, SendsAndReceivesVP8) { TEST_P(CodecEndToEndTest, SendsAndReceivesVP8) {
test::FunctionVideoEncoderFactory encoder_factory( test::FunctionVideoEncoderFactory encoder_factory(
@ -229,7 +230,7 @@ class EndToEndTestH264 : public test::CallTest,
test::ScopedFieldTrials field_trial_; test::ScopedFieldTrials field_trial_;
}; };
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
SpsPpsIdrIsKeyframe, SpsPpsIdrIsKeyframe,
EndToEndTestH264, EndToEndTestH264,
::testing::Values("WebRTC-SpsPpsIdrIsH264Keyframe/Disabled/", ::testing::Values("WebRTC-SpsPpsIdrIsH264Keyframe/Disabled/",

2
video/end_to_end_tests/probing_tests.cc
View file

@ -28,7 +28,7 @@ class ProbingEndToEndTest : public test::CallTest,
private: private:
test::ScopedFieldTrials field_trial_; test::ScopedFieldTrials field_trial_;
}; };
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
FieldTrials, FieldTrials,
ProbingEndToEndTest, ProbingEndToEndTest,
::testing::Values("WebRTC-TaskQueueCongestionControl/Enabled/", ::testing::Values("WebRTC-TaskQueueCongestionControl/Enabled/",

2
video/end_to_end_tests/transport_feedback_tests.cc
View file

@ -35,7 +35,7 @@ class TransportFeedbackEndToEndTest
test::ScopedFieldTrials field_trial_; test::ScopedFieldTrials field_trial_;
}; };
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
FieldTrials, FieldTrials,
TransportFeedbackEndToEndTest, TransportFeedbackEndToEndTest,
::testing::Values("WebRTC-TaskQueueCongestionControl/Enabled/", ::testing::Values("WebRTC-TaskQueueCongestionControl/Enabled/",

15
video/full_stack_tests.cc
View file

@ -1220,10 +1220,11 @@ TEST(FullStackTest, MAYBE_LargeRoomVP8_50thumb) {
fixture->RunWithAnalyzer(large_room); fixture->RunWithAnalyzer(large_room);
} }
INSTANTIATE_TEST_CASE_P(FullStackTest, INSTANTIATE_TEST_SUITE_P(
GenericDescriptorTest, FullStackTest,
::testing::Values("WebRTC-GenericDescriptor/Disabled/", GenericDescriptorTest,
"WebRTC-GenericDescriptor/Enabled/")); ::testing::Values("WebRTC-GenericDescriptor/Disabled/",
"WebRTC-GenericDescriptor/Enabled/"));
class DualStreamsTest : public ::testing::TestWithParam<int> {}; class DualStreamsTest : public ::testing::TestWithParam<int> {};
@ -1329,8 +1330,8 @@ TEST_P(DualStreamsTest, Conference_Restricted) {
fixture->RunWithAnalyzer(dual_streams); fixture->RunWithAnalyzer(dual_streams);
} }
INSTANTIATE_TEST_CASE_P(FullStackTest, INSTANTIATE_TEST_SUITE_P(FullStackTest,
DualStreamsTest, DualStreamsTest,
::testing::Values(0, 1)); ::testing::Values(0, 1));
} // namespace webrtc } // namespace webrtc

6
video/picture_id_tests.cc
View file

@ -240,9 +240,9 @@ class PictureIdTest : public test::CallTest,
std::unique_ptr<PictureIdObserver> observer_; std::unique_ptr<PictureIdObserver> observer_;
}; };
INSTANTIATE_TEST_CASE_P(TemporalLayers, INSTANTIATE_TEST_SUITE_P(TemporalLayers,
PictureIdTest, PictureIdTest,
::testing::ValuesIn(kNumTemporalLayers)); ::testing::ValuesIn(kNumTemporalLayers));
// Use a special stream factory to ensure that all simulcast streams are being // Use a special stream factory to ensure that all simulcast streams are being
// sent. // sent.

8
video/receive_statistics_proxy_unittest.cc
View file

@ -928,10 +928,10 @@ TEST_F(ReceiveStatisticsProxyTest, RtcpHistogramsAreUpdated) {
kNackPackets * 60 / metrics::kMinRunTimeInSeconds)); kNackPackets * 60 / metrics::kMinRunTimeInSeconds));
} }
INSTANTIATE_TEST_CASE_P(ContentTypes, INSTANTIATE_TEST_SUITE_P(ContentTypes,
ReceiveStatisticsProxyTest, ReceiveStatisticsProxyTest,
::testing::Values(VideoContentType::UNSPECIFIED, ::testing::Values(VideoContentType::UNSPECIFIED,
VideoContentType::SCREENSHARE)); VideoContentType::SCREENSHARE));
TEST_P(ReceiveStatisticsProxyTest, InterFrameDelaysAreReported) { TEST_P(ReceiveStatisticsProxyTest, InterFrameDelaysAreReported) {
const VideoContentType content_type = GetParam(); const VideoContentType content_type = GetParam();

2
video/rtp_video_stream_receiver_unittest.cc
View file

@ -284,7 +284,7 @@ class RtpVideoStreamReceiverTestH264
RtpVideoStreamReceiverTestH264() : RtpVideoStreamReceiverTest(GetParam()) {} RtpVideoStreamReceiverTestH264() : RtpVideoStreamReceiverTest(GetParam()) {}
}; };
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
SpsPpsIdrIsKeyframe, SpsPpsIdrIsKeyframe,
RtpVideoStreamReceiverTestH264, RtpVideoStreamReceiverTestH264,
::testing::Values("", "WebRTC-SpsPpsIdrIsH264Keyframe/Enabled/")); ::testing::Values("", "WebRTC-SpsPpsIdrIsH264Keyframe/Enabled/"));

4
video/video_send_stream_tests.cc
View file

@ -101,9 +101,9 @@ class VideoSendStreamTest : public test::CallTest,
test::ScopedFieldTrials field_trial_; test::ScopedFieldTrials field_trial_;
}; };
INSTANTIATE_TEST_CASE_P(Default, VideoSendStreamTest, ::testing::Values("")); INSTANTIATE_TEST_SUITE_P(Default, VideoSendStreamTest, ::testing::Values(""));
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
TaskQueueTrial, TaskQueueTrial,
VideoSendStreamTest, VideoSendStreamTest,
::testing::Values("WebRTC-TaskQueueCongestionControl/Enabled/")); ::testing::Values("WebRTC-TaskQueueCongestionControl/Enabled/"));