Skip to content

Commit b6d1f15

Browse files
svastvensvastven
committed
User waitUntil instead of delay
1 parent d7f1d30 commit b6d1f15

2 files changed

Lines changed: 61 additions & 47 deletions

File tree

‎compose/ui/ui/src/uikitInstrumentedTest/kotlin/androidx/compose/ui/interop/UIKitNavigationSwipeBackTest.kt‎

Lines changed: 35 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import androidx.compose.foundation.layout.systemBarsPadding
2525
import androidx.compose.foundation.pager.HorizontalPager
2626
import androidx.compose.foundation.pager.rememberPagerState
2727
import androidx.compose.runtime.Composable
28+
import androidx.compose.runtime.LaunchedEffect
2829
import androidx.compose.runtime.MutableIntState
2930
import androidx.compose.runtime.mutableIntStateOf
3031
import androidx.compose.ui.Modifier
@@ -55,38 +56,36 @@ internal abstract class UIKitNavigationSwipeBackTest(
5556
) {
5657
@Test
5758
fun testSwipeRightOnPagerDoesNotPopController() = runUIKitInstrumentedTest {
58-
val currentPage = mutableIntStateOf(0)
59+
val initialPage = 0
60+
val currentPage = mutableIntStateOf(initialPage)
5961

6062
setNavigationControllerContent {
6163
TestContent(currentPage = currentPage)
6264
}
6365

64-
delay(10)
65-
6666
findNodeWithTag("pager").swipeRight()
6767

68-
delay(500)
68+
waitForIdle()
6969

7070
assertEquals(2, navigationController.viewControllers.size)
7171
assertNotNull(findNodeWithTagOrNull("pager"))
72-
assertEquals(0, currentPage.value)
72+
assertEquals(initialPage, currentPage.value)
7373
}
7474

7575
@Test
7676
fun testSwipeLeftOnPagerChangesPage() = runUIKitInstrumentedTest {
77-
val currentPage = mutableIntStateOf(0)
77+
val initialPage = 0
78+
val currentPage = mutableIntStateOf(initialPage)
7879

7980
setNavigationControllerContent {
8081
TestContent(currentPage = currentPage)
8182
}
8283

83-
delay(10)
84-
8584
findNodeWithTag("pager").swipeLeft()
8685

8786
waitForIdle()
8887

89-
assertEquals(1, currentPage.value)
88+
assertEquals(initialPage + 1, currentPage.value)
9089
assertEquals(2, navigationController.viewControllers.size)
9190
}
9291

@@ -99,8 +98,6 @@ internal abstract class UIKitNavigationSwipeBackTest(
9998
TestContent(currentPage = currentPage)
10099
}
101100

102-
delay(10)
103-
104101
findNodeWithTag("outsideBox").swipeLeft()
105102

106103
assertEquals(initialPage, currentPage.value)
@@ -113,16 +110,14 @@ internal abstract class UIKitNavigationSwipeBackTest(
113110
TestContent(currentPage = mutableIntStateOf(1))
114111
}
115112

116-
delay(10)
117-
118113
swipeRightFromEdge()
119114

120-
// wait for pop animation to finish
121-
delay(500)
115+
waitUntil("Waiting for view controller to be popped") {
116+
navigationController.viewControllers.size == 1
117+
}
122118

123119
assertNull(findNodeWithTagOrNull("pager"))
124120
assertNull(findNodeWithTagOrNull("outsideBox"))
125-
assertEquals(1, navigationController.viewControllers.size)
126121
}
127122

128123
@Test
@@ -137,15 +132,12 @@ internal abstract class UIKitNavigationSwipeBackTest(
137132
TestContent(currentPage = currentPage)
138133
}
139134

140-
delay(10)
141-
142135
findNodeWithTag("outsideBox").swipe(
143136
fromPosition = { center() },
144137
toPosition = { rightCenter() },
145138
)
146139

147-
// wait for pop animation to finish if any
148-
delay(500)
140+
waitForIdle()
149141

150142
assertNotNull(findNodeWithTagOrNull("pager"))
151143
assertNotNull(findNodeWithTagOrNull("outsideBox"))
@@ -164,16 +156,14 @@ internal abstract class UIKitNavigationSwipeBackTest(
164156
TestContent(currentPage = currentPage)
165157
}
166158

167-
delay(10)
168-
169159
findNodeWithTag("outsideBox").swipeRight()
170160

171-
// wait for pop animation to finish
172-
delay(500)
161+
waitUntil("Waiting for view controller to be popped") {
162+
navigationController.viewControllers.size == 1
163+
}
173164

174165
assertNull(findNodeWithTagOrNull("pager"))
175166
assertNull(findNodeWithTagOrNull("outsideBox"))
176-
assertEquals(1, navigationController.viewControllers.size)
177167
}
178168

179169
@Test
@@ -188,16 +178,14 @@ internal abstract class UIKitNavigationSwipeBackTest(
188178
TestContent(currentPage = currentPage)
189179
}
190180

191-
delay(10)
192-
193181
swipeRightFromEdge()
194182

195-
// wait for pop animation to finish
196-
delay(500)
183+
waitUntil("Waiting for view controller to be popped") {
184+
navigationController.viewControllers.size == 1
185+
}
197186

198187
assertNull(findNodeWithTagOrNull("pager"))
199188
assertNull(findNodeWithTagOrNull("outsideBox"))
200-
assertEquals(1, navigationController.viewControllers.size)
201189
}
202190

203191
@Test
@@ -212,19 +200,17 @@ internal abstract class UIKitNavigationSwipeBackTest(
212200
TestContent(currentPage = currentPage)
213201
}
214202

215-
delay(10)
216-
217203
findNodeWithTag("outsideBox").swipe(
218204
fromPosition = { center() },
219205
toPosition = { rightCenter() },
220206
)
221207

222-
// wait for pop animation to finish
223-
delay(500)
208+
waitUntil("Waiting for view controller to be popped") {
209+
navigationController.viewControllers.size == 1
210+
}
224211

225212
assertNull(findNodeWithTagOrNull("pager"))
226213
assertNull(findNodeWithTagOrNull("outsideBox"))
227-
assertEquals(1, navigationController.viewControllers.size)
228214
}
229215

230216
private val UIKitInstrumentedTest.navigationController: UINavigationController get() {
@@ -233,12 +219,17 @@ internal abstract class UIKitNavigationSwipeBackTest(
233219

234220
private fun UIKitInstrumentedTest.setNavigationControllerContent(
235221
content: @Composable () -> Unit = {}
236-
) = setupWindow {
237-
val firstViewController = UIViewController()
238-
val secondViewController = createRootViewController(content = content)
222+
) {
223+
val composeViewController = createViewControllerHostingCompose(content = content)
224+
225+
setupWindow {
226+
UINavigationController().also {
227+
it.setViewControllers(listOf(UIViewController(), composeViewController), false)
228+
}
229+
}
239230

240-
UINavigationController().also {
241-
it.setViewControllers(listOf(firstViewController, secondViewController), false)
231+
waitUntil {
232+
composeViewController.view.window != null
242233
}
243234
}
244235

@@ -260,6 +251,10 @@ private fun TestContent(
260251
val pagerColors = listOf(Color.Red, Color.Green, Color.Blue)
261252
val pagerState = rememberPagerState(initialPage = currentPage.value) { 3 }
262253

254+
LaunchedEffect(pagerState.currentPage) {
255+
currentPage.value = pagerState.currentPage
256+
}
257+
263258
Column(
264259
modifier = Modifier
265260
.fillMaxSize()

‎compose/ui/ui/src/uikitInstrumentedTest/kotlin/androidx/compose/ui/test/UIKitInstrumentedTest.kt‎

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -265,9 +265,16 @@ internal class UIKitInstrumentedTest(
265265
content: @Composable () -> Unit
266266
) = setupWindow(
267267
interfaceOrientation = interfaceOrientation,
268-
rootViewController = { createRootViewController(configure, content) }
268+
rootViewController = { createViewControllerHostingCompose(configure, content) }
269269
)
270270

271+
/**
272+
* Installs [rootViewController] into the test window and waits until the Compose scene owned by
273+
* this [UIKitInstrumentedTest] is idle.
274+
*
275+
* Use this when a test needs a custom UIKit hierarchy around Compose, for example a navigation
276+
* controller or a view controller presented by UIKit.
277+
*/
271278
fun setupWindow(
272279
interfaceOrientation: UIInterfaceOrientation = UIInterfaceOrientationPortrait,
273280
rootViewController: () -> UIViewController,
@@ -286,18 +293,26 @@ internal class UIKitInstrumentedTest(
286293
}
287294
}
288295

289-
fun createRootViewController(
296+
/**
297+
* Creates a [UIViewController] that hosts [content] using the container variant selected by
298+
* [useHostingView].
299+
*/
300+
fun createViewControllerHostingCompose(
290301
configure: ComposeContainerConfiguration.() -> Unit = {},
291302
content: @Composable () -> Unit
292303
): UIViewController = if (useHostingView) {
293304
UIViewController().also {
294-
it.view.embedSubview(createHostingView(configure, content))
305+
it.view.embedSubview(createComposeHostingView(configure, content))
295306
}
296307
} else {
297-
createHostingViewController(configure, content)
308+
createComposeHostingViewController(configure, content)
298309
}
299310

300-
fun createHostingView(
311+
/**
312+
* Creates a [ComposeHostingView] for [content] and records it as the active Compose container
313+
* for idleness and redrawer checks.
314+
*/
315+
fun createComposeHostingView(
301316
configure: ComposeUIViewConfiguration.() -> Unit = {},
302317
content: @Composable () -> Unit
303318
): ComposeHostingView {
@@ -314,7 +329,11 @@ internal class UIKitInstrumentedTest(
314329
}
315330
}
316331

317-
fun createHostingViewController(
332+
/**
333+
* Creates a [ComposeHostingViewController] for [content] and records it as the active Compose
334+
* container for idleness and redrawer checks.
335+
*/
336+
fun createComposeHostingViewController(
318337
configure: ComposeUIViewControllerConfiguration.() -> Unit = {},
319338
content: @Composable () -> Unit
320339
): ComposeHostingViewController {
@@ -812,4 +831,4 @@ internal fun UIKitInstrumentedTest.waitForContextMenu() {
812831
} != null
813832
}
814833
delay(500) // wait for toolbar animation
815-
}
834+
}

0 commit comments

Comments
 (0)