Skip to content

Commit a045de3

Browse files
authored
Merge pull request #112 from yml-org/bug/CM-1489
[bug/CM-1492]: Updated node info and fixed the ui test issue.
2 parents 9d13d10 + d2ee462 commit a045de3

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

YChartsLib/src/androidTest/java/co/yml/charts/barchart/StackedBarChartTest.kt

+2-5
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@ import androidx.compose.ui.Modifier
44
import androidx.compose.ui.graphics.Color
55
import androidx.compose.ui.test.assertCountEquals
66
import androidx.compose.ui.test.assertIsDisplayed
7-
import androidx.compose.ui.test.hasAnyChild
8-
import androidx.compose.ui.test.hasClickAction
97
import androidx.compose.ui.test.junit4.createComposeRule
8+
import androidx.compose.ui.test.onAllNodesWithTag
109
import androidx.compose.ui.test.onChildren
1110
import androidx.compose.ui.test.onFirst
1211
import androidx.compose.ui.test.onNodeWithTag
@@ -130,9 +129,7 @@ class StackedBarChartTest {
130129
@Test
131130
fun assertIfStackedBarClicked() {
132131
startStackedBarChart()
133-
134-
composeTestRule.onNode(hasAnyChild(hasClickAction()), useUnmergedTree = true)
135-
.onChildren()
132+
composeTestRule.onAllNodesWithTag("chart_canvas", useUnmergedTree = true)
136133
.onFirst()
137134
.performClick()
138135
}

YChartsLib/src/androidTest/java/co/yml/charts/wavechart/WaveChartTest.kt

+5-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import androidx.compose.ui.graphics.Color
77
import androidx.compose.ui.graphics.drawscope.Stroke
88
import androidx.compose.ui.test.assertIsDisplayed
99
import androidx.compose.ui.test.junit4.createComposeRule
10+
import androidx.compose.ui.test.onAllNodesWithTag
11+
import androidx.compose.ui.test.onFirst
1012
import androidx.compose.ui.test.onNodeWithTag
1113
import androidx.compose.ui.unit.dp
1214
import co.yml.charts.axis.AxisData
@@ -102,7 +104,9 @@ class WaveChartTest {
102104
composeTestRule.setContent {
103105
WaveChart(modifier = Modifier, waveChartData = data)
104106
}
105-
composeTestRule.onNodeWithTag("scrollable_container").assertIsDisplayed()
107+
composeTestRule.onAllNodesWithTag(testTag = "scrollable_container", useUnmergedTree = true)
108+
.onFirst()
109+
.assertIsDisplayed()
106110
}
107111

108112
@Test

0 commit comments

Comments
 (0)