zishuo/webrtc
1
0
Fork 0
mirror of https://github.com/pion/webrtc.git synced 2025-10-30 02:12:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve rtcp.TestUnmarshal to improve coverage

Browse Source 
* Test polymorphic RTCP packet parser
* Add tests for more Unmarshal methods
Relates to #119
This commit is contained in:
Woodrow Douglass
2018-11-28 11:07:04 -05:00
committed by Max Hawkins
parent de6e6a63bc
commit af1b2c9520
3 changed files with 81 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/rtcp/picture_loss_indication.go
View File

@@ -54,7 +54,7 @@ func (p *PictureLossIndication) Unmarshal(rawPacket []byte) error {
return err
}
if h.Type != TypePayloadSpecificFeedback || h.Count != 1 {
if h.Type != TypePayloadSpecificFeedback || h.Count != pliFMT {
return errWrongType
}

2
pkg/rtcp/rapid_resynchronization_request.go
View File

@@ -55,7 +55,7 @@ func (p *RapidResynchronizationRequest) Unmarshal(rawPacket []byte) error {
return err
}
if h.Type != TypeTransportSpecificFeedback || h.Count != 1 {
if h.Type != TypeTransportSpecificFeedback || h.Count != rrrFMT {
return errWrongType
}

94
pkg/rtcp/reader_test.go
View File

@@ -5,6 +5,8 @@ import (
"io"
"reflect"
"testing"
"github.com/stretchr/testify/assert"
)
// An RTCP packet from a packet dump
@@ -53,6 +55,20 @@ var realPacket = []byte{
0x81, 0xcb, 0x0, 0x1,
// source=0x902f9e2e
0x90, 0x2f, 0x9e, 0x2e,
// Picture Loss Indication (offset=92)
0x81, 0xce, 0x0, 0x2,
// sender=0x902f9e2e
0x90, 0x2f, 0x9e, 0x2e,
// media=0x902f9e2e
0x90, 0x2f, 0x9e, 0x2e,
// RapidResynchronizationRequest (offset=104)
0x85, 0xcd, 0x0, 0x2,
// sender=0x902f9e2e
0x90, 0x2f, 0x9e, 0x2e,
// media=0x902f9e2e
0x90, 0x2f, 0x9e, 0x2e,
}
func TestUnmarshal(t *testing.T) {
@@ -63,11 +79,13 @@ func TestUnmarshal(t *testing.T) {
if err != nil {
t.Fatalf("Read rr: %v", err)
}
var rr ReceiverReport
if err = rr.Unmarshal(packet); err != nil {
t.Errorf("Unmarshal rr: %v", err)
var pwh PacketWithHeader
if err = pwh.Unmarshal(packet); err != nil {
t.Errorf("Unmarshal pwh: %v", err)
}
wantRR := ReceiverReport{
assert.IsType(t, pwh.Packet, (*ReceiverReport)(nil), "Unmarshalled to incorrect type")
wantRR := &ReceiverReport{
SSRC: 0x902f9e2e,
Reports: []ReceptionReport{{
SSRC: 0xbc5e9a40,
@@ -79,7 +97,7 @@ func TestUnmarshal(t *testing.T) {
Delay: 150137,
}},
}
if got, want := wantRR, rr; !reflect.DeepEqual(got, want) {
if got, want := wantRR, pwh.Packet; !reflect.DeepEqual(got, want) {
t.Errorf("Unmarshal rr: got %#v, want %#v", got, want)
}
@@ -88,11 +106,13 @@ func TestUnmarshal(t *testing.T) {
if err != nil {
t.Fatalf("Read sdes: %v", err)
}
var sdes SourceDescription
if err = sdes.Unmarshal(packet); err != nil {
t.Errorf("Unmarshal: %v", err)
if err = pwh.Unmarshal(packet); err != nil {
t.Errorf("Unmarshal pwh: %v", err)
}
wantSdes := SourceDescription{
assert.IsType(t, pwh.Packet, (*SourceDescription)(nil), "Unmarshalled to incorrect type")
wantSdes := &SourceDescription{
Chunks: []SourceDescriptionChunk{
{
Source: 0x902f9e2e,
@@ -105,7 +125,8 @@ func TestUnmarshal(t *testing.T) {
},
},
}
if got, want := sdes, wantSdes; !reflect.DeepEqual(got, want) {
if got, want := pwh.Packet, wantSdes; !reflect.DeepEqual(got, want) {
t.Errorf("Unmarshal sdes: got %#v, want %#v", got, want)
}
@@ -114,16 +135,59 @@ func TestUnmarshal(t *testing.T) {
if err != nil {
t.Fatalf("Read bye: %v", err)
}
var bye Goodbye
if err := bye.Unmarshal(packet); err != nil {
t.Errorf("Unmarshal bye: %v", err)
if err = pwh.Unmarshal(packet); err != nil {
t.Errorf("Unmarshal pwh: %v", err)
}
wantBye := Goodbye{
assert.IsType(t, pwh.Packet, (*Goodbye)(nil), "Unmarshalled to incorrect type")
wantBye := &Goodbye{
Sources: []uint32{0x902f9e2e},
}
if got, want := bye, wantBye; !reflect.DeepEqual(got, want) {
if got, want := pwh.Packet, wantBye; !reflect.DeepEqual(got, want) {
t.Errorf("Unmarshal bye: got %#v, want %#v", got, want)
}
// PictureLossIndication
_, packet, err = r.ReadPacket()
if err != nil {
t.Fatalf("Read pli: %v", err)
}
if err = pwh.Unmarshal(packet); err != nil {
t.Errorf("Unmarshal pwh: %v", err)
}
assert.IsType(t, pwh.Packet, (*PictureLossIndication)(nil), "Unmarshalled to incorrect type")
wantPli := &PictureLossIndication{
SenderSSRC: 0x902f9e2e,
MediaSSRC: 0x902f9e2e,
}
if got, want := pwh.Packet, wantPli; !reflect.DeepEqual(got, want) {
t.Errorf("Unmarshal pli: got %#v, want %#v", got, want)
}
// RapidResynchronizationRequest
_, packet, err = r.ReadPacket()
if err != nil {
t.Fatalf("Read rrr: %v", err)
}
if err = pwh.Unmarshal(packet); err != nil {
t.Errorf("Unmarshal pwh: %v", err)
}
assert.IsType(t, pwh.Packet, (*RapidResynchronizationRequest)(nil), "Unmarshalled to incorrect type")
wantRrr := &RapidResynchronizationRequest{
SenderSSRC: 0x902f9e2e,
MediaSSRC: 0x902f9e2e,
}
if got, want := pwh.Packet, wantRrr; !reflect.DeepEqual(got, want) {
t.Errorf("Unmarshal rrr: got %#v, want %#v", got, want)
}
}
func TestReadEOF(t *testing.T) {