Use an alpha channel in AbstractFlexContainerTest subtypes (#1576)

This is intended to help test nesting containers.
cashapp · Oct 11, 2023 · fd7cee4 · fd7cee4
1 parent 8cf09be
commit fd7cee4
Show file tree

Hide file tree

Showing 247 changed files with 501 additions and 491 deletions.
diff --git a/...rc/androidUnitTest/kotlin/app/cash/redwood/layout/composeui/ComposeUiFlexContainerTest.kt b/...rc/androidUnitTest/kotlin/app/cash/redwood/layout/composeui/ComposeUiFlexContainerTest.kt
@@ -85,7 +85,7 @@ class ComposeUiFlexContainerTest(
 
     constructor(direction: FlexDirection) : this(
       ComposeUiFlexContainer(direction).apply {
-        testOnlyModifier = Modifier.background(Color.Blue)
+        testOnlyModifier = Modifier.background(Color(0, 0, 255, 51))
       },
     )
 

diff --git a/..._ComposeUiFlexContainerTest_columnWithUpdatedCrossAxisAlignment[LTR]_center.png b/..._ComposeUiFlexContainerTest_columnWithUpdatedCrossAxisAlignment[LTR]_center.png
diff --git a/...ComposeUiFlexContainerTest_columnWithUpdatedCrossAxisAlignment[LTR]_flexend.png b/...ComposeUiFlexContainerTest_columnWithUpdatedCrossAxisAlignment[LTR]_flexend.png
diff --git a/..._ComposeUiFlexContainerTest_columnWithUpdatedCrossAxisAlignment[RTL]_center.png b/..._ComposeUiFlexContainerTest_columnWithUpdatedCrossAxisAlignment[RTL]_center.png
diff --git a/...ComposeUiFlexContainerTest_columnWithUpdatedCrossAxisAlignment[RTL]_flexend.png b/...ComposeUiFlexContainerTest_columnWithUpdatedCrossAxisAlignment[RTL]_flexend.png
diff --git a/...poseui_ComposeUiFlexContainerTest_testChildWithUpdatedProperty[LTR]_initial.png b/...poseui_ComposeUiFlexContainerTest_testChildWithUpdatedProperty[LTR]_initial.png
diff --git a/...poseui_ComposeUiFlexContainerTest_testChildWithUpdatedProperty[LTR]_updated.png b/...poseui_ComposeUiFlexContainerTest_testChildWithUpdatedProperty[LTR]_updated.png
diff --git a/...poseui_ComposeUiFlexContainerTest_testChildWithUpdatedProperty[RTL]_initial.png b/...poseui_ComposeUiFlexContainerTest_testChildWithUpdatedProperty[RTL]_initial.png
diff --git a/...poseui_ComposeUiFlexContainerTest_testChildWithUpdatedProperty[RTL]_updated.png b/...poseui_ComposeUiFlexContainerTest_testChildWithUpdatedProperty[RTL]_updated.png
diff --git a/...seui_ComposeUiFlexContainerTest_testColumnWithMainAxisAlignment_Center[LTR].png b/...seui_ComposeUiFlexContainerTest_testColumnWithMainAxisAlignment_Center[LTR].png
diff --git a/...seui_ComposeUiFlexContainerTest_testColumnWithMainAxisAlignment_Center[RTL].png b/...seui_ComposeUiFlexContainerTest_testColumnWithMainAxisAlignment_Center[RTL].png
diff --git a/...ComposeUiFlexContainerTest_testColumnWithMainAxisAlignment_SpaceAround[LTR].png b/...ComposeUiFlexContainerTest_testColumnWithMainAxisAlignment_SpaceAround[LTR].png
diff --git a/...ComposeUiFlexContainerTest_testColumnWithMainAxisAlignment_SpaceAround[RTL].png b/...ComposeUiFlexContainerTest_testColumnWithMainAxisAlignment_SpaceAround[RTL].png
diff --git a/...omposeUiFlexContainerTest_testColumnWithMainAxisAlignment_SpaceBetween[LTR].png b/...omposeUiFlexContainerTest_testColumnWithMainAxisAlignment_SpaceBetween[LTR].png
diff --git a/...omposeUiFlexContainerTest_testColumnWithMainAxisAlignment_SpaceBetween[RTL].png b/...omposeUiFlexContainerTest_testColumnWithMainAxisAlignment_SpaceBetween[RTL].png
diff --git a/...composeui_ComposeUiFlexContainerTest_testContainerWithFixedHeightItems[LTR].png b/...composeui_ComposeUiFlexContainerTest_testContainerWithFixedHeightItems[LTR].png
diff --git a/...composeui_ComposeUiFlexContainerTest_testContainerWithFixedHeightItems[RTL].png b/...composeui_ComposeUiFlexContainerTest_testContainerWithFixedHeightItems[RTL].png
diff --git a/...t.composeui_ComposeUiFlexContainerTest_testContainerWithFixedSizeItems[LTR].png b/...t.composeui_ComposeUiFlexContainerTest_testContainerWithFixedSizeItems[LTR].png
diff --git a/...t.composeui_ComposeUiFlexContainerTest_testContainerWithFixedSizeItems[RTL].png b/...t.composeui_ComposeUiFlexContainerTest_testContainerWithFixedSizeItems[RTL].png
diff --git a/....composeui_ComposeUiFlexContainerTest_testContainerWithFixedWidthItems[LTR].png b/....composeui_ComposeUiFlexContainerTest_testContainerWithFixedWidthItems[LTR].png
diff --git a/....composeui_ComposeUiFlexContainerTest_testContainerWithFixedWidthItems[RTL].png b/....composeui_ComposeUiFlexContainerTest_testContainerWithFixedWidthItems[RTL].png
diff --git a/..._ComposeUiFlexContainerTest_testLayoutWithConstraints_Column_Fill_Fill[LTR].png b/..._ComposeUiFlexContainerTest_testLayoutWithConstraints_Column_Fill_Fill[LTR].png
diff --git a/..._ComposeUiFlexContainerTest_testLayoutWithConstraints_Column_Fill_Fill[RTL].png b/..._ComposeUiFlexContainerTest_testLayoutWithConstraints_Column_Fill_Fill[RTL].png
diff --git a/..._ComposeUiFlexContainerTest_testLayoutWithConstraints_Column_Wrap_Fill[LTR].png b/..._ComposeUiFlexContainerTest_testLayoutWithConstraints_Column_Wrap_Fill[LTR].png
diff --git a/..._ComposeUiFlexContainerTest_testLayoutWithConstraints_Column_Wrap_Fill[RTL].png b/..._ComposeUiFlexContainerTest_testLayoutWithConstraints_Column_Wrap_Fill[RTL].png
diff --git a/...eui_ComposeUiFlexContainerTest_testLayoutWithConstraints_Row_Fill_Fill[LTR].png b/...eui_ComposeUiFlexContainerTest_testLayoutWithConstraints_Row_Fill_Fill[LTR].png
diff --git a/...eui_ComposeUiFlexContainerTest_testLayoutWithConstraints_Row_Fill_Fill[RTL].png b/...eui_ComposeUiFlexContainerTest_testLayoutWithConstraints_Row_Fill_Fill[RTL].png
diff --git a/...eui_ComposeUiFlexContainerTest_testLayoutWithConstraints_Row_Fill_Wrap[LTR].png b/...eui_ComposeUiFlexContainerTest_testLayoutWithConstraints_Row_Fill_Wrap[LTR].png
diff --git a/...eui_ComposeUiFlexContainerTest_testLayoutWithConstraints_Row_Fill_Wrap[RTL].png b/...eui_ComposeUiFlexContainerTest_testLayoutWithConstraints_Row_Fill_Wrap[RTL].png
diff --git a/...poseUiFlexContainerTest_testLayoutWithCrossAxisAlignment_Column_Center[LTR].png b/...poseUiFlexContainerTest_testLayoutWithCrossAxisAlignment_Column_Center[LTR].png
diff --git a/...poseUiFlexContainerTest_testLayoutWithCrossAxisAlignment_Column_Center[RTL].png b/...poseUiFlexContainerTest_testLayoutWithCrossAxisAlignment_Column_Center[RTL].png
diff --git a/...ComposeUiFlexContainerTest_testLayoutWithCrossAxisAlignment_Column_End[LTR].png b/...ComposeUiFlexContainerTest_testLayoutWithCrossAxisAlignment_Column_End[LTR].png
diff --git a/...ComposeUiFlexContainerTest_testLayoutWithCrossAxisAlignment_Column_End[RTL].png b/...ComposeUiFlexContainerTest_testLayoutWithCrossAxisAlignment_Column_End[RTL].png
diff --git a/...mposeUiFlexContainerTest_testLayoutWithCrossAxisAlignment_Column_Start[LTR].png b/...mposeUiFlexContainerTest_testLayoutWithCrossAxisAlignment_Column_Start[LTR].png
diff --git a/...mposeUiFlexContainerTest_testLayoutWithCrossAxisAlignment_Column_Start[RTL].png b/...mposeUiFlexContainerTest_testLayoutWithCrossAxisAlignment_Column_Start[RTL].png
diff --git a/...oseUiFlexContainerTest_testLayoutWithCrossAxisAlignment_Column_Stretch[LTR].png b/...oseUiFlexContainerTest_testLayoutWithCrossAxisAlignment_Column_Stretch[LTR].png
diff --git a/...oseUiFlexContainerTest_testLayoutWithCrossAxisAlignment_Column_Stretch[RTL].png b/...oseUiFlexContainerTest_testLayoutWithCrossAxisAlignment_Column_Stretch[RTL].png
diff --git a/...ComposeUiFlexContainerTest_testLayoutWithCrossAxisAlignment_Row_Center[LTR].png b/...ComposeUiFlexContainerTest_testLayoutWithCrossAxisAlignment_Row_Center[LTR].png
diff --git a/...ComposeUiFlexContainerTest_testLayoutWithCrossAxisAlignment_Row_Center[RTL].png b/...ComposeUiFlexContainerTest_testLayoutWithCrossAxisAlignment_Row_Center[RTL].png
diff --git a/...ui_ComposeUiFlexContainerTest_testLayoutWithCrossAxisAlignment_Row_End[LTR].png b/...ui_ComposeUiFlexContainerTest_testLayoutWithCrossAxisAlignment_Row_End[LTR].png
diff --git a/...ui_ComposeUiFlexContainerTest_testLayoutWithCrossAxisAlignment_Row_End[RTL].png b/...ui_ComposeUiFlexContainerTest_testLayoutWithCrossAxisAlignment_Row_End[RTL].png
diff --git a/..._ComposeUiFlexContainerTest_testLayoutWithCrossAxisAlignment_Row_Start[LTR].png b/..._ComposeUiFlexContainerTest_testLayoutWithCrossAxisAlignment_Row_Start[LTR].png
diff --git a/..._ComposeUiFlexContainerTest_testLayoutWithCrossAxisAlignment_Row_Start[RTL].png b/..._ComposeUiFlexContainerTest_testLayoutWithCrossAxisAlignment_Row_Start[RTL].png
diff --git a/...eUiFlexContainerTest_testLayoutWithMarginAndDifferentAlignments_Column[LTR].png b/...eUiFlexContainerTest_testLayoutWithMarginAndDifferentAlignments_Column[LTR].png
diff --git a/...eUiFlexContainerTest_testLayoutWithMarginAndDifferentAlignments_Column[RTL].png b/...eUiFlexContainerTest_testLayoutWithMarginAndDifferentAlignments_Column[RTL].png
diff --git a/...poseUiFlexContainerTest_testLayoutWithMarginAndDifferentAlignments_Row[LTR].png b/...poseUiFlexContainerTest_testLayoutWithMarginAndDifferentAlignments_Row[LTR].png
diff --git a/...poseUiFlexContainerTest_testLayoutWithMarginAndDifferentAlignments_Row[RTL].png b/...poseUiFlexContainerTest_testLayoutWithMarginAndDifferentAlignments_Row[RTL].png
diff --git a/...wood.layout.composeui_ComposeUiFlexContainerTest_testLongLayout_Column[LTR].png b/...wood.layout.composeui_ComposeUiFlexContainerTest_testLongLayout_Column[LTR].png
diff --git a/...wood.layout.composeui_ComposeUiFlexContainerTest_testLongLayout_Column[RTL].png b/...wood.layout.composeui_ComposeUiFlexContainerTest_testLongLayout_Column[RTL].png
diff --git a/...ood.layout.composeui_ComposeUiFlexContainerTest_testShortLayout_Column[LTR].png b/...ood.layout.composeui_ComposeUiFlexContainerTest_testShortLayout_Column[LTR].png
diff --git a/...ood.layout.composeui_ComposeUiFlexContainerTest_testShortLayout_Column[RTL].png b/...ood.layout.composeui_ComposeUiFlexContainerTest_testShortLayout_Column[RTL].png
diff --git a/...ut-shared-test/src/commonMain/kotlin/app/cash/redwood/layout/AbstractFlexContainerTest.kt b/...ut-shared-test/src/commonMain/kotlin/app/cash/redwood/layout/AbstractFlexContainerTest.kt
@@ -337,8 +337,8 @@ abstract class AbstractFlexContainerTest<T : Any> {
   }
 }
 
-interface TestFlexContainer<T : Any> : ChangeListener {
-  val value: T
+interface TestFlexContainer<T : Any> : Widget<T>, ChangeListener {
+  override val value: T
   fun width(width: Constraint)
   fun height(height: Constraint)
   fun crossAxisAlignment(crossAxisAlignment: CrossAxisAlignment)

diff --git a/...ainerTestHost/verifySnapshot-view-name.testChildWithUpdatedProperty-initial.png b/...ainerTestHost/verifySnapshot-view-name.testChildWithUpdatedProperty-initial.png
diff --git a/...ainerTestHost/verifySnapshot-view-name.testChildWithUpdatedProperty-updated.png b/...ainerTestHost/verifySnapshot-view-name.testChildWithUpdatedProperty-updated.png
diff --git a/...nerTestHost/verifySnapshot-view-name.testColumnWithMainAxisAlignment_Center.png b/...nerTestHost/verifySnapshot-view-name.testColumnWithMainAxisAlignment_Center.png
diff --git a/...stHost/verifySnapshot-view-name.testColumnWithMainAxisAlignment_SpaceAround.png b/...stHost/verifySnapshot-view-name.testColumnWithMainAxisAlignment_SpaceAround.png
diff --git a/...tHost/verifySnapshot-view-name.testColumnWithMainAxisAlignment_SpaceBetween.png b/...tHost/verifySnapshot-view-name.testColumnWithMainAxisAlignment_SpaceBetween.png
diff --git a/...ontainerTestHost/verifySnapshot-view-name.testContainerWithFixedHeightItems.png b/...ontainerTestHost/verifySnapshot-view-name.testContainerWithFixedHeightItems.png
diff --git a/...xContainerTestHost/verifySnapshot-view-name.testContainerWithFixedSizeItems.png b/...xContainerTestHost/verifySnapshot-view-name.testContainerWithFixedSizeItems.png
diff --git a/...ContainerTestHost/verifySnapshot-view-name.testContainerWithFixedWidthItems.png b/...ContainerTestHost/verifySnapshot-view-name.testContainerWithFixedWidthItems.png
diff --git a/...UIViewFlexContainerTestHost/verifySnapshot-view-name.testEmptyLayout_Column.png b/...UIViewFlexContainerTestHost/verifySnapshot-view-name.testEmptyLayout_Column.png
diff --git a/...__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testEmptyLayout_Row.png b/...__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testEmptyLayout_Row.png
diff --git a/...estHost/verifySnapshot-view-name.testLayoutWithConstraints_Column_Fill_Fill.png b/...estHost/verifySnapshot-view-name.testLayoutWithConstraints_Column_Fill_Fill.png
diff --git a/...estHost/verifySnapshot-view-name.testLayoutWithConstraints_Column_Fill_Wrap.png b/...estHost/verifySnapshot-view-name.testLayoutWithConstraints_Column_Fill_Wrap.png
diff --git a/...estHost/verifySnapshot-view-name.testLayoutWithConstraints_Column_Wrap_Fill.png b/...estHost/verifySnapshot-view-name.testLayoutWithConstraints_Column_Wrap_Fill.png