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

Remove unnecessary test fixture in codec_unittest.cc

Browse Source 
BUG=None

Review-Url: https://codereview.webrtc.org/2462053002
Cr-Commit-Position: refs/heads/master@{#14857}
This commit is contained in:
magjed
2016-10-31 09:06:03 -07:00
committed by Commit bot
parent 6b6c88f184
commit 9c41e47b12
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
webrtc/media/base/codec_unittest.cc
View File

@ -20,12 +20,7 @@ using cricket::kCodecParamAssociatedPayloadType;
using cricket::kCodecParamMaxBitrate; using cricket::kCodecParamMaxBitrate;
using cricket::kCodecParamMinBitrate; using cricket::kCodecParamMinBitrate;
class CodecTest : public testing::Test { TEST(CodecTest, TestCodecOperators) {
public:
CodecTest() {}
};
TEST_F(CodecTest, TestCodecOperators) {
Codec c0(96, "D", 1000); Codec c0(96, "D", 1000);
c0.SetParam("a", 1); c0.SetParam("a", 1);
@ -58,7 +53,7 @@ TEST_F(CodecTest, TestCodecOperators) {
EXPECT_TRUE(c5 == c6); EXPECT_TRUE(c5 == c6);
} }
TEST_F(CodecTest, TestAudioCodecOperators) { TEST(CodecTest, TestAudioCodecOperators) {
AudioCodec c0(96, "A", 44100, 20000, 2); AudioCodec c0(96, "A", 44100, 20000, 2);
AudioCodec c1(95, "A", 44100, 20000, 2); AudioCodec c1(95, "A", 44100, 20000, 2);
AudioCodec c2(96, "x", 44100, 20000, 2); AudioCodec c2(96, "x", 44100, 20000, 2);
@ -95,7 +90,7 @@ TEST_F(CodecTest, TestAudioCodecOperators) {
EXPECT_TRUE(c13 == c10); EXPECT_TRUE(c13 == c10);
} }
TEST_F(CodecTest, TestAudioCodecMatches) { TEST(CodecTest, TestAudioCodecMatches) {
// Test a codec with a static payload type. // Test a codec with a static payload type.
AudioCodec c0(95, "A", 44100, 20000, 1); AudioCodec c0(95, "A", 44100, 20000, 1);
EXPECT_TRUE(c0.Matches(AudioCodec(95, "", 44100, 20000, 1))); EXPECT_TRUE(c0.Matches(AudioCodec(95, "", 44100, 20000, 1)));
@ -135,7 +130,7 @@ TEST_F(CodecTest, TestAudioCodecMatches) {
EXPECT_FALSE(c3.Matches(AudioCodec(96, "A", 44100, 20000, 0))); EXPECT_FALSE(c3.Matches(AudioCodec(96, "A", 44100, 20000, 0)));
} }
TEST_F(CodecTest, TestVideoCodecOperators) { TEST(CodecTest, TestVideoCodecOperators) {
VideoCodec c0(96, "V"); VideoCodec c0(96, "V");
VideoCodec c1(95, "V"); VideoCodec c1(95, "V");
VideoCodec c2(96, "x"); VideoCodec c2(96, "x");
@ -167,7 +162,7 @@ TEST_F(CodecTest, TestVideoCodecOperators) {
EXPECT_TRUE(c13 == c10); EXPECT_TRUE(c13 == c10);
} }
TEST_F(CodecTest, TestVideoCodecMatches) { TEST(CodecTest, TestVideoCodecMatches) {
// Test a codec with a static payload type. // Test a codec with a static payload type.
VideoCodec c0(95, "V"); VideoCodec c0(95, "V");
EXPECT_TRUE(c0.Matches(VideoCodec(95, ""))); EXPECT_TRUE(c0.Matches(VideoCodec(95, "")));
@ -183,7 +178,7 @@ TEST_F(CodecTest, TestVideoCodecMatches) {
EXPECT_FALSE(c1.Matches(VideoCodec(95, "V"))); EXPECT_FALSE(c1.Matches(VideoCodec(95, "V")));
} }
TEST_F(CodecTest, TestDataCodecMatches) { TEST(CodecTest, TestDataCodecMatches) {
// Test a codec with a static payload type. // Test a codec with a static payload type.
DataCodec c0(95, "D"); DataCodec c0(95, "D");
EXPECT_TRUE(c0.Matches(DataCodec(95, ""))); EXPECT_TRUE(c0.Matches(DataCodec(95, "")));
@ -199,7 +194,7 @@ TEST_F(CodecTest, TestDataCodecMatches) {
EXPECT_FALSE(c1.Matches(DataCodec(95, "D"))); EXPECT_FALSE(c1.Matches(DataCodec(95, "D")));
} }
TEST_F(CodecTest, TestSetParamGetParamAndRemoveParam) { TEST(CodecTest, TestSetParamGetParamAndRemoveParam) {
AudioCodec codec; AudioCodec codec;
codec.SetParam("a", "1"); codec.SetParam("a", "1");
codec.SetParam("b", "x"); codec.SetParam("b", "x");
@ -220,7 +215,7 @@ TEST_F(CodecTest, TestSetParamGetParamAndRemoveParam) {
EXPECT_FALSE(codec.RemoveParam("c")); EXPECT_FALSE(codec.RemoveParam("c"));
} }
TEST_F(CodecTest, TestIntersectFeedbackParams) { TEST(CodecTest, TestIntersectFeedbackParams) {
const FeedbackParam a1("a", "1"); const FeedbackParam a1("a", "1");
const FeedbackParam b2("b", "2"); const FeedbackParam b2("b", "2");
const FeedbackParam b3("b", "3"); const FeedbackParam b3("b", "3");
@ -239,7 +234,7 @@ TEST_F(CodecTest, TestIntersectFeedbackParams) {
EXPECT_FALSE(c1.HasFeedbackParam(c3)); EXPECT_FALSE(c1.HasFeedbackParam(c3));
} }
TEST_F(CodecTest, TestGetCodecType) { TEST(CodecTest, TestGetCodecType) {
// Codec type comparison should be case insenstive on names. // Codec type comparison should be case insenstive on names.
const VideoCodec codec(96, "V"); const VideoCodec codec(96, "V");
const VideoCodec rtx_codec(96, "rTx"); const VideoCodec rtx_codec(96, "rTx");
@ -251,7 +246,7 @@ TEST_F(CodecTest, TestGetCodecType) {
EXPECT_EQ(VideoCodec::CODEC_RED, red_codec.GetCodecType()); EXPECT_EQ(VideoCodec::CODEC_RED, red_codec.GetCodecType());
} }
TEST_F(CodecTest, TestCreateRtxCodec) { TEST(CodecTest, TestCreateRtxCodec) {
VideoCodec rtx_codec = VideoCodec::CreateRtxCodec(96, 120); VideoCodec rtx_codec = VideoCodec::CreateRtxCodec(96, 120);
EXPECT_EQ(96, rtx_codec.id); EXPECT_EQ(96, rtx_codec.id);
EXPECT_EQ(VideoCodec::CODEC_RTX, rtx_codec.GetCodecType()); EXPECT_EQ(VideoCodec::CODEC_RTX, rtx_codec.GetCodecType());
@ -261,7 +256,7 @@ TEST_F(CodecTest, TestCreateRtxCodec) {
EXPECT_EQ(120, associated_payload_type); EXPECT_EQ(120, associated_payload_type);
} }
TEST_F(CodecTest, TestValidateCodecFormat) { TEST(CodecTest, TestValidateCodecFormat) {
const VideoCodec codec(96, "V"); const VideoCodec codec(96, "V");
ASSERT_TRUE(codec.ValidateCodecFormat()); ASSERT_TRUE(codec.ValidateCodecFormat());
@ -302,7 +297,7 @@ TEST_F(CodecTest, TestValidateCodecFormat) {
EXPECT_TRUE(different_bitrates.ValidateCodecFormat()); EXPECT_TRUE(different_bitrates.ValidateCodecFormat());
} }
TEST_F(CodecTest, TestToCodecParameters) { TEST(CodecTest, TestToCodecParameters) {
const VideoCodec v(96, "V"); const VideoCodec v(96, "V");
webrtc::RtpCodecParameters codec_params_1 = v.ToCodecParameters(); webrtc::RtpCodecParameters codec_params_1 = v.ToCodecParameters();
EXPECT_EQ(96, codec_params_1.payload_type); EXPECT_EQ(96, codec_params_1.payload_type);