summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAlbin <albin@mullvad.net>2023-07-25 08:18:59 +0200
committerAlbin <albin@mullvad.net>2023-08-01 11:45:31 +0200
commitd30da2ebd4badcff031320957c3e244986648aae (patch)
treeb8daf08d7233804171791010714088b71843a80a
parenta406d6df7995d0112c4b1dafb1636d8d92bec94b (diff)
downloadmullvadvpn-d30da2ebd4badcff031320957c3e244986648aae.tar.xz
mullvadvpn-d30da2ebd4badcff031320957c3e244986648aae.zip
Update unit tests
-rw-r--r--android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModelTest.kt14
1 files changed, 9 insertions, 5 deletions
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 5b1ee8e7e1..c08f8682eb 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
@@ -58,6 +58,7 @@ class ConnectViewModelTest {
private val mockRelayListListener: RelayListListener = mockk(relaxUnitFun = true)
private lateinit var mockAppVersionInfoCache: AppVersionInfoCache
private val mockConnectionProxy: ConnectionProxy = mockk()
+ private val mockLocation: GeoIpLocation = mockk(relaxed = true)
// Captures
private val locationSlot = slot<((GeoIpLocation?) -> Unit)>()
@@ -85,6 +86,9 @@ class ConnectViewModelTest {
every { mockConnectionProxy.onUiStateChange } returns eventNotifierTunnelUiState
every { mockConnectionProxy.onStateChange } returns eventNotifierTunnelRealState
+
+ every { mockLocation.country } returns "dummy country"
+
// Listeners
every { mockLocationInfoCache.onNewLocation = capture(locationSlot) } answers {}
every { mockRelayListListener.onRelayCountriesChange = capture(relaySlot) } answers {}
@@ -113,7 +117,7 @@ class ConnectViewModelTest {
assertEquals(ConnectUiState.INITIAL, awaitItem())
serviceConnectionState.value =
ServiceConnectionState.ConnectedReady(mockServiceConnectionContainer)
- locationSlot.captured.invoke(mockk(relaxed = true))
+ locationSlot.captured.invoke(mockLocation)
relaySlot.captured.invoke(mockk(), mockk())
viewModel.toggleTunnelInfoExpansion()
val result = awaitItem()
@@ -130,7 +134,7 @@ class ConnectViewModelTest {
assertEquals(ConnectUiState.INITIAL, awaitItem())
serviceConnectionState.value =
ServiceConnectionState.ConnectedReady(mockServiceConnectionContainer)
- locationSlot.captured.invoke(mockk(relaxed = true))
+ locationSlot.captured.invoke(mockLocation)
relaySlot.captured.invoke(mockk(), mockk())
eventNotifierTunnelRealState.notify(tunnelRealStateTestItem)
val result = awaitItem()
@@ -147,7 +151,7 @@ class ConnectViewModelTest {
assertEquals(ConnectUiState.INITIAL, awaitItem())
serviceConnectionState.value =
ServiceConnectionState.ConnectedReady(mockServiceConnectionContainer)
- locationSlot.captured.invoke(mockk(relaxed = true))
+ locationSlot.captured.invoke(mockLocation)
relaySlot.captured.invoke(mockk(), mockk())
eventNotifierTunnelUiState.notify(tunnelUiStateTestItem)
val result = awaitItem()
@@ -170,7 +174,7 @@ class ConnectViewModelTest {
assertEquals(ConnectUiState.INITIAL, awaitItem())
serviceConnectionState.value =
ServiceConnectionState.ConnectedReady(mockServiceConnectionContainer)
- locationSlot.captured.invoke(mockk(relaxed = true))
+ locationSlot.captured.invoke(mockLocation)
relaySlot.captured.invoke(mockk(), mockk())
versionInfo.value = versionInfoTestItem
val result = awaitItem()
@@ -188,7 +192,7 @@ class ConnectViewModelTest {
assertEquals(ConnectUiState.INITIAL, awaitItem())
serviceConnectionState.value =
ServiceConnectionState.ConnectedReady(mockServiceConnectionContainer)
- locationSlot.captured.invoke(mockk(relaxed = true))
+ locationSlot.captured.invoke(mockLocation)
relaySlot.captured.invoke(mockk(), relayTestItem)
val result = awaitItem()
assertEquals(relayTestItem, result.relayLocation)