Refactor android app account cache

2 files changed, 11 insertions, 12 deletions

diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/DeviceRevokedViewModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/DeviceRevokedViewModelTest.kt
index f507aa5b35..6dd1c586c9 100644
--- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/DeviceRevokedViewModelTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/DeviceRevokedViewModelTest.kt
@@ -17,6 +17,7 @@ import kotlinx.coroutines.test.TestCoroutineDispatcher
 import kotlinx.coroutines.test.runBlockingTest
 import net.mullvad.mullvadvpn.compose.state.DeviceRevokedUiState
 import net.mullvad.mullvadvpn.model.TunnelState
+import net.mullvad.mullvadvpn.ui.serviceconnection.AccountCache
 import net.mullvad.mullvadvpn.ui.serviceconnection.ConnectionProxy
 import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionContainer
 import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionManager
@@ -30,6 +31,9 @@ import org.junit.Test
 class DeviceRevokedViewModelTest {
 
     @MockK
+    private lateinit var mockedAccountCache: AccountCache
+
+    @MockK
     private lateinit var mockedServiceConnectionManager: ServiceConnectionManager
 
     private val serviceConnectionState =
@@ -44,6 +48,7 @@ class DeviceRevokedViewModelTest {
         every { mockedServiceConnectionManager.connectionState } returns serviceConnectionState
         viewModel = DeviceRevokedViewModel(
             mockedServiceConnectionManager,
+            mockedAccountCache,
             TestCoroutineDispatcher()
         )
     }
@@ -100,7 +105,7 @@ class DeviceRevokedViewModelTest {
         val mockedContainer = mockk<ServiceConnectionContainer>().also {
             every { it.connectionProxy.state } returns TunnelState.Disconnected
             every { it.connectionProxy.disconnect() } just Runs
-            every { it.accountCache.logout() } just Runs
+            every { mockedAccountCache.logout() } just Runs
         }
         serviceConnectionState.value = ServiceConnectionState.ConnectedReady(mockedContainer)
 
@@ -109,7 +114,7 @@ class DeviceRevokedViewModelTest {
 
         // Assert
         verify {
-            mockedContainer.accountCache.logout()
+            mockedAccountCache.logout()
         }
     }
 
@@ -119,7 +124,7 @@ class DeviceRevokedViewModelTest {
         val mockedContainer = mockk<ServiceConnectionContainer>().also {
             every { it.connectionProxy.state } returns TunnelState.Connected(mockk(), mockk())
             every { it.connectionProxy.disconnect() } just Runs
-            every { it.accountCache.logout() } just Runs
+            every { mockedAccountCache.logout() } just Runs
         }
         serviceConnectionState.value = ServiceConnectionState.ConnectedReady(mockedContainer)
 
@@ -129,7 +134,7 @@ class DeviceRevokedViewModelTest {
         // Assert
         verifyOrder {
             mockedContainer.connectionProxy.disconnect()
-            mockedContainer.accountCache.logout()
+            mockedAccountCache.logout()
         }
     }
 
diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/LoginViewModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/LoginViewModelTest.kt
index 59c52aab7d..6b44989f52 100644
--- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/LoginViewModelTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/LoginViewModelTest.kt
@@ -22,7 +22,6 @@ import net.mullvad.mullvadvpn.model.LoginResult
 import net.mullvad.mullvadvpn.ui.serviceconnection.AccountCache
 import net.mullvad.mullvadvpn.ui.serviceconnection.DeviceRepository
 import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionContainer
-import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionManager
 import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionState
 import org.junit.Before
 import org.junit.Test
@@ -36,15 +35,12 @@ class LoginViewModelTest {
     private lateinit var mockedDeviceRepository: DeviceRepository
 
     @MockK
-    private lateinit var mockedServiceConnectionManager: ServiceConnectionManager
-
-    @MockK
     private lateinit var mockedServiceConnectionContainer: ServiceConnectionContainer
 
     private lateinit var loginViewModel: LoginViewModel
 
     private val accountCreationTestEvents = MutableSharedFlow<AccountCreationResult>()
-    private val accountHistoryTestEvents = MutableSharedFlow<AccountHistory>()
+    private val accountHistoryTestEvents = MutableStateFlow<AccountHistory>(AccountHistory.Missing)
     private val loginTestEvents = MutableSharedFlow<Event.LoginEvent>()
 
     private val serviceConnectionState =
@@ -58,15 +54,13 @@ class LoginViewModelTest {
         every { mockedAccountCache.accountCreationEvents } returns accountCreationTestEvents
         every { mockedAccountCache.accountHistoryEvents } returns accountHistoryTestEvents
         every { mockedAccountCache.loginEvents } returns loginTestEvents
-        every { mockedServiceConnectionManager.connectionState } returns serviceConnectionState
-        every { mockedServiceConnectionContainer.accountCache } returns mockedAccountCache
 
         serviceConnectionState.value =
             ServiceConnectionState.ConnectedReady(mockedServiceConnectionContainer)
 
         loginViewModel = LoginViewModel(
+            mockedAccountCache,
             mockedDeviceRepository,
-            mockedServiceConnectionManager,
             TestCoroutineDispatcher()
         )
     }