Fix LazyList testing (#262)

phansier · Aug 19, 2024 · 87a8534 · 87a8534
1 parent 8c6a6f6
commit 87a8534
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 6 deletions.
diff --git a/app/src/androidTest/java/ru/beryukhov/coffeegram/ComposeAppTest.kt b/app/src/androidTest/java/ru/beryukhov/coffeegram/ComposeAppTest.kt
@@ -1,10 +1,12 @@
 package ru.beryukhov.coffeegram
 
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import io.github.kakaocup.compose.node.element.ComposeScreen
 import org.junit.Rule
 import org.junit.Test
 
+@OptIn(ExperimentalTestApi::class)
 class ComposeAppTest {
     @get:Rule
     val composeTestRule = createAndroidComposeRule<MainActivity>()
@@ -18,10 +20,15 @@ class ComposeAppTest {
             }
         }
         ComposeScreen.onComposeScreen<CoffeeListScreen>(composeTestRule) {
+            // composeTestRule.onRoot().printToLog("TEST_")
             assertIsDisplayed()
-            coffeeList.assertLengthEquals(42)
-//                CappuccinoItem.assertIsDisplayed()
-//                LatteItem.assertIsDisplayed()
+            coffeeList.assertLengthEquals(12)
+            coffeeList.childAt<CoffeeItemNode>(0) {
+                title.assertTextEquals("Cappuccino")
+            }
+            coffeeList.childAt<CoffeeItemNode>(1) {
+                title.assertTextEquals("Latte")
+            }
         }
         }
 }
diff --git a/app/src/main/java/ru/beryukhov/coffeegram/PagesContent.kt b/app/src/main/java/ru/beryukhov/coffeegram/PagesContent.kt
@@ -25,6 +25,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
@@ -97,7 +98,7 @@ fun PagesContent(
         }, snackbarHost = {
             SnackbarHost(hostState = snackbarHostState)
         }) {
-            Column(modifier = Modifier.padding(it)) {
+            Column(modifier = Modifier.padding(it).testTag(currentNavigationState.mapTestTag())) {
                 Spacer(
                     Modifier
                         .padding(top = topPadding)

diff --git a/app/src/main/java/ru/beryukhov/coffeegram/model/NavigationStore.kt b/app/src/main/java/ru/beryukhov/coffeegram/model/NavigationStore.kt
@@ -45,6 +45,13 @@ sealed interface NavigationIntent {
 }
 
 sealed interface NavigationState {
+    fun mapTestTag(): String = when (this) {
+        is CoffeeListPage -> "CoffeeListScreen"
+        MapPage -> "MapScreen"
+        SettingsPage -> "SettingsScreen"
+        is TablePage -> "TableScreen"
+    }
+
     class TablePage(val yearMonth: YearMonth) : NavigationState
     data class CoffeeListPage(val date: LocalDate) : NavigationState
     object SettingsPage : NavigationState

diff --git a/app/src/main/java/ru/beryukhov/coffeegram/pages/CoffeeListPage.kt b/app/src/main/java/ru/beryukhov/coffeegram/pages/CoffeeListPage.kt
@@ -85,7 +85,7 @@ fun CoffeeListPage(
         coffeeItems = coffeeListViewModel.getDayCoffeesWithEmpty(localDate).toPersistentList(),
         onPlusClick = onPlusClick,
         onMinusClick = onMinusClick,
-        modifier = modifier.testTag("CoffeeListScreen")
+        modifier = modifier
     )
 }
 
@@ -99,8 +99,8 @@ private fun CoffeeList(
     LazyColumn(
         modifier = modifier
             .fillMaxHeight()
-            .testTag("CoffeeList")
             .lazyListLength(coffeeItems.size)
+            .testTag("CoffeeList")
     ) {
         itemsIndexed(items = coffeeItems) { index, model ->
             val (type, count) = model