Simplify list child declaration

lazy { getChild() } -> child {}
open-tool · Mar 7, 2024 · 598929d · 598929d
1 parent 379dbd7
commit 598929d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/sample-app/src/androidTest/java/com/atiurin/sampleapp/pages/ComposeListPage.kt b/sample-app/src/androidTest/java/com/atiurin/sampleapp/pages/ComposeListPage.kt
@@ -32,8 +32,10 @@ object ComposeListPage : Page<ComposeListPage>() {
     fun getContactItemByTestTag(contact: Contact): ComposeFriendListItem = lazyList.getItem(hasTestTag(getContactItemTestTagById(contact)))
     fun getContactItemByName(contact: Contact): ComposeFriendListItem = lazyList.getItem(hasAnyDescendant(hasText(contact.name) and hasTestTag(contactNameTestTag)))
     class ComposeFriendListItem : UltronComposeListItem() {
-        val name by lazy { getChild(hasTestTag(contactNameTestTag)) }
+        val name by child { hasTestTag(contactNameTestTag) }
         val status by lazy { getChild(hasTestTag(contactStatusTestTag)) }
-        val notExisted by lazy { getChild(hasTestTag("NotExistedChild")) }
+        val notExisted by child { hasTestTag("NotExistedChild") }
     }
-}
+}
+
+
diff --git a/sample-app/src/androidTest/java/com/atiurin/sampleapp/pages/FriendsListPage.kt b/sample-app/src/androidTest/java/com/atiurin/sampleapp/pages/FriendsListPage.kt
@@ -30,7 +30,7 @@ object FriendsListPage : Page<FriendsListPage>() {
     }
 
     class FriendRecyclerItem : UltronRecyclerViewItem() {
-        val name by lazy { getChild(withId(R.id.tv_name)) }
+        val name by child { withId(R.id.tv_name) }
         val status by lazy { getChild(withId(R.id.tv_status)) }
         val avatar by lazy { getChild(withId(R.id.avatar)) }
     }

diff --git a/ultron-compose/src/main/java/com/atiurin/ultron/core/compose/list/UltronComposeListItem.kt b/ultron-compose/src/main/java/com/atiurin/ultron/core/compose/list/UltronComposeListItem.kt
@@ -68,6 +68,10 @@ open class UltronComposeListItem {
      */
     protected constructor()
 
+    fun child(block: () -> SemanticsMatcher): Lazy<UltronComposeSemanticsNodeInteraction> = lazy {
+        getChild(block())
+    }
+
     fun setExecutor(ultronComposeList: UltronComposeList, itemMatcher: SemanticsMatcher) {
         this.executor = MatcherComposeItemExecutor(ultronComposeList, itemMatcher)
     }

diff --git a/ultron/src/main/java/com/atiurin/ultron/core/espresso/recyclerview/UltronRecyclerViewItem.kt b/ultron/src/main/java/com/atiurin/ultron/core/espresso/recyclerview/UltronRecyclerViewItem.kt
@@ -26,6 +26,10 @@ open class UltronRecyclerViewItem {
      */
     protected constructor()
 
+    fun child(block: () -> Matcher<View>): Lazy<Matcher<View>> = lazy {
+        getChild(block())
+    }
+
     constructor(
         ultronRecyclerView: UltronRecyclerView,
         itemViewMatcher: Matcher<View>,