cashapp · swankjesse · Oct 10, 2023 · Oct 10, 2023 · swankjesse · Oct 10, 2023
diff --git a/...lumnWithMainAxisAlignment[LTR,Center].png → ...lumnWithMainAxisAlignment_Center[LTR].png b/...lumnWithMainAxisAlignment[LTR,Center].png → ...lumnWithMainAxisAlignment_Center[LTR].png
diff --git a/...lumnWithMainAxisAlignment[RTL,Center].png → ...lumnWithMainAxisAlignment_Center[RTL].png b/...lumnWithMainAxisAlignment[RTL,Center].png → ...lumnWithMainAxisAlignment_Center[RTL].png
diff --git a/...ithMainAxisAlignment[LTR,SpaceAround].png → ...ithMainAxisAlignment_SpaceAround[LTR].png b/...ithMainAxisAlignment[LTR,SpaceAround].png → ...ithMainAxisAlignment_SpaceAround[LTR].png
diff --git a/...ithMainAxisAlignment[RTL,SpaceAround].png → ...ithMainAxisAlignment_SpaceAround[RTL].png b/...ithMainAxisAlignment[RTL,SpaceAround].png → ...ithMainAxisAlignment_SpaceAround[RTL].png
diff --git a/...thMainAxisAlignment[LTR,SpaceBetween].png → ...thMainAxisAlignment_SpaceBetween[LTR].png b/...thMainAxisAlignment[LTR,SpaceBetween].png → ...thMainAxisAlignment_SpaceBetween[LTR].png
diff --git a/...thMainAxisAlignment[RTL,SpaceBetween].png → ...thMainAxisAlignment_SpaceBetween[RTL].png b/...thMainAxisAlignment[RTL,SpaceBetween].png → ...thMainAxisAlignment_SpaceBetween[RTL].png
diff --git a/...ContainerTest_emptyLayout[LTR,Column].png → ...ContainerTest_emptyLayout_Column[LTR].png b/...ContainerTest_emptyLayout[LTR,Column].png → ...ContainerTest_emptyLayout_Column[LTR].png
diff --git a/...lexContainerTest_emptyLayout[LTR,Row].png → ...ContainerTest_emptyLayout_Column[RTL].png b/...lexContainerTest_emptyLayout[LTR,Row].png → ...ContainerTest_emptyLayout_Column[RTL].png
diff --git a/...ContainerTest_emptyLayout[RTL,Column].png → ...lexContainerTest_emptyLayout_Row[LTR].png b/...ContainerTest_emptyLayout[RTL,Column].png → ...lexContainerTest_emptyLayout_Row[LTR].png
diff --git a/...lexContainerTest_emptyLayout[RTL,Row].png → ...lexContainerTest_emptyLayout_Row[RTL].png b/...lexContainerTest_emptyLayout[RTL,Row].png → ...lexContainerTest_emptyLayout_Row[RTL].png
diff --git a/...WithConstraints[LTR,Column,Fill,Fill].png → ...WithConstraints_Column_Fill_Fill[LTR].png b/...WithConstraints[LTR,Column,Fill,Fill].png → ...WithConstraints_Column_Fill_Fill[LTR].png
diff --git a/...WithConstraints[RTL,Column,Fill,Fill].png → ...WithConstraints_Column_Fill_Fill[RTL].png b/...WithConstraints[RTL,Column,Fill,Fill].png → ...WithConstraints_Column_Fill_Fill[RTL].png
diff --git a/...WithConstraints[LTR,Column,Fill,Wrap].png → ...WithConstraints_Column_Fill_Wrap[LTR].png b/...WithConstraints[LTR,Column,Fill,Wrap].png → ...WithConstraints_Column_Fill_Wrap[LTR].png
diff --git a/...WithConstraints[RTL,Column,Fill,Wrap].png → ...WithConstraints_Column_Fill_Wrap[RTL].png b/...WithConstraints[RTL,Column,Fill,Wrap].png → ...WithConstraints_Column_Fill_Wrap[RTL].png
diff --git a/...WithConstraints[LTR,Column,Wrap,Fill].png → ...WithConstraints_Column_Wrap_Fill[LTR].png b/...WithConstraints[LTR,Column,Wrap,Fill].png → ...WithConstraints_Column_Wrap_Fill[LTR].png
diff --git a/...WithConstraints[RTL,Column,Wrap,Fill].png → ...WithConstraints_Column_Wrap_Fill[RTL].png b/...WithConstraints[RTL,Column,Wrap,Fill].png → ...WithConstraints_Column_Wrap_Fill[RTL].png
diff --git a/...WithConstraints[LTR,Column,Wrap,Wrap].png → ...WithConstraints_Column_Wrap_Wrap[LTR].png b/...WithConstraints[LTR,Column,Wrap,Wrap].png → ...WithConstraints_Column_Wrap_Wrap[LTR].png
diff --git a/...WithConstraints[RTL,Column,Wrap,Wrap].png → ...WithConstraints_Column_Wrap_Wrap[RTL].png b/...WithConstraints[RTL,Column,Wrap,Wrap].png → ...WithConstraints_Column_Wrap_Wrap[RTL].png
diff --git a/...outWithConstraints[LTR,Row,Fill,Fill].png → ...outWithConstraints_Row_Fill_Fill[LTR].png b/...outWithConstraints[LTR,Row,Fill,Fill].png → ...outWithConstraints_Row_Fill_Fill[LTR].png
diff --git a/...outWithConstraints[RTL,Row,Fill,Fill].png → ...outWithConstraints_Row_Fill_Fill[RTL].png b/...outWithConstraints[RTL,Row,Fill,Fill].png → ...outWithConstraints_Row_Fill_Fill[RTL].png
diff --git a/...outWithConstraints[LTR,Row,Fill,Wrap].png → ...outWithConstraints_Row_Fill_Wrap[LTR].png b/...outWithConstraints[LTR,Row,Fill,Wrap].png → ...outWithConstraints_Row_Fill_Wrap[LTR].png
diff --git a/...outWithConstraints[RTL,Row,Fill,Wrap].png → ...outWithConstraints_Row_Fill_Wrap[RTL].png b/...outWithConstraints[RTL,Row,Fill,Wrap].png → ...outWithConstraints_Row_Fill_Wrap[RTL].png
diff --git a/...outWithConstraints[LTR,Row,Wrap,Fill].png → ...outWithConstraints_Row_Wrap_Fill[LTR].png b/...outWithConstraints[LTR,Row,Wrap,Fill].png → ...outWithConstraints_Row_Wrap_Fill[LTR].png
diff --git a/...outWithConstraints[RTL,Row,Wrap,Fill].png → ...outWithConstraints_Row_Wrap_Fill[RTL].png b/...outWithConstraints[RTL,Row,Wrap,Fill].png → ...outWithConstraints_Row_Wrap_Fill[RTL].png
diff --git a/...outWithConstraints[LTR,Row,Wrap,Wrap].png → ...outWithConstraints_Row_Wrap_Wrap[LTR].png b/...outWithConstraints[LTR,Row,Wrap,Wrap].png → ...outWithConstraints_Row_Wrap_Wrap[LTR].png
diff --git a/...outWithConstraints[RTL,Row,Wrap,Wrap].png → ...outWithConstraints_Row_Wrap_Wrap[RTL].png b/...outWithConstraints[RTL,Row,Wrap,Wrap].png → ...outWithConstraints_Row_Wrap_Wrap[RTL].png
diff --git a/...CrossAxisAlignment[LTR,Column,Center].png → ...CrossAxisAlignment_Column_Center[LTR].png b/...CrossAxisAlignment[LTR,Column,Center].png → ...CrossAxisAlignment_Column_Center[LTR].png
diff --git a/...CrossAxisAlignment[RTL,Column,Center].png → ...CrossAxisAlignment_Column_Center[RTL].png b/...CrossAxisAlignment[RTL,Column,Center].png → ...CrossAxisAlignment_Column_Center[RTL].png
diff --git a/...ithCrossAxisAlignment[LTR,Column,End].png → ...ithCrossAxisAlignment_Column_End[LTR].png b/...ithCrossAxisAlignment[LTR,Column,End].png → ...ithCrossAxisAlignment_Column_End[LTR].png
diff --git a/...ithCrossAxisAlignment[RTL,Column,End].png → ...ithCrossAxisAlignment_Column_End[RTL].png b/...ithCrossAxisAlignment[RTL,Column,End].png → ...ithCrossAxisAlignment_Column_End[RTL].png
diff --git a/...hCrossAxisAlignment[LTR,Column,Start].png → ...hCrossAxisAlignment_Column_Start[LTR].png b/...hCrossAxisAlignment[LTR,Column,Start].png → ...hCrossAxisAlignment_Column_Start[LTR].png
diff --git a/...hCrossAxisAlignment[RTL,Column,Start].png → ...hCrossAxisAlignment_Column_Start[RTL].png b/...hCrossAxisAlignment[RTL,Column,Start].png → ...hCrossAxisAlignment_Column_Start[RTL].png
diff --git a/...rossAxisAlignment[LTR,Column,Stretch].png → ...rossAxisAlignment_Column_Stretch[LTR].png b/...rossAxisAlignment[LTR,Column,Stretch].png → ...rossAxisAlignment_Column_Stretch[LTR].png
diff --git a/...rossAxisAlignment[RTL,Column,Stretch].png → ...rossAxisAlignment_Column_Stretch[RTL].png b/...rossAxisAlignment[RTL,Column,Stretch].png → ...rossAxisAlignment_Column_Stretch[RTL].png
diff --git a/...ithCrossAxisAlignment[LTR,Row,Center].png → ...ithCrossAxisAlignment_Row_Center[LTR].png b/...ithCrossAxisAlignment[LTR,Row,Center].png → ...ithCrossAxisAlignment_Row_Center[LTR].png
diff --git a/...ithCrossAxisAlignment[RTL,Row,Center].png → ...ithCrossAxisAlignment_Row_Center[RTL].png b/...ithCrossAxisAlignment[RTL,Row,Center].png → ...ithCrossAxisAlignment_Row_Center[RTL].png
diff --git a/...utWithCrossAxisAlignment[LTR,Row,End].png → ...utWithCrossAxisAlignment_Row_End[LTR].png b/...utWithCrossAxisAlignment[LTR,Row,End].png → ...utWithCrossAxisAlignment_Row_End[LTR].png
diff --git a/...utWithCrossAxisAlignment[RTL,Row,End].png → ...utWithCrossAxisAlignment_Row_End[RTL].png b/...utWithCrossAxisAlignment[RTL,Row,End].png → ...utWithCrossAxisAlignment_Row_End[RTL].png
diff --git a/...WithCrossAxisAlignment[LTR,Row,Start].png → ...WithCrossAxisAlignment_Row_Start[LTR].png b/...WithCrossAxisAlignment[LTR,Row,Start].png → ...WithCrossAxisAlignment_Row_Start[LTR].png
diff --git a/...WithCrossAxisAlignment[RTL,Row,Start].png → ...WithCrossAxisAlignment_Row_Start[RTL].png b/...WithCrossAxisAlignment[RTL,Row,Start].png → ...WithCrossAxisAlignment_Row_Start[RTL].png
diff --git a/...thCrossAxisAlignment[LTR,Row,Stretch].png → ...thCrossAxisAlignment_Row_Stretch[LTR].png b/...thCrossAxisAlignment[LTR,Row,Stretch].png → ...thCrossAxisAlignment_Row_Stretch[LTR].png
diff --git a/...thCrossAxisAlignment[RTL,Row,Stretch].png → ...thCrossAxisAlignment_Row_Stretch[RTL].png b/...thCrossAxisAlignment[RTL,Row,Stretch].png → ...thCrossAxisAlignment_Row_Stretch[RTL].png
diff --git a/...ginAndDifferentAlignments[LTR,Column].png → ...ginAndDifferentAlignments_Column[LTR].png b/...ginAndDifferentAlignments[LTR,Column].png → ...ginAndDifferentAlignments_Column[LTR].png
diff --git a/...ginAndDifferentAlignments[RTL,Column].png → ...ginAndDifferentAlignments_Column[RTL].png b/...ginAndDifferentAlignments[RTL,Column].png → ...ginAndDifferentAlignments_Column[RTL].png
diff --git a/...MarginAndDifferentAlignments[LTR,Row].png → ...MarginAndDifferentAlignments_Row[LTR].png b/...MarginAndDifferentAlignments[LTR,Row].png → ...MarginAndDifferentAlignments_Row[LTR].png
diff --git a/...MarginAndDifferentAlignments[RTL,Row].png → ...MarginAndDifferentAlignments_Row[RTL].png b/...MarginAndDifferentAlignments[RTL,Row].png → ...MarginAndDifferentAlignments_Row[RTL].png
diff --git a/...xContainerTest_longLayout[LTR,Column].png → ...xContainerTest_longLayout_Column[LTR].png b/...xContainerTest_longLayout[LTR,Column].png → ...xContainerTest_longLayout_Column[LTR].png
diff --git a/...xContainerTest_longLayout[RTL,Column].png → ...xContainerTest_longLayout_Column[RTL].png b/...xContainerTest_longLayout[RTL,Column].png → ...xContainerTest_longLayout_Column[RTL].png
diff --git a/...FlexContainerTest_longLayout[LTR,Row].png → ...FlexContainerTest_longLayout_Row[LTR].png b/...FlexContainerTest_longLayout[LTR,Row].png → ...FlexContainerTest_longLayout_Row[LTR].png
diff --git a/...FlexContainerTest_longLayout[RTL,Row].png → ...FlexContainerTest_longLayout_Row[RTL].png b/...FlexContainerTest_longLayout[RTL,Row].png → ...FlexContainerTest_longLayout_Row[RTL].png
diff --git a/...ContainerTest_shortLayout[LTR,Column].png → ...ContainerTest_shortLayout_Column[LTR].png b/...ContainerTest_shortLayout[LTR,Column].png → ...ContainerTest_shortLayout_Column[LTR].png
diff --git a/...ContainerTest_shortLayout[RTL,Column].png → ...ContainerTest_shortLayout_Column[RTL].png b/...ContainerTest_shortLayout[RTL,Column].png → ...ContainerTest_shortLayout_Column[RTL].png
diff --git a/...lexContainerTest_shortLayout[LTR,Row].png → ...lexContainerTest_shortLayout_Row[LTR].png b/...lexContainerTest_shortLayout[LTR,Row].png → ...lexContainerTest_shortLayout_Row[LTR].png
diff --git a/...lexContainerTest_shortLayout[RTL,Row].png → ...lexContainerTest_shortLayout_Row[RTL].png b/...lexContainerTest_shortLayout[RTL,Row].png → ...lexContainerTest_shortLayout_Row[RTL].png
diff --git a/...dwood/layout/AbstractFlexContainerTest.kt → ...dwood/layout/AbstractFlexContainerTest.kt b/...dwood/layout/AbstractFlexContainerTest.kt → ...dwood/layout/AbstractFlexContainerTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Square, Inc.
+ * Copyright (C) 2023 Square, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,9 +30,8 @@ import app.cash.redwood.ui.dp
 import app.cash.redwood.widget.ChangeListener
 import app.cash.redwood.widget.Widget
 import app.cash.redwood.yoga.FlexDirection
-import com.google.testing.junit.testparameterinjector.TestParameter
-import org.junit.Assume.assumeTrue
-import org.junit.Test
+import kotlin.test.Test
+import kotlin.test.assertTrue
 
 @Suppress("JUnitMalformedDeclaration")
 abstract class AbstractFlexContainerTest<T : Any> {
@@ -45,8 +44,16 @@ abstract class AbstractFlexContainerTest<T : Any> {
     this.modifier = modifier
   }
 
-  @Test fun emptyLayout(
-    @TestParameter flexDirectionEnum: FlexDirectionEnum,
+  @Test fun emptyLayout_Column() {
+    emptyLayout(FlexDirectionEnum.Column)
+  }
+
+  @Test fun emptyLayout_Row() {
+    emptyLayout(FlexDirectionEnum.Row)
+  }
+
+  private fun emptyLayout(
+    flexDirectionEnum: FlexDirectionEnum,
   ) {
     assumeTrue(flexDirectionEnum in listOf(FlexDirectionEnum.Row, FlexDirectionEnum.Column))
     val flexDirection = flexDirectionEnum.value
@@ -56,10 +63,42 @@ abstract class AbstractFlexContainerTest<T : Any> {
     verifySnapshot(container)
   }
 
-  @Test fun layoutWithConstraints(
-    @TestParameter flexDirectionEnum: FlexDirectionEnum,
-    @TestParameter widthEnum: ConstraintEnum,
-    @TestParameter heightEnum: ConstraintEnum,
+  @Test fun layoutWithConstraints_Column_Wrap_Wrap() {
+    layoutWithConstraints(FlexDirectionEnum.Column, ConstraintEnum.Wrap, ConstraintEnum.Wrap)
+  }
+
+  @Test fun layoutWithConstraints_Column_Wrap_Fill() {
+    layoutWithConstraints(FlexDirectionEnum.Column, ConstraintEnum.Wrap, ConstraintEnum.Fill)
+  }
+
+  @Test fun layoutWithConstraints_Column_Fill_Wrap() {
+    layoutWithConstraints(FlexDirectionEnum.Column, ConstraintEnum.Fill, ConstraintEnum.Wrap)
+  }
+
+  @Test fun layoutWithConstraints_Column_Fill_Fill() {
+    layoutWithConstraints(FlexDirectionEnum.Column, ConstraintEnum.Fill, ConstraintEnum.Fill)
+  }
+
+  @Test fun layoutWithConstraints_Row_Wrap_Wrap() {
+    layoutWithConstraints(FlexDirectionEnum.Row, ConstraintEnum.Wrap, ConstraintEnum.Wrap)
+  }
+
+  @Test fun layoutWithConstraints_Row_Wrap_Fill() {
+    layoutWithConstraints(FlexDirectionEnum.Row, ConstraintEnum.Wrap, ConstraintEnum.Fill)
+  }
+
+  @Test fun layoutWithConstraints_Row_Fill_Wrap() {
+    layoutWithConstraints(FlexDirectionEnum.Row, ConstraintEnum.Fill, ConstraintEnum.Wrap)
+  }
+
+  @Test fun layoutWithConstraints_Row_Fill_Fill() {
+    layoutWithConstraints(FlexDirectionEnum.Row, ConstraintEnum.Fill, ConstraintEnum.Fill)
+  }
+
+  private fun layoutWithConstraints(
+    flexDirectionEnum: FlexDirectionEnum,
+    widthEnum: ConstraintEnum,
+    heightEnum: ConstraintEnum,
   ) {
     assumeTrue(flexDirectionEnum in listOf(FlexDirectionEnum.Row, FlexDirectionEnum.Column))
     val flexDirection = flexDirectionEnum.value
@@ -73,8 +112,16 @@ abstract class AbstractFlexContainerTest<T : Any> {
     verifySnapshot(container)
   }
 
-  @Test fun shortLayout(
-    @TestParameter flexDirectionEnum: FlexDirectionEnum,
+  @Test fun shortLayout_Column() {
+    shortLayout(FlexDirectionEnum.Column)
+  }
+
+  @Test fun shortLayout_Row() {
+    shortLayout(FlexDirectionEnum.Row)
+  }
+
+  private fun shortLayout(
+    flexDirectionEnum: FlexDirectionEnum,
   ) {
     assumeTrue(flexDirectionEnum in listOf(FlexDirectionEnum.Row, FlexDirectionEnum.Column))
     val flexDirection = flexDirectionEnum.value
@@ -87,8 +134,16 @@ abstract class AbstractFlexContainerTest<T : Any> {
     verifySnapshot(container)
   }
 
-  @Test fun longLayout(
-    @TestParameter flexDirectionEnum: FlexDirectionEnum,
+  @Test fun longLayout_Column() {
+    longLayout(FlexDirectionEnum.Column)
+  }
+
+  @Test fun longLayout_Row() {
+    longLayout(FlexDirectionEnum.Row)
+  }
+
+  private fun longLayout(
+    flexDirectionEnum: FlexDirectionEnum,
   ) {
     assumeTrue(flexDirectionEnum in listOf(FlexDirectionEnum.Row, FlexDirectionEnum.Column))
     val flexDirection = flexDirectionEnum.value
@@ -101,8 +156,16 @@ abstract class AbstractFlexContainerTest<T : Any> {
     verifySnapshot(container)
   }
 
-  @Test fun layoutWithMarginAndDifferentAlignments(
-    @TestParameter flexDirectionEnum: FlexDirectionEnum,
+  @Test fun layoutWithMarginAndDifferentAlignments_Column() {
+    layoutWithMarginAndDifferentAlignments(FlexDirectionEnum.Column)
+  }
+
+  @Test fun layoutWithMarginAndDifferentAlignments_Row() {
+    layoutWithMarginAndDifferentAlignments(FlexDirectionEnum.Row)
+  }
+
+  private fun layoutWithMarginAndDifferentAlignments(
+    flexDirectionEnum: FlexDirectionEnum,
   ) {
     assumeTrue(flexDirectionEnum in listOf(FlexDirectionEnum.Row, FlexDirectionEnum.Column))
     val flexDirection = flexDirectionEnum.value
@@ -123,9 +186,41 @@ abstract class AbstractFlexContainerTest<T : Any> {
     verifySnapshot(container)
   }
 
-  @Test fun layoutWithCrossAxisAlignment(
-    @TestParameter flexDirectionEnum: FlexDirectionEnum,
-    @TestParameter crossAxisAlignmentEnum: CrossAxisAlignmentEnum,
+  @Test fun layoutWithCrossAxisAlignment_Column_Start() {
+    layoutWithCrossAxisAlignment(FlexDirectionEnum.Column, CrossAxisAlignmentEnum.Start)
+  }
+
+  @Test fun layoutWithCrossAxisAlignment_Column_Center() {
+    layoutWithCrossAxisAlignment(FlexDirectionEnum.Column, CrossAxisAlignmentEnum.Center)
+  }
+
+  @Test fun layoutWithCrossAxisAlignment_Column_End() {
+    layoutWithCrossAxisAlignment(FlexDirectionEnum.Column, CrossAxisAlignmentEnum.End)
+  }
+
+  @Test fun layoutWithCrossAxisAlignment_Column_Stretch() {
+    layoutWithCrossAxisAlignment(FlexDirectionEnum.Column, CrossAxisAlignmentEnum.Stretch)
+  }
+
+  @Test fun layoutWithCrossAxisAlignment_Row_Start() {
+    layoutWithCrossAxisAlignment(FlexDirectionEnum.Row, CrossAxisAlignmentEnum.Start)
+  }
+
+  @Test fun layoutWithCrossAxisAlignment_Row_Center() {
+    layoutWithCrossAxisAlignment(FlexDirectionEnum.Row, CrossAxisAlignmentEnum.Center)
+  }
+
+  @Test fun layoutWithCrossAxisAlignment_Row_End() {
+    layoutWithCrossAxisAlignment(FlexDirectionEnum.Row, CrossAxisAlignmentEnum.End)
+  }
+
+  @Test fun layoutWithCrossAxisAlignment_Row_Stretch() {
+    layoutWithCrossAxisAlignment(FlexDirectionEnum.Row, CrossAxisAlignmentEnum.Stretch)
+  }
+
+  private fun layoutWithCrossAxisAlignment(
+    flexDirectionEnum: FlexDirectionEnum,
+    crossAxisAlignmentEnum: CrossAxisAlignmentEnum,
   ) {
     assumeTrue(flexDirectionEnum in listOf(FlexDirectionEnum.Row, FlexDirectionEnum.Column))
     val flexDirection = flexDirectionEnum.value
@@ -157,8 +252,20 @@ abstract class AbstractFlexContainerTest<T : Any> {
     verifySnapshot(container, "FlexEnd")
   }
 
-  @Test fun columnWithMainAxisAlignment(
-    @TestParameter mainAxisAlignmentEnum: MainAxisAlignmentEnum,
+  @Test fun columnWithMainAxisAlignment_Center() {
+    columnWithMainAxisAlignment(MainAxisAlignmentEnum.Center)
+  }
+
+  @Test fun columnWithMainAxisAlignment_SpaceBetween() {
+    columnWithMainAxisAlignment(MainAxisAlignmentEnum.SpaceBetween)
+  }
+
+  @Test fun columnWithMainAxisAlignment_SpaceAround() {
+    columnWithMainAxisAlignment(MainAxisAlignmentEnum.SpaceAround)
+  }
+
+  private fun columnWithMainAxisAlignment(
+    mainAxisAlignmentEnum: MainAxisAlignmentEnum,
   ) {
     assumeTrue(mainAxisAlignmentEnum in listOf(MainAxisAlignmentEnum.Center, MainAxisAlignmentEnum.SpaceBetween, MainAxisAlignmentEnum.SpaceAround))
     val mainAxisAlignment = mainAxisAlignmentEnum.value
@@ -223,6 +330,11 @@ abstract class AbstractFlexContainerTest<T : Any> {
     container.onEndChanges()
     verifySnapshot(container, "updated")
   }
+
+  /** We don't have assume() on kotlin.test. Tests that fail here should be skipped instead. */
+  private fun assumeTrue(b: Boolean) {
+    assertTrue(b)
+  }
 }
 
 interface TestFlexContainer<T : Any> : ChangeListener {

diff --git a/...lumnWithMainAxisAlignment[LTR,Center].png → ...lumnWithMainAxisAlignment_Center[LTR].png b/...lumnWithMainAxisAlignment[LTR,Center].png → ...lumnWithMainAxisAlignment_Center[LTR].png
diff --git a/...lumnWithMainAxisAlignment[RTL,Center].png → ...lumnWithMainAxisAlignment_Center[RTL].png b/...lumnWithMainAxisAlignment[RTL,Center].png → ...lumnWithMainAxisAlignment_Center[RTL].png
diff --git a/...ithMainAxisAlignment[LTR,SpaceAround].png → ...ithMainAxisAlignment_SpaceAround[LTR].png b/...ithMainAxisAlignment[LTR,SpaceAround].png → ...ithMainAxisAlignment_SpaceAround[LTR].png
diff --git a/...ithMainAxisAlignment[RTL,SpaceAround].png → ...ithMainAxisAlignment_SpaceAround[RTL].png b/...ithMainAxisAlignment[RTL,SpaceAround].png → ...ithMainAxisAlignment_SpaceAround[RTL].png
diff --git a/...thMainAxisAlignment[LTR,SpaceBetween].png → ...thMainAxisAlignment_SpaceBetween[LTR].png b/...thMainAxisAlignment[LTR,SpaceBetween].png → ...thMainAxisAlignment_SpaceBetween[LTR].png
diff --git a/...thMainAxisAlignment[RTL,SpaceBetween].png → ...thMainAxisAlignment_SpaceBetween[RTL].png b/...thMainAxisAlignment[RTL,SpaceBetween].png → ...thMainAxisAlignment_SpaceBetween[RTL].png
diff --git a/...ContainerTest_emptyLayout[LTR,Column].png → ...ContainerTest_emptyLayout_Column[LTR].png b/...ContainerTest_emptyLayout[LTR,Column].png → ...ContainerTest_emptyLayout_Column[LTR].png
diff --git a/...lexContainerTest_emptyLayout[LTR,Row].png → ...ContainerTest_emptyLayout_Column[RTL].png b/...lexContainerTest_emptyLayout[LTR,Row].png → ...ContainerTest_emptyLayout_Column[RTL].png
diff --git a/...ContainerTest_emptyLayout[RTL,Column].png → ...lexContainerTest_emptyLayout_Row[LTR].png b/...ContainerTest_emptyLayout[RTL,Column].png → ...lexContainerTest_emptyLayout_Row[LTR].png
diff --git a/...lexContainerTest_emptyLayout[RTL,Row].png → ...lexContainerTest_emptyLayout_Row[RTL].png b/...lexContainerTest_emptyLayout[RTL,Row].png → ...lexContainerTest_emptyLayout_Row[RTL].png
diff --git a/...WithConstraints[LTR,Column,Fill,Fill].png → ...WithConstraints_Column_Fill_Fill[LTR].png b/...WithConstraints[LTR,Column,Fill,Fill].png → ...WithConstraints_Column_Fill_Fill[LTR].png
diff --git a/...WithConstraints[RTL,Column,Fill,Fill].png → ...WithConstraints_Column_Fill_Fill[RTL].png b/...WithConstraints[RTL,Column,Fill,Fill].png → ...WithConstraints_Column_Fill_Fill[RTL].png
diff --git a/...WithConstraints[LTR,Column,Fill,Wrap].png → ...WithConstraints_Column_Fill_Wrap[LTR].png b/...WithConstraints[LTR,Column,Fill,Wrap].png → ...WithConstraints_Column_Fill_Wrap[LTR].png
diff --git a/...WithConstraints[RTL,Column,Fill,Wrap].png → ...WithConstraints_Column_Fill_Wrap[RTL].png b/...WithConstraints[RTL,Column,Fill,Wrap].png → ...WithConstraints_Column_Fill_Wrap[RTL].png
diff --git a/...WithConstraints[LTR,Column,Wrap,Fill].png → ...WithConstraints_Column_Wrap_Fill[LTR].png b/...WithConstraints[LTR,Column,Wrap,Fill].png → ...WithConstraints_Column_Wrap_Fill[LTR].png
diff --git a/...WithConstraints[RTL,Column,Wrap,Fill].png → ...WithConstraints_Column_Wrap_Fill[RTL].png b/...WithConstraints[RTL,Column,Wrap,Fill].png → ...WithConstraints_Column_Wrap_Fill[RTL].png
diff --git a/...WithConstraints[LTR,Column,Wrap,Wrap].png → ...WithConstraints_Column_Wrap_Wrap[LTR].png b/...WithConstraints[LTR,Column,Wrap,Wrap].png → ...WithConstraints_Column_Wrap_Wrap[LTR].png
diff --git a/...WithConstraints[RTL,Column,Wrap,Wrap].png → ...WithConstraints_Column_Wrap_Wrap[RTL].png b/...WithConstraints[RTL,Column,Wrap,Wrap].png → ...WithConstraints_Column_Wrap_Wrap[RTL].png
diff --git a/...outWithConstraints[LTR,Row,Fill,Fill].png → ...outWithConstraints_Row_Fill_Fill[LTR].png b/...outWithConstraints[LTR,Row,Fill,Fill].png → ...outWithConstraints_Row_Fill_Fill[LTR].png
diff --git a/...outWithConstraints[RTL,Row,Fill,Fill].png → ...outWithConstraints_Row_Fill_Fill[RTL].png b/...outWithConstraints[RTL,Row,Fill,Fill].png → ...outWithConstraints_Row_Fill_Fill[RTL].png
diff --git a/...outWithConstraints[LTR,Row,Fill,Wrap].png → ...outWithConstraints_Row_Fill_Wrap[LTR].png b/...outWithConstraints[LTR,Row,Fill,Wrap].png → ...outWithConstraints_Row_Fill_Wrap[LTR].png
diff --git a/...outWithConstraints[RTL,Row,Fill,Wrap].png → ...outWithConstraints_Row_Fill_Wrap[RTL].png b/...outWithConstraints[RTL,Row,Fill,Wrap].png → ...outWithConstraints_Row_Fill_Wrap[RTL].png
diff --git a/...outWithConstraints[LTR,Row,Wrap,Fill].png → ...outWithConstraints_Row_Wrap_Fill[LTR].png b/...outWithConstraints[LTR,Row,Wrap,Fill].png → ...outWithConstraints_Row_Wrap_Fill[LTR].png
diff --git a/...outWithConstraints[RTL,Row,Wrap,Fill].png → ...outWithConstraints_Row_Wrap_Fill[RTL].png b/...outWithConstraints[RTL,Row,Wrap,Fill].png → ...outWithConstraints_Row_Wrap_Fill[RTL].png
diff --git a/...outWithConstraints[LTR,Row,Wrap,Wrap].png → ...outWithConstraints_Row_Wrap_Wrap[LTR].png b/...outWithConstraints[LTR,Row,Wrap,Wrap].png → ...outWithConstraints_Row_Wrap_Wrap[LTR].png
diff --git a/...outWithConstraints[RTL,Row,Wrap,Wrap].png → ...outWithConstraints_Row_Wrap_Wrap[RTL].png b/...outWithConstraints[RTL,Row,Wrap,Wrap].png → ...outWithConstraints_Row_Wrap_Wrap[RTL].png
diff --git a/...CrossAxisAlignment[LTR,Column,Center].png → ...CrossAxisAlignment_Column_Center[LTR].png b/...CrossAxisAlignment[LTR,Column,Center].png → ...CrossAxisAlignment_Column_Center[LTR].png
diff --git a/...CrossAxisAlignment[RTL,Column,Center].png → ...CrossAxisAlignment_Column_Center[RTL].png b/...CrossAxisAlignment[RTL,Column,Center].png → ...CrossAxisAlignment_Column_Center[RTL].png
diff --git a/...ithCrossAxisAlignment[LTR,Column,End].png → ...ithCrossAxisAlignment_Column_End[LTR].png b/...ithCrossAxisAlignment[LTR,Column,End].png → ...ithCrossAxisAlignment_Column_End[LTR].png
diff --git a/...ithCrossAxisAlignment[RTL,Column,End].png → ...ithCrossAxisAlignment_Column_End[RTL].png b/...ithCrossAxisAlignment[RTL,Column,End].png → ...ithCrossAxisAlignment_Column_End[RTL].png
diff --git a/...hCrossAxisAlignment[LTR,Column,Start].png → ...hCrossAxisAlignment_Column_Start[LTR].png b/...hCrossAxisAlignment[LTR,Column,Start].png → ...hCrossAxisAlignment_Column_Start[LTR].png
diff --git a/...hCrossAxisAlignment[RTL,Column,Start].png → ...hCrossAxisAlignment_Column_Start[RTL].png b/...hCrossAxisAlignment[RTL,Column,Start].png → ...hCrossAxisAlignment_Column_Start[RTL].png
diff --git a/...rossAxisAlignment[LTR,Column,Stretch].png → ...rossAxisAlignment_Column_Stretch[LTR].png b/...rossAxisAlignment[LTR,Column,Stretch].png → ...rossAxisAlignment_Column_Stretch[LTR].png
diff --git a/...rossAxisAlignment[RTL,Column,Stretch].png → ...rossAxisAlignment_Column_Stretch[RTL].png b/...rossAxisAlignment[RTL,Column,Stretch].png → ...rossAxisAlignment_Column_Stretch[RTL].png
diff --git a/...ithCrossAxisAlignment[LTR,Row,Center].png → ...ithCrossAxisAlignment_Row_Center[LTR].png b/...ithCrossAxisAlignment[LTR,Row,Center].png → ...ithCrossAxisAlignment_Row_Center[LTR].png
diff --git a/...ithCrossAxisAlignment[RTL,Row,Center].png → ...ithCrossAxisAlignment_Row_Center[RTL].png b/...ithCrossAxisAlignment[RTL,Row,Center].png → ...ithCrossAxisAlignment_Row_Center[RTL].png
diff --git a/...utWithCrossAxisAlignment[LTR,Row,End].png → ...utWithCrossAxisAlignment_Row_End[LTR].png b/...utWithCrossAxisAlignment[LTR,Row,End].png → ...utWithCrossAxisAlignment_Row_End[LTR].png
diff --git a/...utWithCrossAxisAlignment[RTL,Row,End].png → ...utWithCrossAxisAlignment_Row_End[RTL].png b/...utWithCrossAxisAlignment[RTL,Row,End].png → ...utWithCrossAxisAlignment_Row_End[RTL].png
diff --git a/...WithCrossAxisAlignment[LTR,Row,Start].png → ...WithCrossAxisAlignment_Row_Start[LTR].png b/...WithCrossAxisAlignment[LTR,Row,Start].png → ...WithCrossAxisAlignment_Row_Start[LTR].png
diff --git a/...WithCrossAxisAlignment[RTL,Row,Start].png → ...WithCrossAxisAlignment_Row_Start[RTL].png b/...WithCrossAxisAlignment[RTL,Row,Start].png → ...WithCrossAxisAlignment_Row_Start[RTL].png
diff --git a/...thCrossAxisAlignment[LTR,Row,Stretch].png → ...thCrossAxisAlignment_Row_Stretch[LTR].png b/...thCrossAxisAlignment[LTR,Row,Stretch].png → ...thCrossAxisAlignment_Row_Stretch[LTR].png
diff --git a/...thCrossAxisAlignment[RTL,Row,Stretch].png → ...thCrossAxisAlignment_Row_Stretch[RTL].png b/...thCrossAxisAlignment[RTL,Row,Stretch].png → ...thCrossAxisAlignment_Row_Stretch[RTL].png
diff --git a/...ginAndDifferentAlignments[LTR,Column].png → ...ginAndDifferentAlignments_Column[LTR].png b/...ginAndDifferentAlignments[LTR,Column].png → ...ginAndDifferentAlignments_Column[LTR].png
diff --git a/...ginAndDifferentAlignments[RTL,Column].png → ...ginAndDifferentAlignments_Column[RTL].png b/...ginAndDifferentAlignments[RTL,Column].png → ...ginAndDifferentAlignments_Column[RTL].png
diff --git a/...MarginAndDifferentAlignments[LTR,Row].png → ...MarginAndDifferentAlignments_Row[LTR].png b/...MarginAndDifferentAlignments[LTR,Row].png → ...MarginAndDifferentAlignments_Row[LTR].png
diff --git a/...MarginAndDifferentAlignments[RTL,Row].png → ...MarginAndDifferentAlignments_Row[RTL].png b/...MarginAndDifferentAlignments[RTL,Row].png → ...MarginAndDifferentAlignments_Row[RTL].png
diff --git a/...xContainerTest_longLayout[LTR,Column].png → ...xContainerTest_longLayout_Column[LTR].png b/...xContainerTest_longLayout[LTR,Column].png → ...xContainerTest_longLayout_Column[LTR].png
diff --git a/...xContainerTest_longLayout[RTL,Column].png → ...xContainerTest_longLayout_Column[RTL].png b/...xContainerTest_longLayout[RTL,Column].png → ...xContainerTest_longLayout_Column[RTL].png
diff --git a/...FlexContainerTest_longLayout[LTR,Row].png → ...FlexContainerTest_longLayout_Row[LTR].png b/...FlexContainerTest_longLayout[LTR,Row].png → ...FlexContainerTest_longLayout_Row[LTR].png
diff --git a/...FlexContainerTest_longLayout[RTL,Row].png → ...FlexContainerTest_longLayout_Row[RTL].png b/...FlexContainerTest_longLayout[RTL,Row].png → ...FlexContainerTest_longLayout_Row[RTL].png
diff --git a/...ContainerTest_shortLayout[LTR,Column].png → ...ContainerTest_shortLayout_Column[LTR].png b/...ContainerTest_shortLayout[LTR,Column].png → ...ContainerTest_shortLayout_Column[LTR].png
diff --git a/...ContainerTest_shortLayout[RTL,Column].png → ...ContainerTest_shortLayout_Column[RTL].png b/...ContainerTest_shortLayout[RTL,Column].png → ...ContainerTest_shortLayout_Column[RTL].png
diff --git a/...lexContainerTest_shortLayout[LTR,Row].png → ...lexContainerTest_shortLayout_Row[LTR].png b/...lexContainerTest_shortLayout[LTR,Row].png → ...lexContainerTest_shortLayout_Row[LTR].png
diff --git a/...lexContainerTest_shortLayout[RTL,Row].png → ...lexContainerTest_shortLayout_Row[RTL].png b/...lexContainerTest_shortLayout[RTL,Row].png → ...lexContainerTest_shortLayout_Row[RTL].png
diff --git a/...lumnWithMainAxisAlignment[LTR,Center].png → ...lumnWithMainAxisAlignment_Center[LTR].png b/...lumnWithMainAxisAlignment[LTR,Center].png → ...lumnWithMainAxisAlignment_Center[LTR].png
diff --git a/...lumnWithMainAxisAlignment[RTL,Center].png → ...lumnWithMainAxisAlignment_Center[RTL].png b/...lumnWithMainAxisAlignment[RTL,Center].png → ...lumnWithMainAxisAlignment_Center[RTL].png
diff --git a/...ithMainAxisAlignment[LTR,SpaceAround].png → ...ithMainAxisAlignment_SpaceAround[LTR].png b/...ithMainAxisAlignment[LTR,SpaceAround].png → ...ithMainAxisAlignment_SpaceAround[LTR].png
diff --git a/...ithMainAxisAlignment[RTL,SpaceAround].png → ...ithMainAxisAlignment_SpaceAround[RTL].png b/...ithMainAxisAlignment[RTL,SpaceAround].png → ...ithMainAxisAlignment_SpaceAround[RTL].png
diff --git a/...thMainAxisAlignment[LTR,SpaceBetween].png → ...thMainAxisAlignment_SpaceBetween[LTR].png b/...thMainAxisAlignment[LTR,SpaceBetween].png → ...thMainAxisAlignment_SpaceBetween[LTR].png
diff --git a/...thMainAxisAlignment[RTL,SpaceBetween].png → ...thMainAxisAlignment_SpaceBetween[RTL].png b/...thMainAxisAlignment[RTL,SpaceBetween].png → ...thMainAxisAlignment_SpaceBetween[RTL].png
diff --git a/...iLazyListTest_emptyLayout[LTR,Column].png → ...iLazyListTest_emptyLayout_Column[LTR].png b/...iLazyListTest_emptyLayout[LTR,Column].png → ...iLazyListTest_emptyLayout_Column[LTR].png
diff --git a/...seUiLazyListTest_emptyLayout[LTR,Row].png → ...iLazyListTest_emptyLayout_Column[RTL].png b/...seUiLazyListTest_emptyLayout[LTR,Row].png → ...iLazyListTest_emptyLayout_Column[RTL].png
diff --git a/...iLazyListTest_emptyLayout[RTL,Column].png → ...seUiLazyListTest_emptyLayout_Row[LTR].png b/...iLazyListTest_emptyLayout[RTL,Column].png → ...seUiLazyListTest_emptyLayout_Row[LTR].png
diff --git a/...seUiLazyListTest_emptyLayout[RTL,Row].png → ...seUiLazyListTest_emptyLayout_Row[RTL].png b/...seUiLazyListTest_emptyLayout[RTL,Row].png → ...seUiLazyListTest_emptyLayout_Row[RTL].png
diff --git a/...WithConstraints[LTR,Column,Fill,Fill].png → ...WithConstraints_Column_Fill_Fill[LTR].png b/...WithConstraints[LTR,Column,Fill,Fill].png → ...WithConstraints_Column_Fill_Fill[LTR].png
diff --git a/...WithConstraints[RTL,Column,Fill,Fill].png → ...WithConstraints_Column_Fill_Fill[RTL].png b/...WithConstraints[RTL,Column,Fill,Fill].png → ...WithConstraints_Column_Fill_Fill[RTL].png
diff --git a/...WithConstraints[LTR,Column,Fill,Wrap].png → ...WithConstraints_Column_Fill_Wrap[LTR].png b/...WithConstraints[LTR,Column,Fill,Wrap].png → ...WithConstraints_Column_Fill_Wrap[LTR].png
diff --git a/...WithConstraints[RTL,Column,Fill,Wrap].png → ...WithConstraints_Column_Fill_Wrap[RTL].png b/...WithConstraints[RTL,Column,Fill,Wrap].png → ...WithConstraints_Column_Fill_Wrap[RTL].png
diff --git a/...WithConstraints[LTR,Column,Wrap,Fill].png → ...WithConstraints_Column_Wrap_Fill[LTR].png b/...WithConstraints[LTR,Column,Wrap,Fill].png → ...WithConstraints_Column_Wrap_Fill[LTR].png
diff --git a/...WithConstraints[RTL,Column,Wrap,Fill].png → ...WithConstraints_Column_Wrap_Fill[RTL].png b/...WithConstraints[RTL,Column,Wrap,Fill].png → ...WithConstraints_Column_Wrap_Fill[RTL].png
diff --git a/...WithConstraints[LTR,Column,Wrap,Wrap].png → ...WithConstraints_Column_Wrap_Wrap[LTR].png b/...WithConstraints[LTR,Column,Wrap,Wrap].png → ...WithConstraints_Column_Wrap_Wrap[LTR].png
diff --git a/...WithConstraints[RTL,Column,Wrap,Wrap].png → ...WithConstraints_Column_Wrap_Wrap[RTL].png b/...WithConstraints[RTL,Column,Wrap,Wrap].png → ...WithConstraints_Column_Wrap_Wrap[RTL].png
diff --git a/...outWithConstraints[LTR,Row,Fill,Fill].png → ...outWithConstraints_Row_Fill_Fill[LTR].png b/...outWithConstraints[LTR,Row,Fill,Fill].png → ...outWithConstraints_Row_Fill_Fill[LTR].png
diff --git a/...outWithConstraints[RTL,Row,Fill,Fill].png → ...outWithConstraints_Row_Fill_Fill[RTL].png b/...outWithConstraints[RTL,Row,Fill,Fill].png → ...outWithConstraints_Row_Fill_Fill[RTL].png
diff --git a/...outWithConstraints[LTR,Row,Fill,Wrap].png → ...outWithConstraints_Row_Fill_Wrap[LTR].png b/...outWithConstraints[LTR,Row,Fill,Wrap].png → ...outWithConstraints_Row_Fill_Wrap[LTR].png
diff --git a/...outWithConstraints[RTL,Row,Fill,Wrap].png → ...outWithConstraints_Row_Fill_Wrap[RTL].png b/...outWithConstraints[RTL,Row,Fill,Wrap].png → ...outWithConstraints_Row_Fill_Wrap[RTL].png
diff --git a/...outWithConstraints[LTR,Row,Wrap,Fill].png → ...outWithConstraints_Row_Wrap_Fill[LTR].png b/...outWithConstraints[LTR,Row,Wrap,Fill].png → ...outWithConstraints_Row_Wrap_Fill[LTR].png
diff --git a/...outWithConstraints[RTL,Row,Wrap,Fill].png → ...outWithConstraints_Row_Wrap_Fill[RTL].png b/...outWithConstraints[RTL,Row,Wrap,Fill].png → ...outWithConstraints_Row_Wrap_Fill[RTL].png
diff --git a/...outWithConstraints[LTR,Row,Wrap,Wrap].png → ...outWithConstraints_Row_Wrap_Wrap[LTR].png b/...outWithConstraints[LTR,Row,Wrap,Wrap].png → ...outWithConstraints_Row_Wrap_Wrap[LTR].png
diff --git a/...outWithConstraints[RTL,Row,Wrap,Wrap].png → ...outWithConstraints_Row_Wrap_Wrap[RTL].png b/...outWithConstraints[RTL,Row,Wrap,Wrap].png → ...outWithConstraints_Row_Wrap_Wrap[RTL].png
diff --git a/...CrossAxisAlignment[LTR,Column,Center].png → ...CrossAxisAlignment_Column_Center[LTR].png b/...CrossAxisAlignment[LTR,Column,Center].png → ...CrossAxisAlignment_Column_Center[LTR].png
diff --git a/...CrossAxisAlignment[RTL,Column,Center].png → ...CrossAxisAlignment_Column_Center[RTL].png b/...CrossAxisAlignment[RTL,Column,Center].png → ...CrossAxisAlignment_Column_Center[RTL].png
diff --git a/...ithCrossAxisAlignment[LTR,Column,End].png → ...ithCrossAxisAlignment_Column_End[LTR].png b/...ithCrossAxisAlignment[LTR,Column,End].png → ...ithCrossAxisAlignment_Column_End[LTR].png
diff --git a/...ithCrossAxisAlignment[RTL,Column,End].png → ...ithCrossAxisAlignment_Column_End[RTL].png b/...ithCrossAxisAlignment[RTL,Column,End].png → ...ithCrossAxisAlignment_Column_End[RTL].png
diff --git a/...hCrossAxisAlignment[LTR,Column,Start].png → ...hCrossAxisAlignment_Column_Start[LTR].png b/...hCrossAxisAlignment[LTR,Column,Start].png → ...hCrossAxisAlignment_Column_Start[LTR].png
diff --git a/...hCrossAxisAlignment[RTL,Column,Start].png → ...hCrossAxisAlignment_Column_Start[RTL].png b/...hCrossAxisAlignment[RTL,Column,Start].png → ...hCrossAxisAlignment_Column_Start[RTL].png
diff --git a/...rossAxisAlignment[LTR,Column,Stretch].png → ...rossAxisAlignment_Column_Stretch[LTR].png b/...rossAxisAlignment[LTR,Column,Stretch].png → ...rossAxisAlignment_Column_Stretch[LTR].png
diff --git a/...rossAxisAlignment[RTL,Column,Stretch].png → ...rossAxisAlignment_Column_Stretch[RTL].png b/...rossAxisAlignment[RTL,Column,Stretch].png → ...rossAxisAlignment_Column_Stretch[RTL].png
diff --git a/...ithCrossAxisAlignment[LTR,Row,Center].png → ...ithCrossAxisAlignment_Row_Center[LTR].png b/...ithCrossAxisAlignment[LTR,Row,Center].png → ...ithCrossAxisAlignment_Row_Center[LTR].png
diff --git a/...ithCrossAxisAlignment[RTL,Row,Center].png → ...ithCrossAxisAlignment_Row_Center[RTL].png b/...ithCrossAxisAlignment[RTL,Row,Center].png → ...ithCrossAxisAlignment_Row_Center[RTL].png
diff --git a/...utWithCrossAxisAlignment[LTR,Row,End].png → ...utWithCrossAxisAlignment_Row_End[LTR].png b/...utWithCrossAxisAlignment[LTR,Row,End].png → ...utWithCrossAxisAlignment_Row_End[LTR].png
diff --git a/...utWithCrossAxisAlignment[RTL,Row,End].png → ...utWithCrossAxisAlignment_Row_End[RTL].png b/...utWithCrossAxisAlignment[RTL,Row,End].png → ...utWithCrossAxisAlignment_Row_End[RTL].png
diff --git a/...WithCrossAxisAlignment[LTR,Row,Start].png → ...WithCrossAxisAlignment_Row_Start[LTR].png b/...WithCrossAxisAlignment[LTR,Row,Start].png → ...WithCrossAxisAlignment_Row_Start[LTR].png
diff --git a/...WithCrossAxisAlignment[RTL,Row,Start].png → ...WithCrossAxisAlignment_Row_Start[RTL].png b/...WithCrossAxisAlignment[RTL,Row,Start].png → ...WithCrossAxisAlignment_Row_Start[RTL].png
diff --git a/...thCrossAxisAlignment[LTR,Row,Stretch].png → ...thCrossAxisAlignment_Row_Stretch[LTR].png b/...thCrossAxisAlignment[LTR,Row,Stretch].png → ...thCrossAxisAlignment_Row_Stretch[LTR].png
diff --git a/...thCrossAxisAlignment[RTL,Row,Stretch].png → ...thCrossAxisAlignment_Row_Stretch[RTL].png b/...thCrossAxisAlignment[RTL,Row,Stretch].png → ...thCrossAxisAlignment_Row_Stretch[RTL].png
diff --git a/...ginAndDifferentAlignments[LTR,Column].png → ...ginAndDifferentAlignments_Column[LTR].png b/...ginAndDifferentAlignments[LTR,Column].png → ...ginAndDifferentAlignments_Column[LTR].png
diff --git a/...ginAndDifferentAlignments[RTL,Column].png → ...ginAndDifferentAlignments_Column[RTL].png b/...ginAndDifferentAlignments[RTL,Column].png → ...ginAndDifferentAlignments_Column[RTL].png
diff --git a/...MarginAndDifferentAlignments[LTR,Row].png → ...MarginAndDifferentAlignments_Row[LTR].png b/...MarginAndDifferentAlignments[LTR,Row].png → ...MarginAndDifferentAlignments_Row[LTR].png
diff --git a/...MarginAndDifferentAlignments[RTL,Row].png → ...MarginAndDifferentAlignments_Row[RTL].png b/...MarginAndDifferentAlignments[RTL,Row].png → ...MarginAndDifferentAlignments_Row[RTL].png
diff --git a/...UiLazyListTest_longLayout[LTR,Column].png → ...UiLazyListTest_longLayout_Column[LTR].png b/...UiLazyListTest_longLayout[LTR,Column].png → ...UiLazyListTest_longLayout_Column[LTR].png
diff --git a/...UiLazyListTest_longLayout[RTL,Column].png → ...UiLazyListTest_longLayout_Column[RTL].png b/...UiLazyListTest_longLayout[RTL,Column].png → ...UiLazyListTest_longLayout_Column[RTL].png
diff --git a/...oseUiLazyListTest_longLayout[LTR,Row].png → ...oseUiLazyListTest_longLayout_Row[LTR].png b/...oseUiLazyListTest_longLayout[LTR,Row].png → ...oseUiLazyListTest_longLayout_Row[LTR].png
diff --git a/...oseUiLazyListTest_longLayout[RTL,Row].png → ...oseUiLazyListTest_longLayout_Row[RTL].png b/...oseUiLazyListTest_longLayout[RTL,Row].png → ...oseUiLazyListTest_longLayout_Row[RTL].png
diff --git a/...iLazyListTest_shortLayout[LTR,Column].png → ...iLazyListTest_shortLayout_Column[LTR].png b/...iLazyListTest_shortLayout[LTR,Column].png → ...iLazyListTest_shortLayout_Column[LTR].png
diff --git a/...iLazyListTest_shortLayout[RTL,Column].png → ...iLazyListTest_shortLayout_Column[RTL].png b/...iLazyListTest_shortLayout[RTL,Column].png → ...iLazyListTest_shortLayout_Column[RTL].png
diff --git a/...seUiLazyListTest_shortLayout[LTR,Row].png → ...seUiLazyListTest_shortLayout_Row[LTR].png b/...seUiLazyListTest_shortLayout[LTR,Row].png → ...seUiLazyListTest_shortLayout_Row[LTR].png
diff --git a/...seUiLazyListTest_shortLayout[RTL,Row].png → ...seUiLazyListTest_shortLayout_Row[RTL].png b/...seUiLazyListTest_shortLayout[RTL,Row].png → ...seUiLazyListTest_shortLayout_Row[RTL].png
diff --git a/...lumnWithMainAxisAlignment[LTR,Center].png → ...lumnWithMainAxisAlignment_Center[LTR].png b/...lumnWithMainAxisAlignment[LTR,Center].png → ...lumnWithMainAxisAlignment_Center[LTR].png
diff --git a/...lumnWithMainAxisAlignment[RTL,Center].png → ...lumnWithMainAxisAlignment_Center[RTL].png b/...lumnWithMainAxisAlignment[RTL,Center].png → ...lumnWithMainAxisAlignment_Center[RTL].png
diff --git a/...ithMainAxisAlignment[LTR,SpaceAround].png → ...ithMainAxisAlignment_SpaceAround[LTR].png b/...ithMainAxisAlignment[LTR,SpaceAround].png → ...ithMainAxisAlignment_SpaceAround[LTR].png
diff --git a/...ithMainAxisAlignment[RTL,SpaceAround].png → ...ithMainAxisAlignment_SpaceAround[RTL].png b/...ithMainAxisAlignment[RTL,SpaceAround].png → ...ithMainAxisAlignment_SpaceAround[RTL].png
diff --git a/...thMainAxisAlignment[LTR,SpaceBetween].png → ...thMainAxisAlignment_SpaceBetween[LTR].png b/...thMainAxisAlignment[LTR,SpaceBetween].png → ...thMainAxisAlignment_SpaceBetween[LTR].png
diff --git a/...thMainAxisAlignment[RTL,SpaceBetween].png → ...thMainAxisAlignment_SpaceBetween[RTL].png b/...thMainAxisAlignment[RTL,SpaceBetween].png → ...thMainAxisAlignment_SpaceBetween[RTL].png
diff --git a/...wLazyListTest_emptyLayout[LTR,Column].png → ...wLazyListTest_emptyLayout_Column[LTR].png b/...wLazyListTest_emptyLayout[LTR,Column].png → ...wLazyListTest_emptyLayout_Column[LTR].png
diff --git a/...ViewLazyListTest_emptyLayout[LTR,Row].png → ...wLazyListTest_emptyLayout_Column[RTL].png b/...ViewLazyListTest_emptyLayout[LTR,Row].png → ...wLazyListTest_emptyLayout_Column[RTL].png
diff --git a/...wLazyListTest_emptyLayout[RTL,Column].png → ...ViewLazyListTest_emptyLayout_Row[LTR].png b/...wLazyListTest_emptyLayout[RTL,Column].png → ...ViewLazyListTest_emptyLayout_Row[LTR].png
diff --git a/...ViewLazyListTest_emptyLayout[RTL,Row].png → ...ViewLazyListTest_emptyLayout_Row[RTL].png b/...ViewLazyListTest_emptyLayout[RTL,Row].png → ...ViewLazyListTest_emptyLayout_Row[RTL].png
diff --git a/...WithConstraints[LTR,Column,Fill,Fill].png → ...WithConstraints_Column_Fill_Fill[LTR].png b/...WithConstraints[LTR,Column,Fill,Fill].png → ...WithConstraints_Column_Fill_Fill[LTR].png
diff --git a/...WithConstraints[RTL,Column,Fill,Fill].png → ...WithConstraints_Column_Fill_Fill[RTL].png b/...WithConstraints[RTL,Column,Fill,Fill].png → ...WithConstraints_Column_Fill_Fill[RTL].png
diff --git a/...WithConstraints[LTR,Column,Fill,Wrap].png → ...WithConstraints_Column_Fill_Wrap[LTR].png b/...WithConstraints[LTR,Column,Fill,Wrap].png → ...WithConstraints_Column_Fill_Wrap[LTR].png
diff --git a/...WithConstraints[RTL,Column,Fill,Wrap].png → ...WithConstraints_Column_Fill_Wrap[RTL].png b/...WithConstraints[RTL,Column,Fill,Wrap].png → ...WithConstraints_Column_Fill_Wrap[RTL].png
diff --git a/...WithConstraints[LTR,Column,Wrap,Fill].png → ...WithConstraints_Column_Wrap_Fill[LTR].png b/...WithConstraints[LTR,Column,Wrap,Fill].png → ...WithConstraints_Column_Wrap_Fill[LTR].png
diff --git a/...WithConstraints[RTL,Column,Wrap,Fill].png → ...WithConstraints_Column_Wrap_Fill[RTL].png b/...WithConstraints[RTL,Column,Wrap,Fill].png → ...WithConstraints_Column_Wrap_Fill[RTL].png
diff --git a/...WithConstraints[LTR,Column,Wrap,Wrap].png → ...WithConstraints_Column_Wrap_Wrap[LTR].png b/...WithConstraints[LTR,Column,Wrap,Wrap].png → ...WithConstraints_Column_Wrap_Wrap[LTR].png
diff --git a/...WithConstraints[RTL,Column,Wrap,Wrap].png → ...WithConstraints_Column_Wrap_Wrap[RTL].png b/...WithConstraints[RTL,Column,Wrap,Wrap].png → ...WithConstraints_Column_Wrap_Wrap[RTL].png
diff --git a/...outWithConstraints[LTR,Row,Fill,Fill].png → ...outWithConstraints_Row_Fill_Fill[LTR].png b/...outWithConstraints[LTR,Row,Fill,Fill].png → ...outWithConstraints_Row_Fill_Fill[LTR].png
diff --git a/...outWithConstraints[RTL,Row,Fill,Fill].png → ...outWithConstraints_Row_Fill_Fill[RTL].png b/...outWithConstraints[RTL,Row,Fill,Fill].png → ...outWithConstraints_Row_Fill_Fill[RTL].png
diff --git a/...outWithConstraints[LTR,Row,Fill,Wrap].png → ...outWithConstraints_Row_Fill_Wrap[LTR].png b/...outWithConstraints[LTR,Row,Fill,Wrap].png → ...outWithConstraints_Row_Fill_Wrap[LTR].png
diff --git a/...outWithConstraints[RTL,Row,Fill,Wrap].png → ...outWithConstraints_Row_Fill_Wrap[RTL].png b/...outWithConstraints[RTL,Row,Fill,Wrap].png → ...outWithConstraints_Row_Fill_Wrap[RTL].png
diff --git a/...outWithConstraints[LTR,Row,Wrap,Fill].png → ...outWithConstraints_Row_Wrap_Fill[LTR].png b/...outWithConstraints[LTR,Row,Wrap,Fill].png → ...outWithConstraints_Row_Wrap_Fill[LTR].png
diff --git a/...outWithConstraints[RTL,Row,Wrap,Fill].png → ...outWithConstraints_Row_Wrap_Fill[RTL].png b/...outWithConstraints[RTL,Row,Wrap,Fill].png → ...outWithConstraints_Row_Wrap_Fill[RTL].png
diff --git a/...outWithConstraints[LTR,Row,Wrap,Wrap].png → ...outWithConstraints_Row_Wrap_Wrap[LTR].png b/...outWithConstraints[LTR,Row,Wrap,Wrap].png → ...outWithConstraints_Row_Wrap_Wrap[LTR].png
diff --git a/...outWithConstraints[RTL,Row,Wrap,Wrap].png → ...outWithConstraints_Row_Wrap_Wrap[RTL].png b/...outWithConstraints[RTL,Row,Wrap,Wrap].png → ...outWithConstraints_Row_Wrap_Wrap[RTL].png
diff --git a/...CrossAxisAlignment[LTR,Column,Center].png → ...CrossAxisAlignment_Column_Center[LTR].png b/...CrossAxisAlignment[LTR,Column,Center].png → ...CrossAxisAlignment_Column_Center[LTR].png
diff --git a/...CrossAxisAlignment[RTL,Column,Center].png → ...CrossAxisAlignment_Column_Center[RTL].png b/...CrossAxisAlignment[RTL,Column,Center].png → ...CrossAxisAlignment_Column_Center[RTL].png
diff --git a/...ithCrossAxisAlignment[LTR,Column,End].png → ...ithCrossAxisAlignment_Column_End[LTR].png b/...ithCrossAxisAlignment[LTR,Column,End].png → ...ithCrossAxisAlignment_Column_End[LTR].png
diff --git a/...hCrossAxisAlignment[LTR,Column,Start].png → ...ithCrossAxisAlignment_Column_End[RTL].png b/...hCrossAxisAlignment[LTR,Column,Start].png → ...ithCrossAxisAlignment_Column_End[RTL].png
diff --git a/...ithCrossAxisAlignment[RTL,Column,End].png → ...hCrossAxisAlignment_Column_Start[LTR].png b/...ithCrossAxisAlignment[RTL,Column,End].png → ...hCrossAxisAlignment_Column_Start[LTR].png
diff --git a/...hCrossAxisAlignment[RTL,Column,Start].png → ...hCrossAxisAlignment_Column_Start[RTL].png b/...hCrossAxisAlignment[RTL,Column,Start].png → ...hCrossAxisAlignment_Column_Start[RTL].png
diff --git a/...rossAxisAlignment[LTR,Column,Stretch].png → ...rossAxisAlignment_Column_Stretch[LTR].png b/...rossAxisAlignment[LTR,Column,Stretch].png → ...rossAxisAlignment_Column_Stretch[LTR].png
diff --git a/...rossAxisAlignment[RTL,Column,Stretch].png → ...rossAxisAlignment_Column_Stretch[RTL].png b/...rossAxisAlignment[RTL,Column,Stretch].png → ...rossAxisAlignment_Column_Stretch[RTL].png
diff --git a/...ithCrossAxisAlignment[LTR,Row,Center].png → ...ithCrossAxisAlignment_Row_Center[LTR].png b/...ithCrossAxisAlignment[LTR,Row,Center].png → ...ithCrossAxisAlignment_Row_Center[LTR].png
diff --git a/...ithCrossAxisAlignment[RTL,Row,Center].png → ...ithCrossAxisAlignment_Row_Center[RTL].png b/...ithCrossAxisAlignment[RTL,Row,Center].png → ...ithCrossAxisAlignment_Row_Center[RTL].png
diff --git a/...utWithCrossAxisAlignment[LTR,Row,End].png → ...utWithCrossAxisAlignment_Row_End[LTR].png b/...utWithCrossAxisAlignment[LTR,Row,End].png → ...utWithCrossAxisAlignment_Row_End[LTR].png
diff --git a/...utWithCrossAxisAlignment[RTL,Row,End].png → ...utWithCrossAxisAlignment_Row_End[RTL].png b/...utWithCrossAxisAlignment[RTL,Row,End].png → ...utWithCrossAxisAlignment_Row_End[RTL].png
diff --git a/...WithCrossAxisAlignment[LTR,Row,Start].png → ...WithCrossAxisAlignment_Row_Start[LTR].png b/...WithCrossAxisAlignment[LTR,Row,Start].png → ...WithCrossAxisAlignment_Row_Start[LTR].png
diff --git a/...WithCrossAxisAlignment[RTL,Row,Start].png → ...WithCrossAxisAlignment_Row_Start[RTL].png b/...WithCrossAxisAlignment[RTL,Row,Start].png → ...WithCrossAxisAlignment_Row_Start[RTL].png
diff --git a/...thCrossAxisAlignment[LTR,Row,Stretch].png → ...thCrossAxisAlignment_Row_Stretch[LTR].png b/...thCrossAxisAlignment[LTR,Row,Stretch].png → ...thCrossAxisAlignment_Row_Stretch[LTR].png
diff --git a/...thCrossAxisAlignment[RTL,Row,Stretch].png → ...thCrossAxisAlignment_Row_Stretch[RTL].png b/...thCrossAxisAlignment[RTL,Row,Stretch].png → ...thCrossAxisAlignment_Row_Stretch[RTL].png
diff --git a/...ginAndDifferentAlignments[LTR,Column].png → ...ginAndDifferentAlignments_Column[LTR].png b/...ginAndDifferentAlignments[LTR,Column].png → ...ginAndDifferentAlignments_Column[LTR].png
diff --git a/...ginAndDifferentAlignments[RTL,Column].png → ...ginAndDifferentAlignments_Column[RTL].png b/...ginAndDifferentAlignments[RTL,Column].png → ...ginAndDifferentAlignments_Column[RTL].png
diff --git a/...MarginAndDifferentAlignments[LTR,Row].png → ...MarginAndDifferentAlignments_Row[LTR].png b/...MarginAndDifferentAlignments[LTR,Row].png → ...MarginAndDifferentAlignments_Row[LTR].png
diff --git a/...MarginAndDifferentAlignments[RTL,Row].png → ...MarginAndDifferentAlignments_Row[RTL].png b/...MarginAndDifferentAlignments[RTL,Row].png → ...MarginAndDifferentAlignments_Row[RTL].png
diff --git a/...ewLazyListTest_longLayout[LTR,Column].png → ...ewLazyListTest_longLayout_Column[LTR].png b/...ewLazyListTest_longLayout[LTR,Column].png → ...ewLazyListTest_longLayout_Column[LTR].png
diff --git a/...ewLazyListTest_longLayout[RTL,Column].png → ...ewLazyListTest_longLayout_Column[RTL].png b/...ewLazyListTest_longLayout[RTL,Column].png → ...ewLazyListTest_longLayout_Column[RTL].png
diff --git a/..._ViewLazyListTest_longLayout[LTR,Row].png → ..._ViewLazyListTest_longLayout_Row[LTR].png b/..._ViewLazyListTest_longLayout[LTR,Row].png → ..._ViewLazyListTest_longLayout_Row[LTR].png
diff --git a/..._ViewLazyListTest_longLayout[RTL,Row].png → ..._ViewLazyListTest_longLayout_Row[RTL].png b/..._ViewLazyListTest_longLayout[RTL,Row].png → ..._ViewLazyListTest_longLayout_Row[RTL].png
diff --git a/...wLazyListTest_shortLayout[LTR,Column].png → ...wLazyListTest_shortLayout_Column[LTR].png b/...wLazyListTest_shortLayout[LTR,Column].png → ...wLazyListTest_shortLayout_Column[LTR].png
diff --git a/...wLazyListTest_shortLayout[RTL,Column].png → ...wLazyListTest_shortLayout_Column[RTL].png b/...wLazyListTest_shortLayout[RTL,Column].png → ...wLazyListTest_shortLayout_Column[RTL].png
diff --git a/...ViewLazyListTest_shortLayout[LTR,Row].png → ...ViewLazyListTest_shortLayout_Row[LTR].png b/...ViewLazyListTest_shortLayout[LTR,Row].png → ...ViewLazyListTest_shortLayout_Row[LTR].png
diff --git a/...ViewLazyListTest_shortLayout[RTL,Row].png → ...ViewLazyListTest_shortLayout_Row[RTL].png b/...ViewLazyListTest_shortLayout[RTL,Row].png → ...ViewLazyListTest_shortLayout_Row[RTL].png