Fix tests

Author: Rawa

android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreenTest.kt

@@ -18,6 +18,9 @@ import net.mullvad.mullvadvpn.compose.test.CIRCULAR_PROGRESS_INDICATOR
 import net.mullvad.mullvadvpn.compose.test.SELECT_LOCATION_CUSTOM_LIST_BOTTOM_SHEET_TEST_TAG
 import net.mullvad.mullvadvpn.compose.test.SELECT_LOCATION_CUSTOM_LIST_HEADER_TEST_TAG
 import net.mullvad.mullvadvpn.compose.test.SELECT_LOCATION_LOCATION_BOTTOM_SHEET_TEST_TAG
+import net.mullvad.mullvadvpn.lib.model.CustomListId
+import net.mullvad.mullvadvpn.lib.model.CustomListName
+import net.mullvad.mullvadvpn.lib.model.GeoLocationId
 import net.mullvad.mullvadvpn.lib.model.RelayItem
 import net.mullvad.mullvadvpn.performLongClick
 import org.junit.jupiter.api.BeforeEach
@@ -61,7 +64,6 @@ class SelectLocationScreenTest {
                                 DUMMY_RELAY_COUNTRIES.map {
                                     RelayListItem.GeoLocationItem(item = it)
                                 },
-                            customLists = emptyList(),
                         ),
                 )
             }
@@ -87,7 +89,6 @@ class SelectLocationScreenTest {
                             searchTerm = "",
                             filterChips = emptyList(),
                             relayListItems = emptyList(),
-                            customLists = emptyList()
                         ),
                     onSearchTermInput = mockedSearchTermInput
                 )
@@ -115,7 +116,6 @@ class SelectLocationScreenTest {
                             filterChips = emptyList(),
                             relayListItems =
                                 listOf(RelayListItem.LocationsEmptyText(mockSearchString)),
-                            customLists = emptyList(),
                         ),
                     onSearchTermInput = mockedSearchTermInput
                 )
@@ -138,7 +138,6 @@ class SelectLocationScreenTest {
                             searchTerm = mockSearchString,
                             filterChips = emptyList(),
                             relayListItems = listOf(RelayListItem.CustomListFooter(false)),
-                            customLists = emptyList(),
                         ),
                 )
             }
@@ -159,7 +158,6 @@ class SelectLocationScreenTest {
                             searchTerm = mockSearchString,
                             filterChips = emptyList(),
                             relayListItems = emptyList(),
-                            customLists = DUMMY_RELAY_ITEM_CUSTOM_LISTS,
                         ),
                 )
             }
@@ -182,7 +180,6 @@ class SelectLocationScreenTest {
                             searchTerm = "",
                             filterChips = emptyList(),
                             relayListItems = listOf(RelayListItem.CustomListItem(customList)),
-                            customLists = DUMMY_RELAY_ITEM_CUSTOM_LISTS
                         ),
                     onSelectRelay = mockedOnSelectRelay
                 )
@@ -200,7 +197,7 @@ class SelectLocationScreenTest {
         composeExtension.use {
             // Arrange
             val customList = DUMMY_RELAY_ITEM_CUSTOM_LISTS[0]
-            val mockedOnSelectRelay: (RelayItem) -> Unit = mockk(relaxed = true)
+            val mockedOnSelectRelay: (CustomListId, CustomListName) -> Unit = mockk(relaxed = true)
             setContentWithTheme {
                 SelectLocationScreen(
                     state =
@@ -209,43 +206,41 @@ class SelectLocationScreenTest {
                             filterChips = emptyList(),
                             relayListItems =
                                 listOf(RelayListItem.CustomListItem(item = customList)),
-                            customLists = DUMMY_RELAY_ITEM_CUSTOM_LISTS
                         ),
-                    onSelectRelay = mockedOnSelectRelay
+                    showEditCustomListBottomSheet = mockedOnSelectRelay
                 )
             }
 
             // Act
             onNodeWithText(customList.name).performLongClick()
 
             // Assert
-            onNodeWithTag(SELECT_LOCATION_CUSTOM_LIST_BOTTOM_SHEET_TEST_TAG)
+            verify { mockedOnSelectRelay(customList.id, customList.customList.name) }
         }
 
     @Test
     fun whenLocationIsLongClickedShouldShowBottomSheet() =
         composeExtension.use {
             // Arrange
             val relayItem = DUMMY_RELAY_COUNTRIES[0]
-            val mockedOnSelectRelay: (RelayItem) -> Unit = mockk(relaxed = true)
+            val mockedOnSelectRelay: (String, GeoLocationId) -> Unit = mockk(relaxed = true)
             setContentWithTheme {
                 SelectLocationScreen(
                     state =
                         SelectLocationUiState.Content(
                             searchTerm = "",
                             filterChips = emptyList(),
                             relayListItems = listOf(RelayListItem.GeoLocationItem(relayItem)),
-                            customLists = emptyList(),
                         ),
-                    onSelectRelay = mockedOnSelectRelay
+                    showLocationBottomSheet = mockedOnSelectRelay
                 )
             }
 
             // Act
             onNodeWithText(relayItem.name).performLongClick()
 
             // Assert
-            onNodeWithTag(SELECT_LOCATION_LOCATION_BOTTOM_SHEET_TEST_TAG)
+            verify { mockedOnSelectRelay(relayItem.name, relayItem.id) }
         }
 
     companion object {

android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/compose/ComposeDestinationsTest.kt

@@ -23,6 +23,6 @@ class ComposeDestinationsTest {
         Konsist.scopeFromProduction("app").functions().withAllAnnotationsOf(Destination::class)
 
     companion object {
-        private val DESTINATION_SUFFIXES = listOf("Screen", "Dialog")
+        private val DESTINATION_SUFFIXES = listOf("Screen", "Dialog", "Sheet")
     }
 }