Merge branch 'add-konsist-vm-checks'

5 files changed, 22 insertions, 24 deletions

diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/ChangelogViewModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/ChangelogViewModelTest.kt
index 3547b92065..7c74e96a75 100644
--- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/ChangelogViewModelTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/ChangelogViewModelTest.kt
@@ -40,14 +40,12 @@ class ChangelogViewModelTest {
     @Test
     fun testInitialState() = runBlockingTest {
         // Arrange, Act, Assert
-        viewModel.changelogDialogUiState.test {
-            Assert.assertEquals(ChangelogDialogUiState.Hide, awaitItem())
-        }
+        viewModel.uiState.test { Assert.assertEquals(ChangelogDialogUiState.Hide, awaitItem()) }
     }
 
     @Test
     fun testShowAndDismissChangelogDialog() = runBlockingTest {
-        viewModel.changelogDialogUiState.test {
+        viewModel.uiState.test {
             // Arrange
             val fakeList = listOf("test")
             every { mockedChangelogRepository.getVersionCodeOfMostRecentChangelogShowed() } returns
@@ -70,7 +68,7 @@ class ChangelogViewModelTest {
 
     @Test
     fun testShowCaseChangelogWithEmptyListDialog() = runBlockingTest {
-        viewModel.changelogDialogUiState.test {
+        viewModel.uiState.test {
             // Arrange
             val fakeEmptyList = emptyList<String>()
             every { mockedChangelogRepository.getVersionCodeOfMostRecentChangelogShowed() } returns
diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModelTest.kt
index a2a39e54c4..18f8447f44 100644
--- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModelTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModelTest.kt
@@ -375,21 +375,21 @@ class ConnectViewModelTest {
             coEvery { mockAuthTokenCache.fetchAuthToken() } returns mockToken
 
             // Act, Assert
-            viewModel.viewActions.test {
+            viewModel.uiSideEffect.test {
                 viewModel.onManageAccountClick()
                 val action = awaitItem()
-                assertIs<ConnectViewModel.ViewAction.OpenAccountManagementPageInBrowser>(action)
+                assertIs<ConnectViewModel.UiSideEffect.OpenAccountManagementPageInBrowser>(action)
                 assertEquals(mockToken, action.token)
             }
         }
 
     @Test
-    fun testOutOfTimeViewAction() =
+    fun testOutOfTimeUiSideEffect() =
         runTest(testCoroutineRule.testDispatcher) {
             // Arrange
             val errorStateCause = ErrorStateCause.AuthFailed("[EXPIRED_ACCOUNT]")
             val tunnelRealStateTestItem = TunnelState.Error(ErrorState(errorStateCause, true))
-            val deferred = async { viewModel.viewActions.first() }
+            val deferred = async { viewModel.uiSideEffect.first() }
 
             // Act
             viewModel.uiState.test {
@@ -403,7 +403,7 @@ class ConnectViewModelTest {
             }
 
             // Assert
-            assertIs<ConnectViewModel.ViewAction.OpenOutOfTimeView>(deferred.await())
+            assertIs<ConnectViewModel.UiSideEffect.OpenOutOfTimeView>(deferred.await())
         }
 
     companion object {
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 73bfd1ef38..744989a922 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
@@ -63,7 +63,7 @@ class LoginViewModelTest {
         turbineScope {
             // Arrange
             val uiStates = loginViewModel.uiState.testIn(backgroundScope)
-            val sideEffects = loginViewModel.viewActions.testIn(backgroundScope)
+            val sideEffects = loginViewModel.uiSideEffect.testIn(backgroundScope)
             coEvery { mockedAccountRepository.createAccount() } returns
                 AccountCreationResult.Success(DUMMY_ACCOUNT_TOKEN)
 
@@ -71,7 +71,7 @@ class LoginViewModelTest {
             uiStates.skipDefaultItem()
             loginViewModel.createAccount()
             assertEquals(Loading.CreatingAccount, uiStates.awaitItem().loginState)
-            assertEquals(LoginViewAction.NavigateToWelcome, sideEffects.awaitItem())
+            assertEquals(LoginUiSideEffect.NavigateToWelcome, sideEffects.awaitItem())
         }
     }
 
@@ -80,7 +80,7 @@ class LoginViewModelTest {
         turbineScope {
             // Arrange
             val uiStates = loginViewModel.uiState.testIn(backgroundScope)
-            val sideEffects = loginViewModel.viewActions.testIn(backgroundScope)
+            val sideEffects = loginViewModel.uiSideEffect.testIn(backgroundScope)
             coEvery { mockedAccountRepository.login(any()) } returns LoginResult.Ok
 
             // Act, Assert
@@ -88,7 +88,7 @@ class LoginViewModelTest {
             loginViewModel.login(DUMMY_ACCOUNT_TOKEN)
             assertEquals(Loading.LoggingIn, uiStates.awaitItem().loginState)
             assertEquals(Success, uiStates.awaitItem().loginState)
-            assertEquals(LoginViewAction.NavigateToConnect, sideEffects.awaitItem())
+            assertEquals(LoginUiSideEffect.NavigateToConnect, sideEffects.awaitItem())
         }
     }
 
@@ -111,7 +111,7 @@ class LoginViewModelTest {
         turbineScope {
             // Arrange
             val uiStates = loginViewModel.uiState.testIn(backgroundScope)
-            val sideEffects = loginViewModel.viewActions.testIn(backgroundScope)
+            val sideEffects = loginViewModel.uiSideEffect.testIn(backgroundScope)
             coEvery {
                 mockedDeviceRepository.refreshAndAwaitDeviceListWithTimeout(
                     any(),
@@ -127,7 +127,7 @@ class LoginViewModelTest {
             loginViewModel.login(DUMMY_ACCOUNT_TOKEN)
             assertEquals(Loading.LoggingIn, uiStates.awaitItem().loginState)
             assertEquals(
-                LoginViewAction.TooManyDevices(AccountToken(DUMMY_ACCOUNT_TOKEN)),
+                LoginUiSideEffect.TooManyDevices(AccountToken(DUMMY_ACCOUNT_TOKEN)),
                 sideEffects.awaitItem()
             )
         }
diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/OutOfTimeViewModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/OutOfTimeViewModelTest.kt
index b12c0382a5..5f81032938 100644
--- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/OutOfTimeViewModelTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/OutOfTimeViewModelTest.kt
@@ -88,10 +88,10 @@ class OutOfTimeViewModelTest {
             coEvery { mockAuthTokenCache.fetchAuthToken() } returns mockToken
 
             // Act, Assert
-            viewModel.viewActions.test {
+            viewModel.uiSideEffect.test {
                 viewModel.onSitePaymentClick()
                 val action = awaitItem()
-                assertIs<OutOfTimeViewModel.ViewAction.OpenAccountView>(action)
+                assertIs<OutOfTimeViewModel.UiSideEffect.OpenAccountView>(action)
                 assertEquals(mockToken, action.token)
             }
         }
@@ -121,10 +121,10 @@ class OutOfTimeViewModelTest {
             every { mockExpiryDate.isAfter(any<ReadableInstant>()) } returns true
 
             // Act, Assert
-            viewModel.viewActions.test {
+            viewModel.uiSideEffect.test {
                 accountExpiryState.value = AccountExpiry.Available(mockExpiryDate)
                 val action = awaitItem()
-                assertIs<OutOfTimeViewModel.ViewAction.OpenConnectScreen>(action)
+                assertIs<OutOfTimeViewModel.UiSideEffect.OpenConnectScreen>(action)
             }
         }
 
diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/WelcomeViewModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/WelcomeViewModelTest.kt
index 1c61b11505..52713c0b0d 100644
--- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/WelcomeViewModelTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/WelcomeViewModelTest.kt
@@ -95,10 +95,10 @@ class WelcomeViewModelTest {
             coEvery { mockAuthTokenCache.fetchAuthToken() } returns mockToken
 
             // Act, Assert
-            viewModel.viewActions.test {
+            viewModel.uiSideEffect.test {
                 viewModel.onSitePaymentClick()
                 val action = awaitItem()
-                assertIs<WelcomeViewModel.ViewAction.OpenAccountView>(action)
+                assertIs<WelcomeViewModel.UiSideEffect.OpenAccountView>(action)
                 assertEquals(mockToken, action.token)
             }
         }
@@ -151,10 +151,10 @@ class WelcomeViewModelTest {
             every { mockExpiryDate.isAfter(any<ReadableInstant>()) } returns true
 
             // Act, Assert
-            viewModel.viewActions.test {
+            viewModel.uiSideEffect.test {
                 accountExpiryState.value = AccountExpiry.Available(mockExpiryDate)
                 val action = awaitItem()
-                assertIs<WelcomeViewModel.ViewAction.OpenConnectScreen>(action)
+                assertIs<WelcomeViewModel.UiSideEffect.OpenConnectScreen>(action)
             }
         }