Index: webrtc/modules/rtp_rtcp/source/rtp_header_extension_unittest.cc |
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_header_extension_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtp_header_extension_unittest.cc |
index 9ced70da20f395d53568d3f9b4845455ab8d686a..50a913efbc10b447a49e58dfed557692ab5a8287 100644 |
--- a/webrtc/modules/rtp_rtcp/source/rtp_header_extension_unittest.cc |
+++ b/webrtc/modules/rtp_rtcp/source/rtp_header_extension_unittest.cc |
@@ -33,12 +33,6 @@ TEST_F(RtpHeaderExtensionTest, Register) { |
EXPECT_EQ(1, map_.Size()); |
EXPECT_EQ(0, map_.Deregister(kRtpExtensionTransmissionTimeOffset)); |
EXPECT_EQ(0, map_.Size()); |
- |
- EXPECT_EQ(0, map_.RegisterInactive(kRtpExtensionTransmissionTimeOffset, kId)); |
- EXPECT_EQ(0, map_.Size()); |
- EXPECT_TRUE(map_.IsRegistered(kRtpExtensionTransmissionTimeOffset)); |
- EXPECT_TRUE(map_.SetActive(kRtpExtensionTransmissionTimeOffset, true)); |
- EXPECT_EQ(1, map_.Size()); |
} |
TEST_F(RtpHeaderExtensionTest, RegisterIllegalArg) { |
@@ -57,32 +51,15 @@ TEST_F(RtpHeaderExtensionTest, Idempotent) { |
TEST_F(RtpHeaderExtensionTest, NonUniqueId) { |
EXPECT_EQ(0, map_.Register(kRtpExtensionTransmissionTimeOffset, kId)); |
EXPECT_EQ(-1, map_.Register(kRtpExtensionAudioLevel, kId)); |
- EXPECT_EQ(-1, map_.RegisterInactive(kRtpExtensionAudioLevel, kId)); |
} |
TEST_F(RtpHeaderExtensionTest, GetTotalLength) { |
EXPECT_EQ(0u, map_.GetTotalLengthInBytes()); |
- EXPECT_EQ(0, map_.RegisterInactive(kRtpExtensionTransmissionTimeOffset, kId)); |
- EXPECT_EQ(0u, map_.GetTotalLengthInBytes()); |
- |
EXPECT_EQ(0, map_.Register(kRtpExtensionTransmissionTimeOffset, kId)); |
EXPECT_EQ(kRtpOneByteHeaderLength + kTransmissionTimeOffsetLength, |
map_.GetTotalLengthInBytes()); |
} |
-TEST_F(RtpHeaderExtensionTest, GetLengthUntilBlockStart) { |
- EXPECT_EQ(-1, map_.GetLengthUntilBlockStartInBytes( |
- kRtpExtensionTransmissionTimeOffset)); |
- EXPECT_EQ(0, map_.RegisterInactive(kRtpExtensionTransmissionTimeOffset, kId)); |
- EXPECT_EQ(-1, map_.GetLengthUntilBlockStartInBytes( |
- kRtpExtensionTransmissionTimeOffset)); |
- |
- EXPECT_TRUE(map_.SetActive(kRtpExtensionTransmissionTimeOffset, true)); |
- EXPECT_EQ(static_cast<int>(kRtpOneByteHeaderLength), |
- map_.GetLengthUntilBlockStartInBytes( |
- kRtpExtensionTransmissionTimeOffset)); |
-} |
- |
TEST_F(RtpHeaderExtensionTest, GetType) { |
RTPExtensionType typeOut; |
EXPECT_EQ(-1, map_.GetType(kId, &typeOut)); |
@@ -101,27 +78,13 @@ TEST_F(RtpHeaderExtensionTest, GetId) { |
EXPECT_EQ(kId, idOut); |
} |
-TEST_F(RtpHeaderExtensionTest, IterateTypes) { |
- EXPECT_EQ(kRtpExtensionNone, map_.First()); |
- EXPECT_EQ(kRtpExtensionNone, map_.Next(kRtpExtensionTransmissionTimeOffset)); |
- |
- EXPECT_EQ(0, map_.RegisterInactive(kRtpExtensionTransmissionTimeOffset, kId)); |
- |
- EXPECT_EQ(kRtpExtensionNone, map_.First()); |
- |
- EXPECT_TRUE(map_.SetActive(kRtpExtensionTransmissionTimeOffset, true)); |
- |
- EXPECT_EQ(kRtpExtensionTransmissionTimeOffset, map_.First()); |
- EXPECT_EQ(kRtpExtensionNone, map_.Next(kRtpExtensionTransmissionTimeOffset)); |
-} |
- |
TEST_F(RtpHeaderExtensionTest, GetCopy) { |
EXPECT_EQ(0, map_.Register(kRtpExtensionTransmissionTimeOffset, kId)); |
RtpHeaderExtensionMap mapOut; |
map_.GetCopy(&mapOut); |
EXPECT_EQ(1, mapOut.Size()); |
- EXPECT_EQ(kRtpExtensionTransmissionTimeOffset, mapOut.First()); |
+ EXPECT_EQ(kId, mapOut.GetId(kRtpExtensionTransmissionTimeOffset)); |
} |
TEST_F(RtpHeaderExtensionTest, Erase) { |