Merge pull request #1067 from ChristopheI/master

Fix several unit test (linked to capabilities / payload id)

Author: ChristopheI

test/integration/net/WebRTC/RTCPeerConnectionUnitTest.cs

@@ -654,9 +654,9 @@ public void CheckMediaFormatNegotiationUnitTest()
 
             logger.LogDebug($"Local answer: {answer}");
 
-            Assert.Equal(3, pc.AudioStream.LocalTrack.Capabilities.Count());
+            Assert.Equal(2, pc.AudioStream.LocalTrack.Capabilities.Count());
             Assert.Equal(0, pc.AudioStream.LocalTrack.Capabilities.Single(x => x.Name() == "PCMU").ID);
-            Assert.Equal(96, pc.VideoStream.LocalTrack.Capabilities.Single(x => x.Name() == "VP8").ID);
+            Assert.Equal(100, pc.VideoStream.LocalTrack.Capabilities.Single(x => x.Name() == "VP8").ID);
 
             pc.Close("normal");
         }
@@ -731,7 +731,7 @@ public void CheckNoAudioNegotiationUnitTest()
             logger.LogDebug($"Local answer: {answer}");
 
             Assert.Equal(MediaStreamStatusEnum.Inactive, pc.AudioStream.LocalTrack.StreamStatus);
-            Assert.Equal(96, pc.VideoStream.LocalTrack.Capabilities.Single(x => x.Name() == "VP8").ID);
+            Assert.Equal(100, pc.VideoStream.LocalTrack.Capabilities.Single(x => x.Name() == "VP8").ID);
 
             pc.Close("normal");
         }
@@ -909,7 +909,7 @@ public void CheckAnswerForGStreamerOfferUnitTest()
             logger.LogDebug($"Local answer: {answer}");
 
             Assert.NotNull(pc.VideoStream.LocalTrack);
-            Assert.Equal(100, pc.VideoStream.LocalTrack.Capabilities.Single(x => x.Name() == "H264").ID);
+            Assert.Equal(96, pc.VideoStream.LocalTrack.Capabilities.Single(x => x.Name() == "H264").ID);
             Assert.Equal(IceRolesEnum.active, pc.IceRole);
 
             pc.Close("normal");

test/unit/net/RTP/RTPSessionUnitTest.cs

@@ -410,13 +410,15 @@ public void MediaOrderMatchesRemoteOfferUnitTest()
 
             // Create a local session and add the video track first.
             RTPSession rtpSession = new RTPSession(false, false, false);
+
+            MediaStreamTrack localVideoTrack = new MediaStreamTrack(SDPMediaTypesEnum.video, false, new List<SDPAudioVideoMediaFormat> { new SDPAudioVideoMediaFormat(SDPMediaTypesEnum.video, 96, "VP8", 90000) });
+            rtpSession.addTrack(localVideoTrack);
+
             MediaStreamTrack localAudioTrack = new MediaStreamTrack(SDPMediaTypesEnum.audio, false, new List<SDPAudioVideoMediaFormat> { 
                 new SDPAudioVideoMediaFormat(SDPWellKnownMediaFormatsEnum.PCMU),
                 new SDPAudioVideoMediaFormat(SDPMediaTypesEnum.audio, 110, "OPUS/48000/2")
             });
             rtpSession.addTrack(localAudioTrack);
-            MediaStreamTrack localVideoTrack = new MediaStreamTrack(SDPMediaTypesEnum.video, false, new List<SDPAudioVideoMediaFormat> { new SDPAudioVideoMediaFormat(SDPMediaTypesEnum.video, 96, "VP8", 90000) });
-            rtpSession.addTrack(localVideoTrack);
 
             var offer = SDP.ParseSDPDescription(remoteSdp);
 
@@ -432,8 +434,9 @@ public void MediaOrderMatchesRemoteOfferUnitTest()
 
             logger.LogDebug($"Local answer: {answer}");
 
-            Assert.Equal(110, rtpSession.AudioStream.LocalTrack.Capabilities.Single(x => x.Name() == "OPUS").ID);
-            Assert.Equal(96, rtpSession.VideoStream.LocalTrack.Capabilities.Single(x => x.Name() == "VP8").ID);
+            // Since we set Remote Description FIRST, we expect to have values defined by the remote
+            Assert.Equal(111, rtpSession.AudioStream.LocalTrack.Capabilities.Single(x => x.Name() == "OPUS").ID);
+            Assert.Equal(100, rtpSession.VideoStream.LocalTrack.Capabilities.Single(x => x.Name() == "VP8").ID);
 
             //Assert.True(SDPAudioVideoMediaFormat.AreMatch(offer.Media.Single(x => x.Media == SDPMediaTypesEnum.audio)., answer.Media.First().Media));
             //Assert.Equal(offer.Media.Last().Media, answer.Media.Last().Media);
@@ -552,16 +555,14 @@ public void ModifiedWellKnownFormatIDUnitTest()
                 SDPWellKnownMediaFormatsEnum.G722);
             rtpSession.addTrack(localAudioTrack);
 
-            var offer = SDP.ParseSDPDescription(remoteSdp);
+            Assert.Equal(8, rtpSession.AudioStream.LocalTrack.Capabilities.Single(x => x.Name() == "PCMA").ID);
 
+            var offer = SDP.ParseSDPDescription(remoteSdp);
             logger.LogDebug($"Remote offer: {offer}");
-
             var result = rtpSession.SetRemoteDescription(SIP.App.SdpType.offer, offer);
 
             logger.LogDebug($"Set remote description on local session result {result}.");
-
             Assert.Equal(SetDescriptionResultEnum.OK, result);
-            Assert.Equal(8, rtpSession.AudioStream.LocalTrack.Capabilities.Single(x => x.Name() == "PCMA").ID);
             Assert.Equal("PCMA", rtpSession.AudioStream.GetSendingFormat().Name());
 
             var answer = rtpSession.CreateAnswer(null);