From eb35a2ed9af6a3ca109f5562e737ffb8b8ae0689 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= Date: Fri, 20 Dec 2024 15:00:30 +0100 Subject: [PATCH] Rename variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This will be used to have separate counts for data channel and signaling messages. Signed-off-by: Daniel Calviño Sánchez --- .../talk/call/LocalStateBroadcasterMcuTest.kt | 128 +++++++++--------- 1 file changed, 64 insertions(+), 64 deletions(-) diff --git a/app/src/test/java/com/nextcloud/talk/call/LocalStateBroadcasterMcuTest.kt b/app/src/test/java/com/nextcloud/talk/call/LocalStateBroadcasterMcuTest.kt index aafeb2e51..a20fea843 100644 --- a/app/src/test/java/com/nextcloud/talk/call/LocalStateBroadcasterMcuTest.kt +++ b/app/src/test/java/com/nextcloud/talk/call/LocalStateBroadcasterMcuTest.kt @@ -218,34 +218,34 @@ class LocalStateBroadcasterMcuTest { testScheduler.advanceTimeBy(0, TimeUnit.SECONDS) - var messageCount = 1 - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedAudioOn) - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedSpeaking) - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedVideoOn) + var dataChannelMessageCount = 1 + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedAudioOn) + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedSpeaking) + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedVideoOn) Mockito.verifyNoMoreInteractions(mockedMessageSender) testScheduler.advanceTimeBy(1, TimeUnit.SECONDS) - messageCount = 2 - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedAudioOn) - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedSpeaking) - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedVideoOn) + dataChannelMessageCount = 2 + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedAudioOn) + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedSpeaking) + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedVideoOn) Mockito.verifyNoMoreInteractions(mockedMessageSender) testScheduler.advanceTimeBy(2, TimeUnit.SECONDS) - messageCount = 3 - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedAudioOn) - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedSpeaking) - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedVideoOn) + dataChannelMessageCount = 3 + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedAudioOn) + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedSpeaking) + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedVideoOn) Mockito.verifyNoMoreInteractions(mockedMessageSender) testScheduler.advanceTimeBy(4, TimeUnit.SECONDS) - messageCount = 4 - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedAudioOn) - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedSpeaking) - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedVideoOn) + dataChannelMessageCount = 4 + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedAudioOn) + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedSpeaking) + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedVideoOn) Mockito.verifyNoMoreInteractions(mockedMessageSender) val callParticipantModel2 = MutableCallParticipantModel("theSessionId2") @@ -254,50 +254,50 @@ class LocalStateBroadcasterMcuTest { testScheduler.advanceTimeBy(0, TimeUnit.SECONDS) - messageCount = 5 - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedAudioOn) - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedSpeaking) - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedVideoOn) + dataChannelMessageCount = 5 + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedAudioOn) + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedSpeaking) + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedVideoOn) Mockito.verifyNoMoreInteractions(mockedMessageSender) testScheduler.advanceTimeBy(1, TimeUnit.SECONDS) - messageCount = 6 - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedAudioOn) - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedSpeaking) - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedVideoOn) + dataChannelMessageCount = 6 + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedAudioOn) + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedSpeaking) + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedVideoOn) Mockito.verifyNoMoreInteractions(mockedMessageSender) testScheduler.advanceTimeBy(2, TimeUnit.SECONDS) - messageCount = 7 - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedAudioOn) - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedSpeaking) - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedVideoOn) + dataChannelMessageCount = 7 + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedAudioOn) + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedSpeaking) + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedVideoOn) Mockito.verifyNoMoreInteractions(mockedMessageSender) testScheduler.advanceTimeBy(4, TimeUnit.SECONDS) - messageCount = 8 - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedAudioOn) - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedSpeaking) - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedVideoOn) + dataChannelMessageCount = 8 + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedAudioOn) + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedSpeaking) + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedVideoOn) Mockito.verifyNoMoreInteractions(mockedMessageSender) testScheduler.advanceTimeBy(8, TimeUnit.SECONDS) - messageCount = 9 - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedAudioOn) - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedSpeaking) - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedVideoOn) + dataChannelMessageCount = 9 + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedAudioOn) + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedSpeaking) + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedVideoOn) Mockito.verifyNoMoreInteractions(mockedMessageSender) testScheduler.advanceTimeBy(16, TimeUnit.SECONDS) - messageCount = 10 - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedAudioOn) - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedSpeaking) - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedVideoOn) + dataChannelMessageCount = 10 + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedAudioOn) + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedSpeaking) + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedVideoOn) Mockito.verifyNoMoreInteractions(mockedMessageSender) testScheduler.advanceTimeBy(100, TimeUnit.SECONDS) @@ -331,52 +331,52 @@ class LocalStateBroadcasterMcuTest { testScheduler.advanceTimeBy(0, TimeUnit.SECONDS) - var messageCount = 1 - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedAudioOn) - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedSpeaking) - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedVideoOn) + var dataChannelMessageCount = 1 + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedAudioOn) + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedSpeaking) + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedVideoOn) Mockito.verifyNoMoreInteractions(mockedMessageSender) testScheduler.advanceTimeBy(1, TimeUnit.SECONDS) - messageCount = 2 - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedAudioOn) - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedSpeaking) - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedVideoOn) + dataChannelMessageCount = 2 + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedAudioOn) + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedSpeaking) + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedVideoOn) Mockito.verifyNoMoreInteractions(mockedMessageSender) testScheduler.advanceTimeBy(2, TimeUnit.SECONDS) - messageCount = 3 - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedAudioOn) - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedSpeaking) - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedVideoOn) + dataChannelMessageCount = 3 + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedAudioOn) + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedSpeaking) + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedVideoOn) Mockito.verifyNoMoreInteractions(mockedMessageSender) testScheduler.advanceTimeBy(4, TimeUnit.SECONDS) - messageCount = 4 - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedAudioOn) - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedSpeaking) - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedVideoOn) + dataChannelMessageCount = 4 + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedAudioOn) + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedSpeaking) + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedVideoOn) Mockito.verifyNoMoreInteractions(mockedMessageSender) localStateBroadcasterMcu!!.handleCallParticipantRemoved(callParticipantModel) testScheduler.advanceTimeBy(8, TimeUnit.SECONDS) - messageCount = 5 - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedAudioOn) - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedSpeaking) - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedVideoOn) + dataChannelMessageCount = 5 + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedAudioOn) + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedSpeaking) + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedVideoOn) Mockito.verifyNoMoreInteractions(mockedMessageSender) testScheduler.advanceTimeBy(16, TimeUnit.SECONDS) - messageCount = 6 - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedAudioOn) - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedSpeaking) - Mockito.verify(mockedMessageSender!!, times(messageCount)).sendToAll(expectedVideoOn) + dataChannelMessageCount = 6 + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedAudioOn) + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedSpeaking) + Mockito.verify(mockedMessageSender!!, times(dataChannelMessageCount)).sendToAll(expectedVideoOn) Mockito.verifyNoMoreInteractions(mockedMessageSender) testScheduler.advanceTimeBy(100, TimeUnit.SECONDS)