diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-05-19 08:16:51 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-05-23 16:27:32 +0200 |
| commit | 6d8b81e305489bafed9e84a7c297e4f71ac3e9dc (patch) | |
| tree | 20ff409083afbee7e3b23c366d6094fd6f589358 /android/app/src/androidTest | |
| parent | 3470c85de0a361ee340b510bc779318c5ac95860 (diff) | |
| download | mullvadvpn-6d8b81e305489bafed9e84a7c297e4f71ac3e9dc.tar.xz mullvadvpn-6d8b81e305489bafed9e84a7c297e4f71ac3e9dc.zip | |
Remove scopes in koin and use global scope everywhere
Diffstat (limited to 'android/app/src/androidTest')
| -rw-r--r-- | android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreenTest.kt | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreenTest.kt index 087c4b72a7..e7fa052d5f 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreenTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreenTest.kt @@ -11,28 +11,21 @@ import io.mockk.verify import net.mullvad.mullvadvpn.applist.AppData import net.mullvad.mullvadvpn.applist.ApplicationsIconManager import net.mullvad.mullvadvpn.compose.state.SplitTunnelingUiState -import net.mullvad.mullvadvpn.di.APPS_SCOPE import org.junit.After import org.junit.Before import org.junit.Rule import org.junit.Test import org.koin.core.context.loadKoinModules import org.koin.core.context.unloadKoinModules -import org.koin.core.qualifier.named -import org.koin.core.scope.Scope import org.koin.dsl.module -import org.koin.java.KoinJavaComponent.getKoin class SplitTunnelingScreenTest { @get:Rule val composeTestRule = createComposeRule() - private lateinit var scope: Scope private val testModule = module { - scope(named(APPS_SCOPE)) { - scoped { - mockk<ApplicationsIconManager>().apply { - every { getAppIcon(any()) } returns mockk(relaxed = true) - } + single { + mockk<ApplicationsIconManager>().apply { + every { getAppIcon(any()) } returns mockk(relaxed = true) } } } @@ -41,12 +34,10 @@ class SplitTunnelingScreenTest { fun setup() { MockKAnnotations.init(this) loadKoinModules(testModule) - scope = getKoin().getOrCreateScope(APPS_SCOPE, named(APPS_SCOPE)) } @After fun tearDown() { - scope.close() unloadKoinModules(testModule) unmockkAll() } @@ -76,7 +67,7 @@ class SplitTunnelingScreenTest { composeTestRule.setContent { SplitTunnelingScreen( uiState = - SplitTunnelingUiState.Data( + SplitTunnelingUiState.ShowAppList( excludedApps = listOf(excludedApp), includedApps = listOf(includedApp), showSystemApps = false @@ -104,7 +95,7 @@ class SplitTunnelingScreenTest { composeTestRule.setContent { SplitTunnelingScreen( uiState = - SplitTunnelingUiState.Data( + SplitTunnelingUiState.ShowAppList( excludedApps = emptyList(), includedApps = listOf(includedApp), showSystemApps = false @@ -135,7 +126,7 @@ class SplitTunnelingScreenTest { composeTestRule.setContent { SplitTunnelingScreen( uiState = - SplitTunnelingUiState.Data( + SplitTunnelingUiState.ShowAppList( excludedApps = listOf(excludedApp), includedApps = listOf(includedApp), showSystemApps = false @@ -162,7 +153,7 @@ class SplitTunnelingScreenTest { composeTestRule.setContent { SplitTunnelingScreen( uiState = - SplitTunnelingUiState.Data( + SplitTunnelingUiState.ShowAppList( excludedApps = listOf(excludedApp), includedApps = listOf(includedApp), showSystemApps = false @@ -189,7 +180,7 @@ class SplitTunnelingScreenTest { composeTestRule.setContent { SplitTunnelingScreen( uiState = - SplitTunnelingUiState.Data( + SplitTunnelingUiState.ShowAppList( excludedApps = listOf(excludedApp), includedApps = listOf(includedApp), showSystemApps = false |