Fix test tags

Author: kl

android/lib/feature/location/impl/src/androidTest/kotlin/net/mullvad/mullvadvpn/feature/location/impl/SelectLocationScreenTest.kt

@@ -34,7 +34,7 @@ import net.mullvad.mullvadvpn.lib.model.RelayListType
 import net.mullvad.mullvadvpn.lib.ui.component.relaylist.RelayListItem
 import net.mullvad.mullvadvpn.lib.ui.designsystem.Hierarchy
 import net.mullvad.mullvadvpn.lib.ui.designsystem.Position
-import net.mullvad.mullvadvpn.lib.ui.tag.GEOLOCATION_NAME_TAG
+import net.mullvad.mullvadvpn.lib.ui.tag.GEOLOCATION_ITEM_TAG
 import net.mullvad.mullvadvpn.lib.ui.tag.RECENT_CELL_TEST_TAG
 import net.mullvad.mullvadvpn.lib.ui.tag.SELECT_LOCATION_CUSTOM_LIST_BOTTOM_SHEET_TEST_TAG
 import net.mullvad.mullvadvpn.lib.ui.tag.SELECT_LOCATION_LOCATION_BOTTOM_SHEET_TEST_TAG
@@ -495,7 +495,7 @@ class SelectLocationScreenTest {
 
             // Assert
             onNodeTextAndAncestorTag(
-                    ancestorTag = GEOLOCATION_NAME_TAG,
+                    ancestorTag = GEOLOCATION_ITEM_TAG,
                     text = selectableItem.name,
                     useUnmergedTree = true,
                 )

android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/relaylist/SelectableRelayListItem.kt

@@ -19,10 +19,11 @@ import net.mullvad.mullvadvpn.lib.ui.component.ExpandChevronDivider
 import net.mullvad.mullvadvpn.lib.ui.component.listitem.SelectableListItem
 import net.mullvad.mullvadvpn.lib.ui.designsystem.ListItemClickArea
 import net.mullvad.mullvadvpn.lib.ui.resource.R
-import net.mullvad.mullvadvpn.lib.ui.tag.CUSTOM_LIST_ENTRY_NAME_TAG
+import net.mullvad.mullvadvpn.lib.ui.tag.CUSTOM_LIST_ENTRY_ITEM_TAG
+import net.mullvad.mullvadvpn.lib.ui.tag.CUSTOM_LIST_ITEM_TAG
 import net.mullvad.mullvadvpn.lib.ui.tag.EXPAND_BUTTON_TEST_TAG
-import net.mullvad.mullvadvpn.lib.ui.tag.GEOLOCATION_NAME_TAG
-import net.mullvad.mullvadvpn.lib.ui.tag.RECENT_NAME_TAG
+import net.mullvad.mullvadvpn.lib.ui.tag.GEOLOCATION_ITEM_TAG
+import net.mullvad.mullvadvpn.lib.ui.tag.RECENT_ITEM_TAG
 import net.mullvad.mullvadvpn.lib.ui.theme.AppTheme
 import net.mullvad.mullvadvpn.lib.ui.theme.color.AlphaInactive
 import net.mullvad.mullvadvpn.lib.ui.theme.color.AlphaVisible
@@ -65,10 +66,10 @@ fun SelectableRelayListItem(
         onLongClick = onLongClick,
         testTag =
             when (relayListItem) {
-                is RelayListItem.CustomListEntryItem -> CUSTOM_LIST_ENTRY_NAME_TAG
-                is RelayListItem.CustomListItem -> CUSTOM_LIST_ENTRY_NAME_TAG
-                is RelayListItem.GeoLocationItem -> GEOLOCATION_NAME_TAG
-                is RelayListItem.RecentListItem -> RECENT_NAME_TAG
+                is RelayListItem.CustomListEntryItem -> CUSTOM_LIST_ENTRY_ITEM_TAG
+                is RelayListItem.CustomListItem -> CUSTOM_LIST_ITEM_TAG
+                is RelayListItem.GeoLocationItem -> GEOLOCATION_ITEM_TAG
+                is RelayListItem.RecentListItem -> RECENT_ITEM_TAG
             },
         trailingContent = {
             if (relayListItem.canExpand) {

android/lib/ui/tag/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/tag/TestTagConstants.kt

@@ -61,10 +61,10 @@ const val LOCATION_CELL_TEST_TAG = "location_cell_test_tag"
 const val RECENT_CELL_TEST_TAG = "recent_cell_test_tag"
 const val HOP_SELECTOR_ENTRY_TEST_TAG = "hop_selector_entry_test_tag"
 
-const val GEOLOCATION_NAME_TAG = "geolocation_name_test_tag"
-const val CUSTOM_LIST_NAME_TAG = "custom_list_name_test_tag"
-const val CUSTOM_LIST_ENTRY_NAME_TAG = "custom_list_entry_name_test_tag"
-const val RECENT_NAME_TAG = "recent_name_test_tag"
+const val GEOLOCATION_ITEM_TAG = "geolocation_item_test_tag"
+const val CUSTOM_LIST_ITEM_TAG = "custom_list_item_test_tag"
+const val CUSTOM_LIST_ENTRY_ITEM_TAG = "custom_list_entry_item_test_tag"
+const val RECENT_ITEM_TAG = "recent_item_test_tag"
 // ConnectScreen
 const val SELECT_LOCATION_BUTTON_TEST_TAG = "select_location_button_test_tag"
 const val CONNECT_BUTTON_TEST_TAG = "connect_button_test_tag"

android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/page/SelectLocationPage.kt

@@ -5,7 +5,7 @@ import androidx.test.uiautomator.Direction
 import androidx.test.uiautomator.Until
 import androidx.test.uiautomator.waitForStableInActiveWindow
 import net.mullvad.mullvadvpn.lib.ui.tag.EXPAND_BUTTON_TEST_TAG
-import net.mullvad.mullvadvpn.lib.ui.tag.GEOLOCATION_NAME_TAG
+import net.mullvad.mullvadvpn.lib.ui.tag.GEOLOCATION_ITEM_TAG
 import net.mullvad.mullvadvpn.lib.ui.tag.SELECT_LOCATION_LIST_TEST_TAG
 import net.mullvad.mullvadvpn.lib.ui.tag.SELECT_LOCATION_MENU_BUTTON_TEST_TAG
 import net.mullvad.mullvadvpn.lib.ui.tag.SELECT_LOCATION_SCREEN_TEST_TAG
@@ -20,7 +20,9 @@ class SelectLocationPage internal constructor() : Page() {
     fun clickLocationExpandButton(locationName: String) {
         val locationCell =
             uiDevice
-                .findObjectWithTimeout(By.textContains(locationName).res(GEOLOCATION_NAME_TAG))
+                .findObjectWithTimeout(
+                    By.textContains(locationName).hasAncestor(By.res(GEOLOCATION_ITEM_TAG))
+                )
                 .parent
                 .parent
         val expandButton = locationCell.findObjectWithTimeout(By.res(EXPAND_BUTTON_TEST_TAG))