diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2024-01-19 13:42:51 +0100 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2024-01-19 13:42:51 +0100 |
| commit | e0d794cd11d76e3d716b93cc84ec0bef9a7fe63d (patch) | |
| tree | 85ccbf5c27ba0cf2d701c03c709e3b205a9850c1 /android/app/src/androidTest | |
| parent | c5ad442486179cbb49dfb3ced05adb30f37ac54b (diff) | |
| parent | 7efda2d553370be150a0ccc789f76ca3c68bf554 (diff) | |
| download | mullvadvpn-e0d794cd11d76e3d716b93cc84ec0bef9a7fe63d.tar.xz mullvadvpn-e0d794cd11d76e3d716b93cc84ec0bef9a7fe63d.zip | |
Merge branch 'missing-relay-list-in-location-selection-view-droid-574'
Diffstat (limited to 'android/app/src/androidTest')
| -rw-r--r-- | android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreenTest.kt | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreenTest.kt index fbc8b046fd..bb64adc8a6 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreenTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreenTest.kt @@ -9,6 +9,7 @@ import io.mockk.MockKAnnotations import io.mockk.mockk import io.mockk.verify import net.mullvad.mullvadvpn.compose.setContentWithTheme +import net.mullvad.mullvadvpn.compose.state.RelayListState import net.mullvad.mullvadvpn.compose.state.SelectLocationUiState import net.mullvad.mullvadvpn.compose.test.CIRCULAR_PROGRESS_INDICATOR import net.mullvad.mullvadvpn.model.Constraint @@ -54,9 +55,12 @@ class SelectLocationScreenTest { setContentWithTheme { SelectLocationScreen( uiState = - SelectLocationUiState.ShowData( - countries = DUMMY_RELAY_COUNTRIES, - selectedRelay = null, + SelectLocationUiState.Data( + relayListState = + RelayListState.RelayList( + countries = DUMMY_RELAY_COUNTRIES, + selectedRelay = null + ), selectedOwnership = null, selectedProvidersCount = 0, searchTerm = "" @@ -91,9 +95,12 @@ class SelectLocationScreenTest { setContentWithTheme { SelectLocationScreen( uiState = - SelectLocationUiState.ShowData( - countries = updatedDummyList, - selectedRelay = updatedDummyList[0].cities[0].relays[0], + SelectLocationUiState.Data( + relayListState = + RelayListState.RelayList( + countries = updatedDummyList, + selectedRelay = updatedDummyList[0].cities[0].relays[0] + ), selectedOwnership = null, selectedProvidersCount = 0, searchTerm = "" @@ -118,9 +125,12 @@ class SelectLocationScreenTest { setContentWithTheme { SelectLocationScreen( uiState = - SelectLocationUiState.ShowData( - countries = emptyList(), - selectedRelay = null, + SelectLocationUiState.Data( + relayListState = + RelayListState.RelayList( + countries = emptyList(), + selectedRelay = null + ), selectedOwnership = null, selectedProvidersCount = 0, searchTerm = "" @@ -146,9 +156,8 @@ class SelectLocationScreenTest { setContentWithTheme { SelectLocationScreen( uiState = - SelectLocationUiState.ShowData( - countries = emptyList(), - selectedRelay = null, + SelectLocationUiState.Data( + relayListState = RelayListState.Empty, selectedOwnership = null, selectedProvidersCount = 0, searchTerm = mockSearchString |