Add Box stretch tests (#1843)

cashapp · Mar 5, 2024 · 68b61d0 · 68b61d0
1 parent 35bedbc
commit 68b61d0
Show file tree

Hide file tree

Showing 72 changed files with 312 additions and 2 deletions.
diff --git a/...-layout-composeui/src/commonMain/kotlin/app/cash/redwood/layout/composeui/ComposeUiBox.kt b/...-layout-composeui/src/commonMain/kotlin/app/cash/redwood/layout/composeui/ComposeUiBox.kt
@@ -100,7 +100,8 @@ internal class ComposeUiBox(
         CrossAxisAlignment.Start -> -1f
         CrossAxisAlignment.Center -> 0f
         CrossAxisAlignment.End -> 1f
-        CrossAxisAlignment.Stretch -> TODO()
+        // TODO Implement stretch with custom Layout.
+        CrossAxisAlignment.Stretch -> -1f
         else -> throw AssertionError()
       },
       verticalBias = alignment.verticalBias,
@@ -114,7 +115,8 @@ internal class ComposeUiBox(
         CrossAxisAlignment.Start -> -1f
         CrossAxisAlignment.Center -> 0f
         CrossAxisAlignment.End -> 1f
-        CrossAxisAlignment.Stretch -> TODO()
+        // TODO Implement stretch with custom Layout.
+        CrossAxisAlignment.Stretch -> -1f
         else -> throw AssertionError()
       },
     )

diff --git a/...ut.composeui_ComposeUiBoxTest_testFillWithChildren_Wrap_Center_Stretch[LTR].png b/...ut.composeui_ComposeUiBoxTest_testFillWithChildren_Wrap_Center_Stretch[LTR].png
diff --git a/...ut.composeui_ComposeUiBoxTest_testFillWithChildren_Wrap_Center_Stretch[RTL].png b/...ut.composeui_ComposeUiBoxTest_testFillWithChildren_Wrap_Center_Stretch[RTL].png
diff --git a/...ayout.composeui_ComposeUiBoxTest_testFillWithChildren_Wrap_End_Stretch[LTR].png b/...ayout.composeui_ComposeUiBoxTest_testFillWithChildren_Wrap_End_Stretch[LTR].png
diff --git a/...ayout.composeui_ComposeUiBoxTest_testFillWithChildren_Wrap_End_Stretch[RTL].png b/...ayout.composeui_ComposeUiBoxTest_testFillWithChildren_Wrap_End_Stretch[RTL].png
diff --git a/...out.composeui_ComposeUiBoxTest_testFillWithChildren_Wrap_Start_Stretch[LTR].png b/...out.composeui_ComposeUiBoxTest_testFillWithChildren_Wrap_Start_Stretch[LTR].png
diff --git a/...out.composeui_ComposeUiBoxTest_testFillWithChildren_Wrap_Start_Stretch[RTL].png b/...out.composeui_ComposeUiBoxTest_testFillWithChildren_Wrap_Start_Stretch[RTL].png
diff --git a/...ut.composeui_ComposeUiBoxTest_testFillWithChildren_Wrap_Stretch_Center[LTR].png b/...ut.composeui_ComposeUiBoxTest_testFillWithChildren_Wrap_Stretch_Center[LTR].png
diff --git a/...ut.composeui_ComposeUiBoxTest_testFillWithChildren_Wrap_Stretch_Center[RTL].png b/...ut.composeui_ComposeUiBoxTest_testFillWithChildren_Wrap_Stretch_Center[RTL].png
diff --git a/...ayout.composeui_ComposeUiBoxTest_testFillWithChildren_Wrap_Stretch_End[LTR].png b/...ayout.composeui_ComposeUiBoxTest_testFillWithChildren_Wrap_Stretch_End[LTR].png
diff --git a/...ayout.composeui_ComposeUiBoxTest_testFillWithChildren_Wrap_Stretch_End[RTL].png b/...ayout.composeui_ComposeUiBoxTest_testFillWithChildren_Wrap_Stretch_End[RTL].png
diff --git a/...out.composeui_ComposeUiBoxTest_testFillWithChildren_Wrap_Stretch_Start[LTR].png b/...out.composeui_ComposeUiBoxTest_testFillWithChildren_Wrap_Stretch_Start[LTR].png
diff --git a/...out.composeui_ComposeUiBoxTest_testFillWithChildren_Wrap_Stretch_Start[RTL].png b/...out.composeui_ComposeUiBoxTest_testFillWithChildren_Wrap_Stretch_Start[RTL].png
diff --git a/...t.composeui_ComposeUiBoxTest_testFillWithChildren_Wrap_Stretch_Stretch[LTR].png b/...t.composeui_ComposeUiBoxTest_testFillWithChildren_Wrap_Stretch_Stretch[LTR].png
diff --git a/...t.composeui_ComposeUiBoxTest_testFillWithChildren_Wrap_Stretch_Stretch[RTL].png b/...t.composeui_ComposeUiBoxTest_testFillWithChildren_Wrap_Stretch_Stretch[RTL].png
diff --git a/...ut.composeui_ComposeUiBoxTest_testWrapWithChildren_Wrap_Center_Stretch[LTR].png b/...ut.composeui_ComposeUiBoxTest_testWrapWithChildren_Wrap_Center_Stretch[LTR].png
diff --git a/...ut.composeui_ComposeUiBoxTest_testWrapWithChildren_Wrap_Center_Stretch[RTL].png b/...ut.composeui_ComposeUiBoxTest_testWrapWithChildren_Wrap_Center_Stretch[RTL].png
diff --git a/...ayout.composeui_ComposeUiBoxTest_testWrapWithChildren_Wrap_End_Stretch[LTR].png b/...ayout.composeui_ComposeUiBoxTest_testWrapWithChildren_Wrap_End_Stretch[LTR].png
diff --git a/...ayout.composeui_ComposeUiBoxTest_testWrapWithChildren_Wrap_End_Stretch[RTL].png b/...ayout.composeui_ComposeUiBoxTest_testWrapWithChildren_Wrap_End_Stretch[RTL].png
diff --git a/...out.composeui_ComposeUiBoxTest_testWrapWithChildren_Wrap_Start_Stretch[LTR].png b/...out.composeui_ComposeUiBoxTest_testWrapWithChildren_Wrap_Start_Stretch[LTR].png
diff --git a/...out.composeui_ComposeUiBoxTest_testWrapWithChildren_Wrap_Start_Stretch[RTL].png b/...out.composeui_ComposeUiBoxTest_testWrapWithChildren_Wrap_Start_Stretch[RTL].png
diff --git a/...ut.composeui_ComposeUiBoxTest_testWrapWithChildren_Wrap_Stretch_Center[LTR].png b/...ut.composeui_ComposeUiBoxTest_testWrapWithChildren_Wrap_Stretch_Center[LTR].png
diff --git a/...ut.composeui_ComposeUiBoxTest_testWrapWithChildren_Wrap_Stretch_Center[RTL].png b/...ut.composeui_ComposeUiBoxTest_testWrapWithChildren_Wrap_Stretch_Center[RTL].png
diff --git a/...ayout.composeui_ComposeUiBoxTest_testWrapWithChildren_Wrap_Stretch_End[LTR].png b/...ayout.composeui_ComposeUiBoxTest_testWrapWithChildren_Wrap_Stretch_End[LTR].png
diff --git a/...ayout.composeui_ComposeUiBoxTest_testWrapWithChildren_Wrap_Stretch_End[RTL].png b/...ayout.composeui_ComposeUiBoxTest_testWrapWithChildren_Wrap_Stretch_End[RTL].png
diff --git a/...out.composeui_ComposeUiBoxTest_testWrapWithChildren_Wrap_Stretch_Start[LTR].png b/...out.composeui_ComposeUiBoxTest_testWrapWithChildren_Wrap_Stretch_Start[LTR].png
diff --git a/...out.composeui_ComposeUiBoxTest_testWrapWithChildren_Wrap_Stretch_Start[RTL].png b/...out.composeui_ComposeUiBoxTest_testWrapWithChildren_Wrap_Stretch_Start[RTL].png
diff --git a/...t.composeui_ComposeUiBoxTest_testWrapWithChildren_Wrap_Stretch_Stretch[LTR].png b/...t.composeui_ComposeUiBoxTest_testWrapWithChildren_Wrap_Stretch_Stretch[LTR].png
diff --git a/...t.composeui_ComposeUiBoxTest_testWrapWithChildren_Wrap_Stretch_Stretch[RTL].png b/...t.composeui_ComposeUiBoxTest_testWrapWithChildren_Wrap_Stretch_Stretch[RTL].png
diff --git a/redwood-layout-shared-test/src/commonMain/kotlin/app/cash/redwood/layout/AbstractBoxTest.kt b/redwood-layout-shared-test/src/commonMain/kotlin/app/cash/redwood/layout/AbstractBoxTest.kt
@@ -86,6 +86,13 @@ abstract class AbstractBoxTest<T : Any> {
     verticalAlignment = CrossAxisAlignment.Start,
   )
 
+  @Test
+  fun testWrapWithChildren_Wrap_Stretch_Start() = testWithChildren(
+    constraint = Constraint.Wrap,
+    horizontalAlignment = CrossAxisAlignment.Stretch,
+    verticalAlignment = CrossAxisAlignment.Start,
+  )
+
   @Test
   fun testWrapWithChildren_Wrap_Start_Center() = testWithChildren(
     constraint = Constraint.Wrap,
@@ -107,6 +114,13 @@ abstract class AbstractBoxTest<T : Any> {
     verticalAlignment = CrossAxisAlignment.Center,
   )
 
+  @Test
+  fun testWrapWithChildren_Wrap_Stretch_Center() = testWithChildren(
+    constraint = Constraint.Wrap,
+    horizontalAlignment = CrossAxisAlignment.Stretch,
+    verticalAlignment = CrossAxisAlignment.Center,
+  )
+
   @Test
   fun testWrapWithChildren_Wrap_Start_End() = testWithChildren(
     constraint = Constraint.Wrap,
@@ -128,6 +142,41 @@ abstract class AbstractBoxTest<T : Any> {
     verticalAlignment = CrossAxisAlignment.End,
   )
 
+  @Test
+  fun testWrapWithChildren_Wrap_Stretch_End() = testWithChildren(
+    constraint = Constraint.Wrap,
+    horizontalAlignment = CrossAxisAlignment.Stretch,
+    verticalAlignment = CrossAxisAlignment.End,
+  )
+
+  @Test
+  fun testWrapWithChildren_Wrap_Start_Stretch() = testWithChildren(
+    constraint = Constraint.Wrap,
+    horizontalAlignment = CrossAxisAlignment.Start,
+    verticalAlignment = CrossAxisAlignment.Stretch,
+  )
+
+  @Test
+  fun testWrapWithChildren_Wrap_Center_Stretch() = testWithChildren(
+    constraint = Constraint.Wrap,
+    horizontalAlignment = CrossAxisAlignment.Center,
+    verticalAlignment = CrossAxisAlignment.Stretch,
+  )
+
+  @Test
+  fun testWrapWithChildren_Wrap_End_Stretch() = testWithChildren(
+    constraint = Constraint.Wrap,
+    horizontalAlignment = CrossAxisAlignment.End,
+    verticalAlignment = CrossAxisAlignment.Stretch,
+  )
+
+  @Test
+  fun testWrapWithChildren_Wrap_Stretch_Stretch() = testWithChildren(
+    constraint = Constraint.Wrap,
+    horizontalAlignment = CrossAxisAlignment.Stretch,
+    verticalAlignment = CrossAxisAlignment.Stretch,
+  )
+
   // testFillWithChildren
 
   @Test
@@ -151,6 +200,13 @@ abstract class AbstractBoxTest<T : Any> {
     verticalAlignment = CrossAxisAlignment.Start,
   )
 
+  @Test
+  fun testFillWithChildren_Wrap_Stretch_Start() = testWithChildren(
+    constraint = Constraint.Fill,
+    horizontalAlignment = CrossAxisAlignment.Stretch,
+    verticalAlignment = CrossAxisAlignment.Start,
+  )
+
   @Test
   fun testFillWithChildren_Wrap_Start_Center() = testWithChildren(
     constraint = Constraint.Fill,
@@ -172,6 +228,13 @@ abstract class AbstractBoxTest<T : Any> {
     verticalAlignment = CrossAxisAlignment.Center,
   )
 
+  @Test
+  fun testFillWithChildren_Wrap_Stretch_Center() = testWithChildren(
+    constraint = Constraint.Fill,
+    horizontalAlignment = CrossAxisAlignment.Stretch,
+    verticalAlignment = CrossAxisAlignment.Center,
+  )
+
   @Test
   fun testFillWithChildren_Wrap_Start_End() = testWithChildren(
     constraint = Constraint.Fill,
@@ -193,6 +256,41 @@ abstract class AbstractBoxTest<T : Any> {
     verticalAlignment = CrossAxisAlignment.End,
   )
 
+  @Test
+  fun testFillWithChildren_Wrap_Stretch_End() = testWithChildren(
+    constraint = Constraint.Fill,
+    horizontalAlignment = CrossAxisAlignment.Stretch,
+    verticalAlignment = CrossAxisAlignment.End,
+  )
+
+  @Test
+  fun testFillWithChildren_Wrap_Start_Stretch() = testWithChildren(
+    constraint = Constraint.Fill,
+    horizontalAlignment = CrossAxisAlignment.Start,
+    verticalAlignment = CrossAxisAlignment.Stretch,
+  )
+
+  @Test
+  fun testFillWithChildren_Wrap_Center_Stretch() = testWithChildren(
+    constraint = Constraint.Fill,
+    horizontalAlignment = CrossAxisAlignment.Center,
+    verticalAlignment = CrossAxisAlignment.Stretch,
+  )
+
+  @Test
+  fun testFillWithChildren_Wrap_End_Stretch() = testWithChildren(
+    constraint = Constraint.Fill,
+    horizontalAlignment = CrossAxisAlignment.End,
+    verticalAlignment = CrossAxisAlignment.Stretch,
+  )
+
+  @Test
+  fun testFillWithChildren_Wrap_Stretch_Stretch() = testWithChildren(
+    constraint = Constraint.Fill,
+    horizontalAlignment = CrossAxisAlignment.Stretch,
+    verticalAlignment = CrossAxisAlignment.Stretch,
+  )
+
   private fun testWithChildren(
     constraint: Constraint,
     horizontalAlignment: CrossAxisAlignment,

diff --git a/.../__Snapshots__/UIViewBoxTestHost/testFillWithChildren_Wrap_Center_Stretch.1.png b/.../__Snapshots__/UIViewBoxTestHost/testFillWithChildren_Wrap_Center_Stretch.1.png
diff --git a/...sts/__Snapshots__/UIViewBoxTestHost/testFillWithChildren_Wrap_End_Stretch.1.png b/...sts/__Snapshots__/UIViewBoxTestHost/testFillWithChildren_Wrap_End_Stretch.1.png
diff --git a/...s/__Snapshots__/UIViewBoxTestHost/testFillWithChildren_Wrap_Start_Stretch.1.png b/...s/__Snapshots__/UIViewBoxTestHost/testFillWithChildren_Wrap_Start_Stretch.1.png
diff --git a/.../__Snapshots__/UIViewBoxTestHost/testFillWithChildren_Wrap_Stretch_Center.1.png b/.../__Snapshots__/UIViewBoxTestHost/testFillWithChildren_Wrap_Stretch_Center.1.png
diff --git a/...sts/__Snapshots__/UIViewBoxTestHost/testFillWithChildren_Wrap_Stretch_End.1.png b/...sts/__Snapshots__/UIViewBoxTestHost/testFillWithChildren_Wrap_Stretch_End.1.png
diff --git a/...s/__Snapshots__/UIViewBoxTestHost/testFillWithChildren_Wrap_Stretch_Start.1.png b/...s/__Snapshots__/UIViewBoxTestHost/testFillWithChildren_Wrap_Stretch_Start.1.png
diff --git a/...__Snapshots__/UIViewBoxTestHost/testFillWithChildren_Wrap_Stretch_Stretch.1.png b/...__Snapshots__/UIViewBoxTestHost/testFillWithChildren_Wrap_Stretch_Stretch.1.png
diff --git a/.../__Snapshots__/UIViewBoxTestHost/testWrapWithChildren_Wrap_Center_Stretch.1.png b/.../__Snapshots__/UIViewBoxTestHost/testWrapWithChildren_Wrap_Center_Stretch.1.png
diff --git a/...sts/__Snapshots__/UIViewBoxTestHost/testWrapWithChildren_Wrap_End_Stretch.1.png b/...sts/__Snapshots__/UIViewBoxTestHost/testWrapWithChildren_Wrap_End_Stretch.1.png
diff --git a/...s/__Snapshots__/UIViewBoxTestHost/testWrapWithChildren_Wrap_Start_Stretch.1.png b/...s/__Snapshots__/UIViewBoxTestHost/testWrapWithChildren_Wrap_Start_Stretch.1.png
diff --git a/.../__Snapshots__/UIViewBoxTestHost/testWrapWithChildren_Wrap_Stretch_Center.1.png b/.../__Snapshots__/UIViewBoxTestHost/testWrapWithChildren_Wrap_Stretch_Center.1.png
diff --git a/...sts/__Snapshots__/UIViewBoxTestHost/testWrapWithChildren_Wrap_Stretch_End.1.png b/...sts/__Snapshots__/UIViewBoxTestHost/testWrapWithChildren_Wrap_Stretch_End.1.png
diff --git a/...s/__Snapshots__/UIViewBoxTestHost/testWrapWithChildren_Wrap_Stretch_Start.1.png b/...s/__Snapshots__/UIViewBoxTestHost/testWrapWithChildren_Wrap_Stretch_Start.1.png
diff --git a/...__Snapshots__/UIViewBoxTestHost/testWrapWithChildren_Wrap_Stretch_Stretch.1.png b/...__Snapshots__/UIViewBoxTestHost/testWrapWithChildren_Wrap_Stretch_Stretch.1.png
diff --git a/...dwood.layout.view_ViewBoxTest_testFillWithChildren_Wrap_Center_Stretch[LTR].png b/...dwood.layout.view_ViewBoxTest_testFillWithChildren_Wrap_Center_Stretch[LTR].png
diff --git a/...dwood.layout.view_ViewBoxTest_testFillWithChildren_Wrap_Center_Stretch[RTL].png b/...dwood.layout.view_ViewBoxTest_testFillWithChildren_Wrap_Center_Stretch[RTL].png
diff --git a/....redwood.layout.view_ViewBoxTest_testFillWithChildren_Wrap_End_Stretch[LTR].png b/....redwood.layout.view_ViewBoxTest_testFillWithChildren_Wrap_End_Stretch[LTR].png
diff --git a/....redwood.layout.view_ViewBoxTest_testFillWithChildren_Wrap_End_Stretch[RTL].png b/....redwood.layout.view_ViewBoxTest_testFillWithChildren_Wrap_End_Stretch[RTL].png
diff --git a/...edwood.layout.view_ViewBoxTest_testFillWithChildren_Wrap_Start_Stretch[LTR].png b/...edwood.layout.view_ViewBoxTest_testFillWithChildren_Wrap_Start_Stretch[LTR].png
diff --git a/...edwood.layout.view_ViewBoxTest_testFillWithChildren_Wrap_Start_Stretch[RTL].png b/...edwood.layout.view_ViewBoxTest_testFillWithChildren_Wrap_Start_Stretch[RTL].png
diff --git a/...dwood.layout.view_ViewBoxTest_testFillWithChildren_Wrap_Stretch_Center[LTR].png b/...dwood.layout.view_ViewBoxTest_testFillWithChildren_Wrap_Stretch_Center[LTR].png
diff --git a/...dwood.layout.view_ViewBoxTest_testFillWithChildren_Wrap_Stretch_Center[RTL].png b/...dwood.layout.view_ViewBoxTest_testFillWithChildren_Wrap_Stretch_Center[RTL].png
diff --git a/....redwood.layout.view_ViewBoxTest_testFillWithChildren_Wrap_Stretch_End[LTR].png b/....redwood.layout.view_ViewBoxTest_testFillWithChildren_Wrap_Stretch_End[LTR].png
diff --git a/....redwood.layout.view_ViewBoxTest_testFillWithChildren_Wrap_Stretch_End[RTL].png b/....redwood.layout.view_ViewBoxTest_testFillWithChildren_Wrap_Stretch_End[RTL].png
diff --git a/...edwood.layout.view_ViewBoxTest_testFillWithChildren_Wrap_Stretch_Start[LTR].png b/...edwood.layout.view_ViewBoxTest_testFillWithChildren_Wrap_Stretch_Start[LTR].png
diff --git a/...edwood.layout.view_ViewBoxTest_testFillWithChildren_Wrap_Stretch_Start[RTL].png b/...edwood.layout.view_ViewBoxTest_testFillWithChildren_Wrap_Stretch_Start[RTL].png
diff --git a/...wood.layout.view_ViewBoxTest_testFillWithChildren_Wrap_Stretch_Stretch[LTR].png b/...wood.layout.view_ViewBoxTest_testFillWithChildren_Wrap_Stretch_Stretch[LTR].png
diff --git a/...wood.layout.view_ViewBoxTest_testFillWithChildren_Wrap_Stretch_Stretch[RTL].png b/...wood.layout.view_ViewBoxTest_testFillWithChildren_Wrap_Stretch_Stretch[RTL].png
diff --git a/...dwood.layout.view_ViewBoxTest_testWrapWithChildren_Wrap_Center_Stretch[LTR].png b/...dwood.layout.view_ViewBoxTest_testWrapWithChildren_Wrap_Center_Stretch[LTR].png
diff --git a/...dwood.layout.view_ViewBoxTest_testWrapWithChildren_Wrap_Center_Stretch[RTL].png b/...dwood.layout.view_ViewBoxTest_testWrapWithChildren_Wrap_Center_Stretch[RTL].png
diff --git a/....redwood.layout.view_ViewBoxTest_testWrapWithChildren_Wrap_End_Stretch[LTR].png b/....redwood.layout.view_ViewBoxTest_testWrapWithChildren_Wrap_End_Stretch[LTR].png
diff --git a/....redwood.layout.view_ViewBoxTest_testWrapWithChildren_Wrap_End_Stretch[RTL].png b/....redwood.layout.view_ViewBoxTest_testWrapWithChildren_Wrap_End_Stretch[RTL].png