generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove test parameters from CallTest.

Browse Source 
Since the test parameters weren't used, it made no sense to have a
parameterized test.

BUG=
R=stefan@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/2316004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4862 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org 2013-09-27 10:54:10 +00:00
parent 3223a3d4ee
commit 2e246b4e78
1 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
webrtc/video_engine/test/call_tests.cc
View File

@ -28,14 +28,7 @@
namespace webrtc {
struct CallTestParams {
size_t width, height;
struct {
unsigned int min, start, max;
} bitrate;
};
class CallTest : public ::testing::TestWithParam<CallTestParams> {
class CallTest : public ::testing::Test {
public:
CallTest()
: send_stream_(NULL),
@ -133,16 +126,6 @@ class CallTest : public ::testing::TestWithParam<CallTestParams> {
std::map<uint32_t, bool> reserved_ssrcs_;
};
// TODO(pbos): What are sane values here for bitrate? Are we missing any
// important resolutions?
CallTestParams video_1080p = {1920, 1080, {300, 600, 800}};
CallTestParams video_720p = {1280, 720, {300, 600, 800}};
CallTestParams video_vga = {640, 480, {300, 600, 800}};
CallTestParams video_qvga = {320, 240, {300, 600, 800}};
CallTestParams video_4cif = {704, 576, {300, 600, 800}};
CallTestParams video_cif = {352, 288, {300, 600, 800}};
CallTestParams video_qcif = {176, 144, {300, 600, 800}};
class NackObserver : public test::RtpRtcpObserver {
static const int kNumberOfNacksToObserve = 4;
static const int kInverseProbabilityToStartLossBurst = 20;
@ -245,7 +228,7 @@ class NackObserver : public test::RtpRtcpObserver {
static const int kRequiredRtcpsWithoutNack = 2;
};
TEST_P(CallTest, ReceivesAndRetransmitsNack) {
TEST_F(CallTest, ReceivesAndRetransmitsNack) {
NackObserver observer;
CreateCalls(observer.SendTransport(), observer.ReceiveTransport());
@ -375,16 +358,16 @@ void CallTest::ReceivesPliAndRecovers(int rtp_history_ms) {
DestroyStreams();
}
TEST_P(CallTest, ReceivesPliAndRecoversWithNack) {
TEST_F(CallTest, ReceivesPliAndRecoversWithNack) {
ReceivesPliAndRecovers(1000);
}
// TODO(pbos): Enable this when 2250 is resolved.
TEST_P(CallTest, DISABLED_ReceivesPliAndRecoversWithoutNack) {
TEST_F(CallTest, DISABLED_ReceivesPliAndRecoversWithoutNack) {
ReceivesPliAndRecovers(0);
}
TEST_P(CallTest, SurvivesIncomingRtpPacketsToDestroyedReceiveStream) {
TEST_F(CallTest, SurvivesIncomingRtpPacketsToDestroyedReceiveStream) {
class PacketInputObserver : public PacketReceiver {
public:
explicit PacketInputObserver(PacketReceiver* receiver)
@ -435,6 +418,4 @@ TEST_P(CallTest, SurvivesIncomingRtpPacketsToDestroyedReceiveStream) {
send_transport.StopSending();
receive_transport.StopSending();
}
INSTANTIATE_TEST_CASE_P(CallTest, CallTest, ::testing::Values(video_vga));
} // namespace webrtc