Skip to content

Commit bb39632

Browse files
mahibimahibi
committed
adapt tests (1 still failing)
Signed-off-by: Marcel Hibbe <[email protected]>
1 parent dcb25cd commit bb39632

File tree

3 files changed

+67
-14
lines changed

3 files changed

+67
-14
lines changed

‎app/src/test/java/com/nextcloud/talk/activities/CallViewModelTest.kt‎

Lines changed: 42 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,12 @@ class CallViewModelTest {
4141
val sessionId = "session1"
4242
val mockReceiver = mock<SignalingMessageReceiver>()
4343

44-
viewModel.addParticipant(sessionId, mockReceiver)
44+
viewModel.addParticipant(
45+
baseUrl = "",
46+
roomToken = "",
47+
sessionId = sessionId,
48+
signalingMessageReceiver = mockReceiver
49+
)
4550
testDispatcher.scheduler.advanceUntilIdle()
4651

4752
assertTrue(viewModel.doesParticipantExist(sessionId))
@@ -53,7 +58,12 @@ class CallViewModelTest {
5358
val sessionId = "session2"
5459
val receiver = mock<SignalingMessageReceiver>()
5560

56-
viewModel.addParticipant(sessionId, receiver)
61+
viewModel.addParticipant(
62+
baseUrl = "",
63+
roomToken = "",
64+
sessionId = sessionId,
65+
signalingMessageReceiver = receiver
66+
)
5767
assertTrue(viewModel.doesParticipantExist(sessionId))
5868
}
5969

@@ -66,7 +76,12 @@ class CallViewModelTest {
6676
fun `onShareScreen sets active screen share session`() {
6777
val sessionId = "screen1"
6878
val receiver = mock<SignalingMessageReceiver>()
69-
viewModel.addParticipant(sessionId, receiver)
79+
viewModel.addParticipant(
80+
baseUrl = "",
81+
roomToken = "",
82+
sessionId = sessionId,
83+
signalingMessageReceiver = receiver
84+
)
7085
viewModel.onShareScreen(sessionId)
7186

7287
val activeSession = viewModel.activeScreenShareSession.value
@@ -77,7 +92,12 @@ class CallViewModelTest {
7792
fun `onUnshareScreen clears active session when same session unshares`() {
7893
val sessionId = "screen2"
7994
val receiver = mock<SignalingMessageReceiver>()
80-
viewModel.addParticipant(sessionId, receiver)
95+
viewModel.addParticipant(
96+
baseUrl = "",
97+
roomToken = "",
98+
sessionId = sessionId,
99+
signalingMessageReceiver = receiver
100+
)
81101
viewModel.onShareScreen(sessionId)
82102
viewModel.onUnshareScreen(sessionId)
83103

@@ -90,7 +110,12 @@ class CallViewModelTest {
90110
val sessionId = "session3"
91111
val receiver = mock<SignalingMessageReceiver>()
92112

93-
viewModel.addParticipant(sessionId, receiver)
113+
viewModel.addParticipant(
114+
baseUrl = "",
115+
roomToken = "",
116+
sessionId = sessionId,
117+
signalingMessageReceiver = receiver
118+
)
94119
viewModel.removeParticipant(sessionId)
95120

96121
assertFalse(viewModel.doesParticipantExist(sessionId))
@@ -102,7 +127,12 @@ class CallViewModelTest {
102127
val sessionId = "screen3"
103128
val receiver = mock<SignalingMessageReceiver>()
104129

105-
viewModel.addParticipant(sessionId, receiver)
130+
viewModel.addParticipant(
131+
baseUrl = "",
132+
roomToken = "",
133+
sessionId = sessionId,
134+
signalingMessageReceiver = receiver
135+
)
106136
viewModel.setActiveScreenShareSession(sessionId)
107137

108138
val active = viewModel.activeScreenShareSession.value
@@ -116,7 +146,12 @@ class CallViewModelTest {
116146
val sessionId = "session1"
117147
val mockReceiver = mock<SignalingMessageReceiver>()
118148

119-
viewModel.addParticipant(sessionId, mockReceiver)
149+
viewModel.addParticipant(
150+
baseUrl = "",
151+
roomToken = "",
152+
sessionId = sessionId,
153+
signalingMessageReceiver = mockReceiver
154+
)
120155
testDispatcher.scheduler.advanceUntilIdle()
121156

122157
assertEquals(1, viewModel.participants.value.size)

‎app/src/test/java/com/nextcloud/talk/activities/ParticipantHandlerTest.kt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ class ParticipantHandlerTest {
5252
// When
5353
handler = ParticipantHandler(
5454
sessionId = sessionId,
55+
baseUrl = "",
56+
roomToken = "",
5557
signalingMessageReceiver = signalingMessageReceiver,
5658
onParticipantShareScreen = onParticipantShareScreen,
5759
onParticipantUnshareScreen = onParticipantUnshareScreen
@@ -60,6 +62,8 @@ class ParticipantHandlerTest {
6062
// Then
6163
val expectedState = ParticipantUiState(
6264
sessionKey = sessionId,
65+
baseUrl = "",
66+
roomToken = "",
6367
nick = "Guest",
6468
isConnected = false,
6569
isAudioEnabled = false,

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

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,9 @@ class LocalStateBroadcasterMcuTest {
101101
isStreamEnabled = false,
102102
isScreenStreamEnabled = false,
103103
raisedHand = false,
104-
isInternal = false
104+
isInternal = false,
105+
baseUrl = "",
106+
roomToken = ""
105107
)
106108

107109
localStateBroadcasterMcu!!.handleCallParticipantAdded(participantUiState)
@@ -203,7 +205,9 @@ class LocalStateBroadcasterMcuTest {
203205
isStreamEnabled = false,
204206
isScreenStreamEnabled = false,
205207
raisedHand = false,
206-
isInternal = false
208+
isInternal = false,
209+
baseUrl = "",
210+
roomToken = ""
207211
)
208212

209213
localStateBroadcasterMcu!!.handleCallParticipantAdded(participantUiState)
@@ -323,7 +327,9 @@ class LocalStateBroadcasterMcuTest {
323327
isStreamEnabled = false,
324328
isScreenStreamEnabled = false,
325329
raisedHand = false,
326-
isInternal = false
330+
isInternal = false,
331+
baseUrl = "",
332+
roomToken = ""
327333
)
328334

329335
localStateBroadcasterMcu!!.handleCallParticipantAdded(participantUiState)
@@ -391,7 +397,9 @@ class LocalStateBroadcasterMcuTest {
391397
isStreamEnabled = false,
392398
isScreenStreamEnabled = false,
393399
raisedHand = false,
394-
isInternal = false
400+
isInternal = false,
401+
baseUrl = "",
402+
roomToken = ""
395403
)
396404

397405
localStateBroadcasterMcu!!.handleCallParticipantAdded(participantUiState2)
@@ -528,7 +536,9 @@ class LocalStateBroadcasterMcuTest {
528536
isStreamEnabled = false,
529537
isScreenStreamEnabled = false,
530538
raisedHand = false,
531-
isInternal = false
539+
isInternal = false,
540+
baseUrl = "",
541+
roomToken = ""
532542
)
533543

534544
localStateBroadcasterMcu!!.handleCallParticipantAdded(participantUiState)
@@ -633,7 +643,9 @@ class LocalStateBroadcasterMcuTest {
633643
isStreamEnabled = false,
634644
isScreenStreamEnabled = false,
635645
raisedHand = false,
636-
isInternal = false
646+
isInternal = false,
647+
baseUrl = "",
648+
roomToken = ""
637649
)
638650

639651
val participantUiState2 = ParticipantUiState(
@@ -644,7 +656,9 @@ class LocalStateBroadcasterMcuTest {
644656
isStreamEnabled = false,
645657
isScreenStreamEnabled = false,
646658
raisedHand = false,
647-
isInternal = false
659+
isInternal = false,
660+
baseUrl = "",
661+
roomToken = ""
648662
)
649663

650664
localStateBroadcasterMcu!!.handleCallParticipantAdded(participantUiState)

0 commit comments

Comments
 (0)