Merge pull request #125 from KakaoCup/develop

Develop
KakaoCup · Apr 10, 2024 · a0216bf · a0216bf
2 parents 2b067f1 + 6ac0b73
commit a0216bf
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 20 deletions.
diff --git a/kakao/src/main/kotlin/io/github/kakaocup/kakao/chipgroup/ChipGroupActions.kt b/kakao/src/main/kotlin/io/github/kakaocup/kakao/chipgroup/ChipGroupActions.kt
@@ -25,10 +25,8 @@ interface ChipGroupActions : BaseActions {
                 if (view is ChipGroup) {
                     for (i in 0 until view.childCount) {
                         val chip = view.getChildAt(i)
-                        if (chip is Chip) {
-                            if (chip.text == text) {
-                                chip.performClick()
-                            }
+                        if (chip is Chip && text.contentEquals(chip.text)) {
+                            chip.performClick()
                         }
                     }
                 }

diff --git a/sample/src/androidTest/kotlin/io/github/kakaocup/sample/ChipGroupTest.kt b/sample/src/androidTest/kotlin/io/github/kakaocup/sample/ChipGroupTest.kt
@@ -16,32 +16,44 @@ class ChipGroupTest {
     val rule = ActivityScenarioRule(ChipGroupActivity::class.java)
 
     @Test
-    fun testChipGroupInteraction() {
+    fun testSelectChipByText() {
         onScreen<ChipGroupActivityScreen> {
             chipGroup {
-                selectChip("Chip2")
-
-                isChipSelected("Chip2")
-
-                isChipSelected(`is`("Chip2"))
+                val chipText = "Chip2"
+                selectChip(chipText)
+                isChipSelected(chipText)
+                isChipSelected(`is`(chipText))
+            }
+        }
+    }
 
+    @Test
+    fun testSelectChipByIndex() {
+        onScreen<ChipGroupActivityScreen> {
+            chipGroup {
                 selectChipAt(3)
-
                 isChipSelected("Chip4")
-
-                hasSize(4)
             }
+        }
+    }
 
+    @Test
+    fun testSelectChipById() {
+        onScreen<ChipGroupActivityScreen> {
+            val chipId = R.id.chip1
             chipGroup1 {
-                hasChip(R.id.chip1)
-
-                selectChip(R.id.chip1)
-
-                isChipSelected(R.id.chip1)
-
-                hasSize(1)
+                hasChip(chipId)
+                selectChip(chipId)
+                isChipSelected(chipId)
             }
         }
     }
 
+    @Test
+    fun testChipsGroupSize() {
+        onScreen<ChipGroupActivityScreen> {
+            chipGroup { hasSize(4) }
+            chipGroup1 { hasSize(1) }
+        }
+    }
 }