Fix tests (#47)

* Fix tests

* Fix github actions

@@ -2,9 +2,9 @@ name: Android CI
 
 
 on:
 on:
   push:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 
 jobs:
 jobs:
   build:
   build:

@@ -119,8 +119,9 @@ class RoomMockE2ETest : MockE2ETest() {
         )
         )
         val events = eventCollector.stopCollecting()
         val events = eventCollector.stopCollecting()
 
 
-        Assert.assertEquals(1, events.size)
-        Assert.assertEquals(true, events[0] is RoomEvent.ParticipantDisconnected)
+        Assert.assertEquals(2, events.size)
+        Assert.assertEquals(true, events[0] is RoomEvent.TrackUnpublished)
+        Assert.assertEquals(true, events[1] is RoomEvent.ParticipantDisconnected)
     }
     }
 
 
     @Test
     @Test

@@ -19,10 +19,7 @@ import org.junit.runner.RunWith
 import org.mockito.Mock
 import org.mockito.Mock
 import org.mockito.Mockito
 import org.mockito.Mockito
 import org.mockito.junit.MockitoJUnit
 import org.mockito.junit.MockitoJUnit
-import org.mockito.kotlin.any
-import org.mockito.kotlin.anyOrNull
-import org.mockito.kotlin.doReturn
-import org.mockito.kotlin.stub
+import org.mockito.kotlin.*
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.RobolectricTestRunner
 import org.webrtc.EglBase
 import org.webrtc.EglBase
 
 
@@ -68,7 +65,11 @@ class RoomTest {
     suspend fun connect() {
     suspend fun connect() {
         rtcEngine.stub {
         rtcEngine.stub {
             onBlocking { rtcEngine.join(any(), any(), anyOrNull()) }
             onBlocking { rtcEngine.join(any(), any(), anyOrNull()) }
-                .doReturn(SignalClientTest.JOIN.join)
+                .doSuspendableAnswer {
+                    room.onJoinResponse(SignalClientTest.JOIN.join)
+                    SignalClientTest.JOIN.join
+                }
+
         }
         }
         rtcEngine.stub {
         rtcEngine.stub {
             onBlocking { rtcEngine.client }
             onBlocking { rtcEngine.client }