Skip to content

Commit

Permalink
Minor test re-organization
Browse files Browse the repository at this point in the history
Move ICETransport specific test to proper file, add a comment to
integration test explaining purpose
  • Loading branch information
Sean-Der committed Mar 29, 2019
1 parent 8ef5b70 commit 55ef8e1
Show file tree
Hide file tree
Showing 2 changed files with 81 additions and 70 deletions.
74 changes: 74 additions & 0 deletions icetransport_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
// +build !js

package webrtc

import (
"math/rand"
"sync/atomic"
"testing"
"time"

"github.com/pions/transport/test"
)

func TestICETransport_OnSelectedCandidatePairChange(t *testing.T) {
iceComplete := make(chan bool)

api := NewAPI()
lim := test.TimeOut(time.Second * 30)
defer lim.Stop()

api.mediaEngine.RegisterDefaultCodecs()
pcOffer, pcAnswer, err := api.newPair()
if err != nil {
t.Fatal(err)
}

opusTrack, err := pcOffer.NewTrack(DefaultPayloadTypeOpus, rand.Uint32(), "audio", "pion1")
if err != nil {
t.Fatal(err)
}
if _, err = pcOffer.AddTrack(opusTrack); err != nil {
t.Fatal(err)
}

pcAnswer.OnICEConnectionStateChange(func(iceState ICEConnectionState) {
if iceState == ICEConnectionStateConnected {
time.Sleep(3 * time.Second) // TODO PeerConnection.Close() doesn't block for all subsystems
close(iceComplete)
}
})

senderCalledCandidateChange := int32(0)
for _, sender := range pcOffer.GetSenders() {
dtlsTransport := sender.Transport()
if dtlsTransport == nil {
continue
}
if iceTransport := dtlsTransport.ICETransport(); iceTransport != nil {
iceTransport.OnSelectedCandidatePairChange(func(pair *ICECandidatePair) {
atomic.StoreInt32(&senderCalledCandidateChange, 1)
})
}
}

err = signalPair(pcOffer, pcAnswer)
if err != nil {
t.Fatal(err)
}
<-iceComplete

if atomic.LoadInt32(&senderCalledCandidateChange) == 0 {
t.Fatalf("Sender ICETransport OnSelectedCandidateChange was never called")
}

err = pcOffer.Close()
if err != nil {
t.Fatal(err)
}

err = pcAnswer.Close()
if err != nil {
t.Fatal(err)
}
}
77 changes: 7 additions & 70 deletions peerconnection_media_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"fmt"
"math/rand"
"sync"
"sync/atomic"
"testing"
"time"

Expand All @@ -16,6 +15,13 @@ import (
"github.com/pions/webrtc/pkg/media"
)

/*
Integration test for bi-directional peers
This asserts we can send RTP and RTCP both ways, and blocks until
each side gets something (and asserts payload contents)
*/

func TestPeerConnection_Media_Sample(t *testing.T) {
api := NewAPI()
lim := test.TimeOut(time.Second * 30)
Expand Down Expand Up @@ -260,72 +266,3 @@ func TestPeerConnection_Media_Shutdown(t *testing.T) {
}
onTrackFiredLock.Unlock()
}

func TestPeerConnection_Media_Sender_Transports_OnSelectedCandidatePairChange(t *testing.T) {
iceComplete := make(chan bool)

api := NewAPI()
lim := test.TimeOut(time.Second * 30)
defer lim.Stop()

api.mediaEngine.RegisterDefaultCodecs()
pcOffer, pcAnswer, err := api.newPair()
if err != nil {
t.Fatal(err)
}

opusTrack, err := pcOffer.NewTrack(DefaultPayloadTypeOpus, rand.Uint32(), "audio", "pion1")
if err != nil {
t.Fatal(err)
}
vp8Track, err := pcOffer.NewTrack(DefaultPayloadTypeVP8, rand.Uint32(), "video", "pion2")
if err != nil {
t.Fatal(err)
}

if _, err = pcOffer.AddTrack(opusTrack); err != nil {
t.Fatal(err)
} else if _, err = pcAnswer.AddTrack(vp8Track); err != nil {
t.Fatal(err)
}

pcAnswer.OnICEConnectionStateChange(func(iceState ICEConnectionState) {
if iceState == ICEConnectionStateConnected {
time.Sleep(3 * time.Second) // TODO PeerConnection.Close() doesn't block for all subsystems
close(iceComplete)
}
})

senderCalledCandidateChange := int32(0)
for _, sender := range pcOffer.GetSenders() {
dtlsTransport := sender.Transport()
if dtlsTransport == nil {
continue
}
if iceTransport := dtlsTransport.ICETransport(); iceTransport != nil {
iceTransport.OnSelectedCandidatePairChange(func(pair *ICECandidatePair) {
atomic.StoreInt32(&senderCalledCandidateChange, 1)
})
}
}

err = signalPair(pcOffer, pcAnswer)
if err != nil {
t.Fatal(err)
}
<-iceComplete

if atomic.LoadInt32(&senderCalledCandidateChange) == 0 {
t.Fatalf("Sender ICETransport OnSelectedCandidateChange was never called")
}

err = pcOffer.Close()
if err != nil {
t.Fatal(err)
}

err = pcAnswer.Close()
if err != nil {
t.Fatal(err)
}
}

0 comments on commit 55ef8e1

Please sign in to comment.