From c1c4e8aea028626ae4e3d9170f8f0a0247b18736 Mon Sep 17 00:00:00 2001
From: Raja Subramanian <raja.gobi@tutanota.com>
Date: Thu, 27 Apr 2023 14:39:05 +0530
Subject: [PATCH] Include packetsMissing field in string representation (#1659)

* Include packetsMissing field in string representation

* do not set stub directly
---
 pkg/rtc/helper_test.go               | 12 ++++++------
 pkg/rtc/participant_internal_test.go |  8 ++++----
 pkg/rtc/subscriptionmanager_test.go  | 12 ++++++------
 pkg/sfu/connectionquality/scorer.go  |  3 ++-
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/pkg/rtc/helper_test.go b/pkg/rtc/helper_test.go
index dc97f13a0..c26e7aebc 100644
--- a/pkg/rtc/helper_test.go
+++ b/pkg/rtc/helper_test.go
@@ -31,7 +31,7 @@ func newMockParticipant(identity livekit.ParticipantIdentity, protocol types.Pro
 		IsPublisher: publisher,
 	})
 
-	p.SetMetadataStub = func(m string) {
+	p.SetMetadataCalls(func(m string) {
 		var f func(participant types.LocalParticipant)
 		if p.OnParticipantUpdateCallCount() > 0 {
 			f = p.OnParticipantUpdateArgsForCall(p.OnParticipantUpdateCallCount() - 1)
@@ -39,7 +39,7 @@ func newMockParticipant(identity livekit.ParticipantIdentity, protocol types.Pro
 		if f != nil {
 			f(p)
 		}
-	}
+	})
 	updateTrack := func() {
 		var f func(participant types.LocalParticipant, track types.MediaTrack)
 		if p.OnTrackUpdatedCallCount() > 0 {
@@ -50,12 +50,12 @@ func newMockParticipant(identity livekit.ParticipantIdentity, protocol types.Pro
 		}
 	}
 
-	p.SetTrackMutedStub = func(sid livekit.TrackID, muted bool, fromServer bool) {
+	p.SetTrackMutedCalls(func(sid livekit.TrackID, muted bool, fromServer bool) {
 		updateTrack()
-	}
-	p.AddTrackStub = func(req *livekit.AddTrackRequest) {
+	})
+	p.AddTrackCalls(func(req *livekit.AddTrackRequest) {
 		updateTrack()
-	}
+	})
 
 	return p
 }
diff --git a/pkg/rtc/participant_internal_test.go b/pkg/rtc/participant_internal_test.go
index 74e0b38e0..1b2dadefb 100644
--- a/pkg/rtc/participant_internal_test.go
+++ b/pkg/rtc/participant_internal_test.go
@@ -422,7 +422,7 @@ func TestDisableCodecs(t *testing.T) {
 	participant.SetResponseSink(sink)
 	var answer webrtc.SessionDescription
 	var answerReceived atomic.Bool
-	sink.WriteMessageStub = func(msg proto.Message) error {
+	sink.WriteMessageCalls(func(msg proto.Message) error {
 		if res, ok := msg.(*livekit.SignalResponse); ok {
 			if res.GetAnswer() != nil {
 				answer = FromProtoSessionDescription(res.GetAnswer())
@@ -430,7 +430,7 @@ func TestDisableCodecs(t *testing.T) {
 			}
 		}
 		return nil
-	}
+	})
 	participant.HandleOffer(sdp)
 
 	testutils.WithTimeout(t, func() string {
@@ -579,7 +579,7 @@ func TestPreferAudioCodecForRed(t *testing.T) {
 			participant.SetResponseSink(sink)
 			var answer webrtc.SessionDescription
 			var answerReceived atomic.Bool
-			sink.WriteMessageStub = func(msg proto.Message) error {
+			sink.WriteMessageCalls(func(msg proto.Message) error {
 				if res, ok := msg.(*livekit.SignalResponse); ok {
 					if res.GetAnswer() != nil {
 						answer = FromProtoSessionDescription(res.GetAnswer())
@@ -588,7 +588,7 @@ func TestPreferAudioCodecForRed(t *testing.T) {
 					}
 				}
 				return nil
-			}
+			})
 			participant.HandleOffer(sdp)
 
 			require.Eventually(t, func() bool { return answerReceived.Load() }, 5*time.Second, 10*time.Millisecond)
diff --git a/pkg/rtc/subscriptionmanager_test.go b/pkg/rtc/subscriptionmanager_test.go
index 0c3de6955..2bd005f45 100644
--- a/pkg/rtc/subscriptionmanager_test.go
+++ b/pkg/rtc/subscriptionmanager_test.go
@@ -214,9 +214,9 @@ func TestUnsubscribe(t *testing.T) {
 	st.OnClose(func(willBeResumed bool) {
 		sm.handleSubscribedTrackClose(s, willBeResumed)
 	})
-	res.Track.(*typesfakes.FakeMediaTrack).RemoveSubscriberStub = func(pID livekit.ParticipantID, willBeResumed bool) {
+	res.Track.(*typesfakes.FakeMediaTrack).RemoveSubscriberCalls(func(pID livekit.ParticipantID, willBeResumed bool) {
 		setTestSubscribedTrackClosed(t, st, willBeResumed)
-	}
+	})
 
 	sm.lock.Lock()
 	sm.subscriptions["track"] = s
@@ -280,12 +280,12 @@ func TestSubscribeStatusChanged(t *testing.T) {
 	st2.OnClose(func(willBeResumed bool) {
 		sm.handleSubscribedTrackClose(s2, willBeResumed)
 	})
-	st1.MediaTrack().(*typesfakes.FakeMediaTrack).RemoveSubscriberStub = func(pID livekit.ParticipantID, willBeResumed bool) {
+	st1.MediaTrack().(*typesfakes.FakeMediaTrack).RemoveSubscriberCalls(func(pID livekit.ParticipantID, willBeResumed bool) {
 		setTestSubscribedTrackClosed(t, st1, willBeResumed)
-	}
-	st2.MediaTrack().(*typesfakes.FakeMediaTrack).RemoveSubscriberStub = func(pID livekit.ParticipantID, willBeResumed bool) {
+	})
+	st2.MediaTrack().(*typesfakes.FakeMediaTrack).RemoveSubscriberCalls(func(pID livekit.ParticipantID, willBeResumed bool) {
 		setTestSubscribedTrackClosed(t, st2, willBeResumed)
-	}
+	})
 
 	require.Equal(t, int32(1), numParticipantSubscribed.Load())
 	require.Equal(t, int32(0), numParticipantUnsubscribed.Load())
diff --git a/pkg/sfu/connectionquality/scorer.go b/pkg/sfu/connectionquality/scorer.go
index 4de60b05f..d4c98c316 100644
--- a/pkg/sfu/connectionquality/scorer.go
+++ b/pkg/sfu/connectionquality/scorer.go
@@ -101,11 +101,12 @@ func (w *windowStat) calculateBitrateScore(expectedBitrate int64) float64 {
 }
 
 func (w *windowStat) String() string {
-	return fmt.Sprintf("start: %+v, dur: %+v, pe: %d, pl: %d, b: %d, rtt: %d, jitter: %0.2f",
+	return fmt.Sprintf("start: %+v, dur: %+v, pe: %d, pl: %d, pm: %d, b: %d, rtt: %d, jitter: %0.2f",
 		w.startedAt,
 		w.duration,
 		w.packetsExpected,
 		w.packetsLost,
+		w.packetsMissing,
 		w.bytes,
 		w.rttMax,
 		w.jitterMax,