Merge branch 'illegalstateexception-in-vpnserviceprepare-droid-1548'

1 files changed, 10 insertions, 4 deletions

diff --git a/android/lib/shared/src/test/kotlin/net/mullvad/mullvadvpn/lib/shared/ConnectionProxyTest.kt b/android/lib/shared/src/test/kotlin/net/mullvad/mullvadvpn/lib/shared/ConnectionProxyTest.kt
index 0652867105..b9d276c34b 100644
--- a/android/lib/shared/src/test/kotlin/net/mullvad/mullvadvpn/lib/shared/ConnectionProxyTest.kt
+++ b/android/lib/shared/src/test/kotlin/net/mullvad/mullvadvpn/lib/shared/ConnectionProxyTest.kt
@@ -1,31 +1,36 @@
 package net.mullvad.mullvadvpn.lib.shared
 
+import android.content.Intent
+import arrow.core.left
+import arrow.core.right
 import io.mockk.coVerify
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.unmockkAll
 import kotlinx.coroutines.test.runTest
 import net.mullvad.mullvadvpn.lib.daemon.grpc.ManagementService
+import net.mullvad.mullvadvpn.lib.model.PrepareError
+import net.mullvad.mullvadvpn.lib.model.Prepared
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.Test
 
 class ConnectionProxyTest {
 
     private val mockManagementService: ManagementService = mockk(relaxed = true)
-    private val mockVpnPermissionRepository: VpnPermissionRepository = mockk()
+    private val mockVpnPermissionRepository: PrepareVpnUseCase = mockk()
     private val mockTranslationRepository: RelayLocationTranslationRepository =
         mockk(relaxed = true)
 
     private val connectionProxy: ConnectionProxy =
         ConnectionProxy(
             managementService = mockManagementService,
-            vpnPermissionRepository = mockVpnPermissionRepository,
+            prepareVpnUseCase = mockVpnPermissionRepository,
             translationRepository = mockTranslationRepository,
         )
 
     @Test
     fun `connect with vpn permission allowed should call managementService connect`() = runTest {
-        every { mockVpnPermissionRepository.hasVpnPermission() } returns true
+        every { mockVpnPermissionRepository.invoke() } returns Prepared.right()
         connectionProxy.connect()
         coVerify(exactly = 1) { mockManagementService.connect() }
     }
@@ -33,7 +38,8 @@ class ConnectionProxyTest {
     @Test
     fun `connect with vpn permission not allowed should not call managementService connect`() =
         runTest {
-            every { mockVpnPermissionRepository.hasVpnPermission() } returns false
+            every { mockVpnPermissionRepository.invoke() } returns
+                PrepareError.NotPrepared(Intent()).left()
             connectionProxy.connect()
             coVerify(exactly = 0) { mockManagementService.connect() }
         }