Skip to content

Commit 4226443

Browse files
Temp commit for broken compose test
1 parent 2830e96 commit 4226443

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

samples/compose-samples/src/androidTest/java/com/squareup/sample/compose/launcher/SampleLauncherTest.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.squareup.sample.compose.launcher
22

3-
import androidx.compose.ui.test.ExperimentalTestApi
43
import androidx.compose.ui.test.assertIsDisplayed
54
import androidx.compose.ui.test.hasScrollToIndexAction
65
import androidx.compose.ui.test.junit4.createAndroidComposeRule
@@ -31,7 +30,6 @@ class SampleLauncherTest {
3130
.around(composeRule)
3231
.around(IdlingDispatcherRule)
3332

34-
@OptIn(ExperimentalTestApi::class)
3533
@Test
3634
fun allSamplesLaunch() {
3735
val appName =
@@ -46,6 +44,7 @@ class SampleLauncherTest {
4644
composeRule.onNodeWithText(sample.description)
4745
.performClick()
4846
pressBack()
47+
Thread.sleep(2000)
4948
} catch (e: Throwable) {
5049
throw AssertionError("Failed to launch sample ${sample.name}", e)
5150
}

samples/compose-samples/src/main/java/com/squareup/sample/compose/inlinerendering/InlineRenderingWorkflow.kt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import androidx.compose.animation.slideOutVertically
1212
import androidx.compose.animation.with
1313
import androidx.compose.foundation.layout.Box
1414
import androidx.compose.material.Button
15+
import androidx.compose.material.MaterialTheme
1516
import androidx.compose.material.Text
1617
import androidx.compose.runtime.Composable
1718
import androidx.compose.runtime.getValue
@@ -53,9 +54,8 @@ object InlineRenderingWorkflow : StatefulWorkflow<Unit, Int, Nothing, AndroidScr
5354
override fun snapshotState(state: Int): Snapshot = Snapshot.of(state)
5455
}
5556

56-
@Preview
5757
@Composable
58-
fun InlineRenderingWorkflowPreview() {
58+
fun InlineRenderingWorkflowRendering() {
5959
val rendering by InlineRenderingWorkflow.renderAsState(
6060
props = Unit,
6161
onOutput = {},
@@ -64,6 +64,12 @@ fun InlineRenderingWorkflowPreview() {
6464
WorkflowRendering(rendering, ViewEnvironment.EMPTY)
6565
}
6666

67+
@Preview(showBackground = true)
68+
@Composable
69+
internal fun InlineRenderingWorkflowPreview() {
70+
InlineRenderingWorkflowRendering()
71+
}
72+
6773
@OptIn(ExperimentalAnimationApi::class)
6874
@Composable
6975
private fun AnimatedCounter(

workflow-ui/compose/src/main/java/com/squareup/workflow1/ui/compose/RenderAsState.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,13 @@ private class WorkflowRuntimeState<PropsT, OutputT : Any, RenderingT>(
206206
onOutput = onOutput
207207
)
208208

209+
// TODO: Figure out why one test (scrolling a LazyColumn) these aren't getting set synchronously
210+
renderingState.value = renderings.value.rendering
211+
snapshotState.value = renderings.value.snapshot
212+
209213
renderings
210214
.onEach {
215+
// We have the rendering from above but its not passed to renderingState correctly? (it's still null)
211216
renderingState.value = it.rendering
212217
snapshotState.value = it.snapshot
213218
}

0 commit comments

Comments
 (0)