From d7b6165483e7c67831bf7c161168b80be21ec3be Mon Sep 17 00:00:00 2001 From: "lally@webrtc.org" Date: Tue, 24 Feb 2015 20:18:55 +0000 Subject: [PATCH] Made DTLS/SCTP equivalent to UDP/DTLS/SCTP when comparing session descs in tests. Cr-Commit-Position: refs/heads/master@{#8478} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8478 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/app/webrtc/webrtcsdp_unittest.cc | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/talk/app/webrtc/webrtcsdp_unittest.cc b/talk/app/webrtc/webrtcsdp_unittest.cc index ae5385bd06..a647148813 100644 --- a/talk/app/webrtc/webrtcsdp_unittest.cc +++ b/talk/app/webrtc/webrtcsdp_unittest.cc @@ -740,8 +740,19 @@ class WebRtcSdpTest : public testing::Test { EXPECT_EQ(c1.key_params, c2.key_params); EXPECT_EQ(c1.session_params, c2.session_params); } + // protocol - EXPECT_EQ(cd1->protocol(), cd2->protocol()); + // Use an equivalence class here, for old and new versions of the + // protocol description. + if (cd1->protocol() == cricket::kMediaProtocolDtlsSctp + || cd1->protocol() == cricket::kMediaProtocolUdpDtlsSctp) { + const bool cd2_is_also_udp_dtls_sctp = + cd2->protocol() == cricket::kMediaProtocolDtlsSctp + || cd2->protocol() == cricket::kMediaProtocolUdpDtlsSctp; + EXPECT_TRUE(cd2_is_also_udp_dtls_sctp); + } else { + EXPECT_EQ(cd1->protocol(), cd2->protocol()); + } // codecs EXPECT_EQ(cd1->codecs(), cd2->codecs());