Skip to content

Commit 852e38d

Browse files
mahibimahibi
committed
fix LocalStateBroadcasterMcuTest (1 failing test for now)
Signed-off-by: Marcel Hibbe <[email protected]>
1 parent b08015a commit 852e38d

File tree

1 file changed

+80
-15
lines changed

1 file changed

+80
-15
lines changed

‎app/src/test/java/com/nextcloud/talk/call/LocalStateBroadcasterMcuTest.kt‎

Lines changed: 80 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*/
77
package com.nextcloud.talk.call
88

9+
import com.nextcloud.talk.activities.ParticipantUiState
910
import com.nextcloud.talk.models.json.signaling.DataChannelMessage
1011
import com.nextcloud.talk.models.json.signaling.NCMessagePayload
1112
import com.nextcloud.talk.models.json.signaling.NCSignalingMessage
@@ -92,9 +93,18 @@ class LocalStateBroadcasterMcuTest {
9293
mockedMessageSender
9394
)
9495

95-
val callParticipantModel = MutableCallParticipantModel("theSessionId")
96+
val participantUiState = ParticipantUiState(
97+
sessionKey = "theSessionId",
98+
nick = "Guest",
99+
isConnected = false,
100+
isAudioEnabled = false,
101+
isStreamEnabled = false,
102+
isScreenStreamEnabled = false,
103+
raisedHand = false,
104+
isInternal = false
105+
)
96106

97-
localStateBroadcasterMcu!!.handleCallParticipantAdded(callParticipantModel)
107+
localStateBroadcasterMcu!!.handleCallParticipantAdded(participantUiState)
98108

99109
// Sending will be done in another thread, so just adding the participant does not send anything until that
100110
// other thread could run.
@@ -185,9 +195,18 @@ class LocalStateBroadcasterMcuTest {
185195
mockedMessageSender
186196
)
187197

188-
val callParticipantModel = MutableCallParticipantModel("theSessionId")
198+
val participantUiState = ParticipantUiState(
199+
sessionKey = "theSessionId",
200+
nick = "Guest",
201+
isConnected = false,
202+
isAudioEnabled = false,
203+
isStreamEnabled = false,
204+
isScreenStreamEnabled = false,
205+
raisedHand = false,
206+
isInternal = false
207+
)
189208

190-
localStateBroadcasterMcu!!.handleCallParticipantAdded(callParticipantModel)
209+
localStateBroadcasterMcu!!.handleCallParticipantAdded(participantUiState)
191210

192211
// Sending will be done in another thread, so just adding the participant does not send anything until that
193212
// other thread could run.
@@ -296,9 +315,18 @@ class LocalStateBroadcasterMcuTest {
296315
mockedMessageSender
297316
)
298317

299-
val callParticipantModel = MutableCallParticipantModel("theSessionId")
318+
val participantUiState = ParticipantUiState(
319+
sessionKey = "theSessionId",
320+
nick = "Guest",
321+
isConnected = false,
322+
isAudioEnabled = false,
323+
isStreamEnabled = false,
324+
isScreenStreamEnabled = false,
325+
raisedHand = false,
326+
isInternal = false
327+
)
300328

301-
localStateBroadcasterMcu!!.handleCallParticipantAdded(callParticipantModel)
329+
localStateBroadcasterMcu!!.handleCallParticipantAdded(participantUiState)
302330

303331
// Sending will be done in another thread, so just adding the participant does not send anything until that
304332
// other thread could run.
@@ -355,9 +383,18 @@ class LocalStateBroadcasterMcuTest {
355383
Mockito.verify(mockedMessageSender!!, times(signalingMessageCount1)).send(expectedUnmuteVideo, "theSessionId")
356384
Mockito.verifyNoMoreInteractions(mockedMessageSender)
357385

358-
val callParticipantModel2 = MutableCallParticipantModel("theSessionId2")
386+
val participantUiState2 = ParticipantUiState(
387+
sessionKey = "theSessionId",
388+
nick = "Guest",
389+
isConnected = false,
390+
isAudioEnabled = false,
391+
isStreamEnabled = false,
392+
isScreenStreamEnabled = false,
393+
raisedHand = false,
394+
isInternal = false
395+
)
359396

360-
localStateBroadcasterMcu!!.handleCallParticipantAdded(callParticipantModel2)
397+
localStateBroadcasterMcu!!.handleCallParticipantAdded(participantUiState2)
361398

362399
testScheduler.advanceTimeBy(0, TimeUnit.SECONDS)
363400

@@ -483,9 +520,18 @@ class LocalStateBroadcasterMcuTest {
483520
mockedMessageSender
484521
)
485522

486-
val callParticipantModel = MutableCallParticipantModel("theSessionId")
523+
val participantUiState = ParticipantUiState(
524+
sessionKey = "theSessionId",
525+
nick = "Guest",
526+
isConnected = false,
527+
isAudioEnabled = false,
528+
isStreamEnabled = false,
529+
isScreenStreamEnabled = false,
530+
raisedHand = false,
531+
isInternal = false
532+
)
487533

488-
localStateBroadcasterMcu!!.handleCallParticipantAdded(callParticipantModel)
534+
localStateBroadcasterMcu!!.handleCallParticipantAdded(participantUiState)
489535

490536
// Sending will be done in another thread, so just adding the participant does not send anything until that
491537
// other thread could run.
@@ -542,7 +588,7 @@ class LocalStateBroadcasterMcuTest {
542588
Mockito.verify(mockedMessageSender!!, times(signalingMessageCount)).send(expectedUnmuteVideo, "theSessionId")
543589
Mockito.verifyNoMoreInteractions(mockedMessageSender)
544590

545-
localStateBroadcasterMcu!!.handleCallParticipantRemoved(callParticipantModel)
591+
localStateBroadcasterMcu!!.handleCallParticipantRemoved(participantUiState.sessionKey)
546592

547593
testScheduler.advanceTimeBy(8, TimeUnit.SECONDS)
548594

@@ -579,11 +625,30 @@ class LocalStateBroadcasterMcuTest {
579625
mockedMessageSender
580626
)
581627

582-
val callParticipantModel = MutableCallParticipantModel("theSessionId")
583-
val callParticipantModel2 = MutableCallParticipantModel("theSessionId2")
628+
val participantUiState = ParticipantUiState(
629+
sessionKey = "theSessionId",
630+
nick = "Guest",
631+
isConnected = false,
632+
isAudioEnabled = false,
633+
isStreamEnabled = false,
634+
isScreenStreamEnabled = false,
635+
raisedHand = false,
636+
isInternal = false
637+
)
638+
639+
val participantUiState2 = ParticipantUiState(
640+
sessionKey = "theSessionId2",
641+
nick = "Guest",
642+
isConnected = false,
643+
isAudioEnabled = false,
644+
isStreamEnabled = false,
645+
isScreenStreamEnabled = false,
646+
raisedHand = false,
647+
isInternal = false
648+
)
584649

585-
localStateBroadcasterMcu!!.handleCallParticipantAdded(callParticipantModel)
586-
localStateBroadcasterMcu!!.handleCallParticipantAdded(callParticipantModel2)
650+
localStateBroadcasterMcu!!.handleCallParticipantAdded(participantUiState)
651+
localStateBroadcasterMcu!!.handleCallParticipantAdded(participantUiState2)
587652

588653
// Sending will be done in another thread, so just adding the participant does not send anything until that
589654
// other thread could run.

0 commit comments

Comments
 (0)