Minor Changes done in TUITabBarTest

tarkalabs · Sep 21, 2023 · 5c1cd24 · 5c1cd24
1 parent 63d4618
commit 5c1cd24
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/TUITabBarTest.kt b/tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/TUITabBarTest.kt
@@ -13,7 +13,6 @@ import com.tarkalabs.tarkaicons.Tabs24
 import com.tarkalabs.tarkaicons.TarkaIcons
 import com.tarkalabs.uicomponents.components.TUITabBar
 import com.tarkalabs.uicomponents.components.TUITabBarTags
-import com.tarkalabs.uicomponents.components.TUITabTags
 import com.tarkalabs.uicomponents.components.TabItem
 import org.junit.Rule
 import org.junit.Test
@@ -44,9 +43,9 @@ class TUITabBarTest {
       )
     }
 
-    composeTestRule.onNodeWithTag("Tab 1 ${TUITabTags().parentTag}").assertIsDisplayed()
-    composeTestRule.onNodeWithTag("Tab 2 ${TUITabTags().parentTag}").assertIsDisplayed()
-    composeTestRule.onNodeWithTag("Tab 2 ${TUITabTags().parentTag}").assertIsDisplayed()
+    composeTestRule.onNodeWithTag(tabItems[0].name).assertIsDisplayed()
+    composeTestRule.onNodeWithTag(tabItems[1].name).assertIsDisplayed()
+    composeTestRule.onNodeWithTag(tabItems[2].name).assertIsDisplayed()
   }
 
   @Test
@@ -114,10 +113,10 @@ class TUITabBarTest {
     }
 
     //Third tab should be shown due to the selected index 2
-    composeTestRule.onNodeWithTag("Tab 3 ${TUITabTags().parentTag}").assertIsSelected()
+    composeTestRule.onNodeWithTag(tabItems[2].name, useUnmergedTree = true).assertIsSelected()
     //other tabs should not be shown
-    composeTestRule.onNodeWithTag("Tab 1 ${TUITabTags().parentTag}").assertIsNotSelected()
-    composeTestRule.onNodeWithTag("Tab 2 ${TUITabTags().parentTag}").assertIsNotSelected()
+    composeTestRule.onNodeWithTag(tabItems[0].name, useUnmergedTree = true).assertIsNotSelected()
+    composeTestRule.onNodeWithTag(tabItems[1].name, useUnmergedTree = true).assertIsNotSelected()
   }
 
   @Test
@@ -141,11 +140,11 @@ class TUITabBarTest {
     }
 
     var clickedTabIndex = 1
-    composeTestRule.onNodeWithTag("Tab 2 ${TUITabTags().parentTag}").performClick()
+    composeTestRule.onNodeWithTag(tabItems[1].name).performClick()
     verify(onTabChange).invoke(clickedTabIndex)
 
     clickedTabIndex = 2
-    composeTestRule.onNodeWithTag("Tab 3 ${TUITabTags().parentTag}").performClick()
+    composeTestRule.onNodeWithTag(tabItems[2].name).performClick()
     verify(onTabChange).invoke(clickedTabIndex)
   }
 

diff --git a/tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/TUITabTest.kt b/tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/TUITabTest.kt
@@ -40,7 +40,8 @@ class TUITabTest {
     composeTestRule.setContent {
       TUITab(title = "test", tags = testTags, onTabClicked = onClickLambda)
     }
-    composeTestRule.onNodeWithTag(testTags.parentTag).performClick()
+    //Tab title is the parent tag for TUITab
+    composeTestRule.onNodeWithTag("test").performClick()
     verify(onClickLambda).invoke()
   }
 }