fix: test imports and reformat

keymapperorg · Jun 15, 2024 · 3a7a8ba · 3a7a8ba
1 parent 71ba2c4
commit 3a7a8ba
Show file tree

Hide file tree

Showing 6 changed files with 92 additions and 45 deletions.
diff --git a/app/src/test/java/io/github/sds100/keymapper/NotificationControllerTest.kt b/app/src/test/java/io/github/sds100/keymapper/NotificationControllerTest.kt
@@ -12,6 +12,7 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.test.DelayController
 import kotlinx.coroutines.test.TestCoroutineDispatcher
 import kotlinx.coroutines.test.TestCoroutineExceptionHandler
 import kotlinx.coroutines.test.createTestCoroutineScope
@@ -26,6 +27,7 @@ import org.mockito.kotlin.mock
 import org.mockito.kotlin.times
 import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
+import kotlin.coroutines.ContinuationInterceptor
 
 /**
  * Created by sds100 on 25/04/2021.
@@ -89,14 +91,14 @@ class NotificationControllerTest {
         coroutineScope.runBlockingTest {
             // WHEN
 
-            pauseDispatcher()
+            (coroutineContext[ContinuationInterceptor]!! as DelayController).pauseDispatcher()
             launch {
                 onActionClick.emit(NotificationController.ACTION_ON_SETUP_CHOSEN_DEVICES_AGAIN)
             }
 
             // THEN
             assertThat(controller.openApp.toListWithTimeout().size, `is`(1))
-            resumeDispatcher()
+            (coroutineContext[ContinuationInterceptor]!! as DelayController).resumeDispatcher()
 
             assertThat(fakeOnboarding.approvedSetupChosenDevicesAgainNotification, `is`(true))
         }

diff --git a/app/src/test/java/io/github/sds100/keymapper/mappings/SimpleMappingControllerTest.kt b/app/src/test/java/io/github/sds100/keymapper/mappings/SimpleMappingControllerTest.kt
@@ -11,12 +11,18 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.test.TestCoroutineDispatcher
 import kotlinx.coroutines.test.TestCoroutineExceptionHandler
+import kotlinx.coroutines.test.advanceUntilIdle
 import kotlinx.coroutines.test.createTestCoroutineScope
 import kotlinx.coroutines.test.runBlockingTest
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mockito.kotlin.atLeast
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.times
+import org.mockito.kotlin.verify
 
 /**
  * Created by sds100 on 15/05/2021.
@@ -159,7 +165,10 @@ class SimpleMappingControllerTest {
 
             // WHEN
             controller.onDetected("id", FakeMapping(actionList = listOf(action)))
-            advanceTimeBy(200)
+            testScheduler.apply {
+                advanceTimeBy(200)
+                runCurrent()
+            }
             controller.onDetected("id", FakeMapping(actionList = listOf(action)))
 
             // THEN
@@ -182,7 +191,10 @@ class SimpleMappingControllerTest {
 
             // WHEN
             controller.onDetected("id", FakeMapping(actionList = listOf(action)))
-            advanceTimeBy(5000)
+            testScheduler.apply {
+                advanceTimeBy(5000)
+                runCurrent()
+            }
             controller.onDetected("id", FakeMapping(actionList = listOf(action)))
 
             // THEN