Merge branch 'refactor-preview-parameters-droid-1012'

2 files changed, 6 insertions, 6 deletions

diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/EditCustomListViewModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/EditCustomListViewModelTest.kt
index 5d0ecff5df..34eb77319b 100644
--- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/EditCustomListViewModelTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/EditCustomListViewModelTest.kt
@@ -8,7 +8,7 @@ import kotlin.test.assertIs
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.test.runTest
 import net.mullvad.mullvadvpn.compose.dialog.EditCustomListNameNavArgs
-import net.mullvad.mullvadvpn.compose.state.EditCustomListState
+import net.mullvad.mullvadvpn.compose.state.EditCustomListUiState
 import net.mullvad.mullvadvpn.lib.common.test.TestCoroutineRule
 import net.mullvad.mullvadvpn.lib.model.CustomList
 import net.mullvad.mullvadvpn.lib.model.CustomListId
@@ -34,7 +34,7 @@ class EditCustomListViewModelTest {
         // Act, Assert
         viewModel.uiState.test {
             val item = awaitItem()
-            assertIs<EditCustomListState.NotFound>(item)
+            assertIs<EditCustomListUiState.NotFound>(item)
         }
     }
 
@@ -50,7 +50,7 @@ class EditCustomListViewModelTest {
         // Act, Assert
         viewModel.uiState.test {
             val item = awaitItem()
-            assertIs<EditCustomListState.Content>(item)
+            assertIs<EditCustomListUiState.Content>(item)
             assertEquals(item.id, customList.id)
             assertEquals(item.name, customList.name)
             assertEquals(item.locations, customList.locations)
diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/ServerIpOverridesViewModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/ServerIpOverridesViewModelTest.kt
index 6203d54b63..484a24fc29 100644
--- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/ServerIpOverridesViewModelTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/ServerIpOverridesViewModelTest.kt
@@ -57,15 +57,15 @@ class ServerIpOverridesViewModelTest {
 
     @Test
     fun `ensure state is loading by default`() = runTest {
-        viewModel.uiState.test { assertEquals(ServerIpOverridesViewState.Loading, awaitItem()) }
+        viewModel.uiState.test { assertEquals(ServerIpOverridesUiState.Loading, awaitItem()) }
     }
 
     @Test
     fun `when server ip overrides are empty ui state overrides should be inactive`() = runTest {
         viewModel.uiState.test {
-            assertEquals(ServerIpOverridesViewState.Loading, awaitItem())
+            assertEquals(ServerIpOverridesUiState.Loading, awaitItem())
             relayOverrides.emit(emptyList())
-            assertEquals(ServerIpOverridesViewState.Loaded(false), awaitItem())
+            assertEquals(ServerIpOverridesUiState.Loaded(false), awaitItem())
         }
     }