From a4cf816876eaa8e413057edcfa85cd81adc0b63c Mon Sep 17 00:00:00 2001 From: Jake Wharton Date: Thu, 12 Oct 2023 09:53:42 -0400 Subject: [PATCH] Share snapshot callback and improve its output --- .../project.pbxproj | 4 ++++ .../SnapshotTestingCallback.swift | 17 ++++++++++++++ .../UIViewFlexContainerTestHost.swift | 18 +-------------- .../UIViewSpacerTestHost.swift | 15 +------------ ... testChildWithUpdatedProperty.initial.png} | 0 ... testChildWithUpdatedProperty.updated.png} | 0 ...umnThenRow.png => testColumnThenRow.1.png} | 0 ...tColumnWithMainAxisAlignment_Center.1.png} | 0 ...mnWithMainAxisAlignment_SpaceAround.1.png} | 0 ...nWithMainAxisAlignment_SpaceBetween.1.png} | 0 ...> testContainerWithFixedHeightItems.1.png} | 0 ... => testContainerWithFixedSizeItems.1.png} | 0 ...=> testContainerWithFixedWidthItems.1.png} | 0 ...olumn.png => testEmptyLayout_Column.1.png} | 0 ...yout_Row.png => testEmptyLayout_Row.1.png} | 0 ...outWithConstraints_Column_Fill_Fill.1.png} | 0 ...outWithConstraints_Column_Fill_Wrap.1.png} | 0 ...outWithConstraints_Column_Wrap_Fill.1.png} | 0 ...outWithConstraints_Column_Wrap_Wrap.1.png} | 0 ...LayoutWithConstraints_Row_Fill_Fill.1.png} | 0 ...LayoutWithConstraints_Row_Fill_Wrap.1.png} | 0 ...LayoutWithConstraints_Row_Wrap_Fill.1.png} | 0 ...LayoutWithConstraints_Row_Wrap_Wrap.1.png} | 0 ...ithCrossAxisAlignment_Column_Center.1.png} | 0 ...utWithCrossAxisAlignment_Column_End.1.png} | 0 ...WithCrossAxisAlignment_Column_Start.1.png} | 0 ...thCrossAxisAlignment_Column_Stretch.1.png} | 0 ...utWithCrossAxisAlignment_Row_Center.1.png} | 0 ...ayoutWithCrossAxisAlignment_Row_End.1.png} | 0 ...outWithCrossAxisAlignment_Row_Start.1.png} | 0 ...tWithCrossAxisAlignment_Row_Stretch.1.png} | 0 ...MarginAndDifferentAlignments_Column.1.png} | 0 ...ithMarginAndDifferentAlignments_Row.1.png} | 0 ...Column.png => testLongLayout_Column.1.png} | 0 ...ayout_Row.png => testLongLayout_Row.1.png} | 0 ...estRowMargins.png => testRowMargins.1.png} | 0 ...olumn.png => testShortLayout_Column.1.png} | 0 ...yout_Row.png => testShortLayout_Row.1.png} | 0 ...ldWithUpdatedProperty-Optional-initial.png | 3 --- ...ldWithUpdatedProperty-Optional-updated.png | 3 --- ...estBothSpacer.png => testBothSpacer.1.png} | 0 ...ySpacer.png => testHeightOnlySpacer.1.png} | 0 ...lySpacer.png => testWidthOnlySpacer.1.png} | 0 ...estZeroSpacer.png => testZeroSpacer.1.png} | 0 .../layout/uiview/UIViewFlexContainerTest.kt | 6 +---- .../layout/uiview/UIViewSnapshotCallback.kt | 22 +++++++++++++++++++ .../redwood/layout/uiview/UIViewSpacerTest.kt | 8 ++----- 47 files changed, 48 insertions(+), 48 deletions(-) create mode 100644 redwood-layout-uiview/RedwoodLayoutUIViewTests/SnapshotTestingCallback.swift rename redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/{verifySnapshot-view-name.testChildWithUpdatedProperty-initial.png => testChildWithUpdatedProperty.initial.png} (100%) rename redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/{verifySnapshot-view-name.testChildWithUpdatedProperty-updated.png => testChildWithUpdatedProperty.updated.png} (100%) rename redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/{verifySnapshot-view-name.testColumnThenRow.png => testColumnThenRow.1.png} (100%) rename redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/{verifySnapshot-view-name.testColumnWithMainAxisAlignment_Center.png => testColumnWithMainAxisAlignment_Center.1.png} (100%) rename redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/{verifySnapshot-view-name.testColumnWithMainAxisAlignment_SpaceAround.png => testColumnWithMainAxisAlignment_SpaceAround.1.png} (100%) rename redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/{verifySnapshot-view-name.testColumnWithMainAxisAlignment_SpaceBetween.png => testColumnWithMainAxisAlignment_SpaceBetween.1.png} (100%) rename redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/{verifySnapshot-view-name.testContainerWithFixedHeightItems.png => testContainerWithFixedHeightItems.1.png} (100%) rename redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/{verifySnapshot-view-name.testContainerWithFixedSizeItems.png => testContainerWithFixedSizeItems.1.png} (100%) rename redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/{verifySnapshot-view-name.testContainerWithFixedWidthItems.png => testContainerWithFixedWidthItems.1.png} (100%) rename redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/{verifySnapshot-view-name.testEmptyLayout_Column.png => testEmptyLayout_Column.1.png} (100%) rename redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/{verifySnapshot-view-name.testEmptyLayout_Row.png => testEmptyLayout_Row.1.png} (100%) rename redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/{verifySnapshot-view-name.testLayoutWithConstraints_Column_Fill_Fill.png => testLayoutWithConstraints_Column_Fill_Fill.1.png} (100%) rename redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/{verifySnapshot-view-name.testLayoutWithConstraints_Column_Fill_Wrap.png => testLayoutWithConstraints_Column_Fill_Wrap.1.png} (100%) rename redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/{verifySnapshot-view-name.testLayoutWithConstraints_Column_Wrap_Fill.png => testLayoutWithConstraints_Column_Wrap_Fill.1.png} (100%) rename redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/{verifySnapshot-view-name.testLayoutWithConstraints_Column_Wrap_Wrap.png => testLayoutWithConstraints_Column_Wrap_Wrap.1.png} (100%) rename redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/{verifySnapshot-view-name.testLayoutWithConstraints_Row_Fill_Fill.png => testLayoutWithConstraints_Row_Fill_Fill.1.png} (100%) rename redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/{verifySnapshot-view-name.testLayoutWithConstraints_Row_Fill_Wrap.png => testLayoutWithConstraints_Row_Fill_Wrap.1.png} (100%) rename redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/{verifySnapshot-view-name.testLayoutWithConstraints_Row_Wrap_Fill.png => testLayoutWithConstraints_Row_Wrap_Fill.1.png} (100%) rename redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/{verifySnapshot-view-name.testLayoutWithConstraints_Row_Wrap_Wrap.png => testLayoutWithConstraints_Row_Wrap_Wrap.1.png} (100%) rename redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/{verifySnapshot-view-name.testLayoutWithCrossAxisAlignment_Column_Center.png => testLayoutWithCrossAxisAlignment_Column_Center.1.png} (100%) rename redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/{verifySnapshot-view-name.testLayoutWithCrossAxisAlignment_Column_End.png => testLayoutWithCrossAxisAlignment_Column_End.1.png} (100%) rename redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/{verifySnapshot-view-name.testLayoutWithCrossAxisAlignment_Column_Start.png => testLayoutWithCrossAxisAlignment_Column_Start.1.png} (100%) rename redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/{verifySnapshot-view-name.testLayoutWithCrossAxisAlignment_Column_Stretch.png => testLayoutWithCrossAxisAlignment_Column_Stretch.1.png} (100%) rename redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/{verifySnapshot-view-name.testLayoutWithCrossAxisAlignment_Row_Center.png => testLayoutWithCrossAxisAlignment_Row_Center.1.png} (100%) rename redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/{verifySnapshot-view-name.testLayoutWithCrossAxisAlignment_Row_End.png => testLayoutWithCrossAxisAlignment_Row_End.1.png} (100%) rename redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/{verifySnapshot-view-name.testLayoutWithCrossAxisAlignment_Row_Start.png => testLayoutWithCrossAxisAlignment_Row_Start.1.png} (100%) rename redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/{verifySnapshot-view-name.testLayoutWithCrossAxisAlignment_Row_Stretch.png => testLayoutWithCrossAxisAlignment_Row_Stretch.1.png} (100%) rename redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/{verifySnapshot-view-name.testLayoutWithMarginAndDifferentAlignments_Column.png => testLayoutWithMarginAndDifferentAlignments_Column.1.png} (100%) rename redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/{verifySnapshot-view-name.testLayoutWithMarginAndDifferentAlignments_Row.png => testLayoutWithMarginAndDifferentAlignments_Row.1.png} (100%) rename redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/{verifySnapshot-view-name.testLongLayout_Column.png => testLongLayout_Column.1.png} (100%) rename redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/{verifySnapshot-view-name.testLongLayout_Row.png => testLongLayout_Row.1.png} (100%) rename redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/{verifySnapshot-view-name.testRowMargins.png => testRowMargins.1.png} (100%) rename redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/{verifySnapshot-view-name.testShortLayout_Column.png => testShortLayout_Column.1.png} (100%) rename redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/{verifySnapshot-view-name.testShortLayout_Row.png => testShortLayout_Row.1.png} (100%) delete mode 100644 redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testChildWithUpdatedProperty-Optional-initial.png delete mode 100644 redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testChildWithUpdatedProperty-Optional-updated.png rename redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewSpacerTestHost/{verifySnapshot-view.testBothSpacer.png => testBothSpacer.1.png} (100%) rename redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewSpacerTestHost/{verifySnapshot-view.testHeightOnlySpacer.png => testHeightOnlySpacer.1.png} (100%) rename redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewSpacerTestHost/{verifySnapshot-view.testWidthOnlySpacer.png => testWidthOnlySpacer.1.png} (100%) rename redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewSpacerTestHost/{verifySnapshot-view.testZeroSpacer.png => testZeroSpacer.1.png} (100%) create mode 100644 redwood-layout-uiview/src/commonTest/kotlin/app/cash/redwood/layout/uiview/UIViewSnapshotCallback.kt diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests.xcodeproj/project.pbxproj b/redwood-layout-uiview/RedwoodLayoutUIViewTests.xcodeproj/project.pbxproj index a75aa13ca1..fe4ba933d8 100644 --- a/redwood-layout-uiview/RedwoodLayoutUIViewTests.xcodeproj/project.pbxproj +++ b/redwood-layout-uiview/RedwoodLayoutUIViewTests.xcodeproj/project.pbxproj @@ -12,6 +12,7 @@ CB408CED2AC6549F00E1BA00 /* KotlinHostingXCTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB408CEC2AC6549F00E1BA00 /* KotlinHostingXCTestCase.swift */; }; CB408CF72AC657EF00E1BA00 /* KotlinHostingXCTestCaseHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = CB408CF62AC657EF00E1BA00 /* KotlinHostingXCTestCaseHelper.m */; }; CB8A21EF2AC6647F00C104C2 /* SnapshotTesting in Frameworks */ = {isa = PBXBuildFile; productRef = CB8A21EE2AC6647F00C104C2 /* SnapshotTesting */; }; + CB9729D32AD82D0C00804E94 /* SnapshotTestingCallback.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB9729D22AD82D0C00804E94 /* SnapshotTestingCallback.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -23,6 +24,7 @@ CB408CF52AC657EF00E1BA00 /* RedwoodLayoutUIViewTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RedwoodLayoutUIViewTests-Bridging-Header.h"; sourceTree = ""; }; CB408CF62AC657EF00E1BA00 /* KotlinHostingXCTestCaseHelper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KotlinHostingXCTestCaseHelper.m; sourceTree = ""; }; CB408CF82AC6581100E1BA00 /* KotlinHostingXCTestCaseHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KotlinHostingXCTestCaseHelper.h; sourceTree = ""; }; + CB9729D22AD82D0C00804E94 /* SnapshotTestingCallback.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SnapshotTestingCallback.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -67,6 +69,7 @@ children = ( 102FEEF12AD5D09F00246158 /* UIViewFlexContainerTestHost.swift */, CB408CE72AC64CEF00E1BA00 /* UIViewSpacerTestHost.swift */, + CB9729D22AD82D0C00804E94 /* SnapshotTestingCallback.swift */, CB408CEC2AC6549F00E1BA00 /* KotlinHostingXCTestCase.swift */, CB408CF62AC657EF00E1BA00 /* KotlinHostingXCTestCaseHelper.m */, CB408CF52AC657EF00E1BA00 /* RedwoodLayoutUIViewTests-Bridging-Header.h */, @@ -174,6 +177,7 @@ CB408CED2AC6549F00E1BA00 /* KotlinHostingXCTestCase.swift in Sources */, CB408CF72AC657EF00E1BA00 /* KotlinHostingXCTestCaseHelper.m in Sources */, CB408CE82AC64CEF00E1BA00 /* UIViewSpacerTestHost.swift in Sources */, + CB9729D32AD82D0C00804E94 /* SnapshotTestingCallback.swift in Sources */, 102FEEF22AD5D09F00246158 /* UIViewFlexContainerTestHost.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/SnapshotTestingCallback.swift b/redwood-layout-uiview/RedwoodLayoutUIViewTests/SnapshotTestingCallback.swift new file mode 100644 index 0000000000..ebde35122f --- /dev/null +++ b/redwood-layout-uiview/RedwoodLayoutUIViewTests/SnapshotTestingCallback.swift @@ -0,0 +1,17 @@ +import RedwoodLayoutUIViewTestKt +import SnapshotTesting +import UIKit + +final class SnapshotTestingCallback : UIViewSnapshotCallback { + private let testName: String + private let fileName: StaticString + + init(named testName: String, _ fileName: StaticString = #file) { + self.testName = testName + self.fileName = fileName + } + + func verifySnapshot(view: UIView, name: String?) { + assertSnapshot(of: view, as: .image, named: name, file: fileName, testName: testName) + } +} diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/UIViewFlexContainerTestHost.swift b/redwood-layout-uiview/RedwoodLayoutUIViewTests/UIViewFlexContainerTestHost.swift index 2c565c9a9b..49721ff836 100644 --- a/redwood-layout-uiview/RedwoodLayoutUIViewTests/UIViewFlexContainerTestHost.swift +++ b/redwood-layout-uiview/RedwoodLayoutUIViewTests/UIViewFlexContainerTestHost.swift @@ -4,22 +4,6 @@ import UIKit final class UIViewFlexContainerTestHost: KotlinHostingXCTestCase { override class func initTest(name: String) -> UIViewFlexContainerTest { - return UIViewFlexContainerTest(callback: Callback(named: name)) - } -} - -private class Callback : UIViewFlexContainerTestCallback { - private let testName: String - - init(named testName: String) { - self.testName = testName - } - - func verifySnapshot(view: UIView, name: String?) { - var snapshotName = testName - if (name != nil) { - snapshotName = "\(testName)-\(name!)" - } - assertSnapshot(of: view, as: .image, named: snapshotName) + return UIViewFlexContainerTest(callback: SnapshotTestingCallback(named: name)) } } diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/UIViewSpacerTestHost.swift b/redwood-layout-uiview/RedwoodLayoutUIViewTests/UIViewSpacerTestHost.swift index c45725fd66..f2493e1400 100644 --- a/redwood-layout-uiview/RedwoodLayoutUIViewTests/UIViewSpacerTestHost.swift +++ b/redwood-layout-uiview/RedwoodLayoutUIViewTests/UIViewSpacerTestHost.swift @@ -1,21 +1,8 @@ -import SnapshotTesting import RedwoodLayoutUIViewTestKt import UIKit final class UIViewSpacerTestHost: KotlinHostingXCTestCase { override class func initTest(name: String) -> UIViewSpacerTest { - return UIViewSpacerTest(callback: Callback(named: name)) - } -} - -private class Callback : UIViewSpacerTestCallback { - private let name: String - - init(named name: String) { - self.name = name - } - - func verifySnapshot(view: UIView) { - assertSnapshot(of: view, as: .image, named: name) + return UIViewSpacerTest(callback: SnapshotTestingCallback(named: name)) } } diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testChildWithUpdatedProperty-initial.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testChildWithUpdatedProperty.initial.png similarity index 100% rename from redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testChildWithUpdatedProperty-initial.png rename to redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testChildWithUpdatedProperty.initial.png diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testChildWithUpdatedProperty-updated.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testChildWithUpdatedProperty.updated.png similarity index 100% rename from redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testChildWithUpdatedProperty-updated.png rename to redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testChildWithUpdatedProperty.updated.png diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testColumnThenRow.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testColumnThenRow.1.png similarity index 100% rename from redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testColumnThenRow.png rename to redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testColumnThenRow.1.png diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testColumnWithMainAxisAlignment_Center.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testColumnWithMainAxisAlignment_Center.1.png similarity index 100% rename from redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testColumnWithMainAxisAlignment_Center.png rename to redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testColumnWithMainAxisAlignment_Center.1.png diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testColumnWithMainAxisAlignment_SpaceAround.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testColumnWithMainAxisAlignment_SpaceAround.1.png similarity index 100% rename from redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testColumnWithMainAxisAlignment_SpaceAround.png rename to redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testColumnWithMainAxisAlignment_SpaceAround.1.png diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testColumnWithMainAxisAlignment_SpaceBetween.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testColumnWithMainAxisAlignment_SpaceBetween.1.png similarity index 100% rename from redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testColumnWithMainAxisAlignment_SpaceBetween.png rename to redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testColumnWithMainAxisAlignment_SpaceBetween.1.png diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testContainerWithFixedHeightItems.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testContainerWithFixedHeightItems.1.png similarity index 100% rename from redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testContainerWithFixedHeightItems.png rename to redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testContainerWithFixedHeightItems.1.png diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testContainerWithFixedSizeItems.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testContainerWithFixedSizeItems.1.png similarity index 100% rename from redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testContainerWithFixedSizeItems.png rename to redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testContainerWithFixedSizeItems.1.png diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testContainerWithFixedWidthItems.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testContainerWithFixedWidthItems.1.png similarity index 100% rename from redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testContainerWithFixedWidthItems.png rename to redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testContainerWithFixedWidthItems.1.png diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testEmptyLayout_Column.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testEmptyLayout_Column.1.png similarity index 100% rename from redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testEmptyLayout_Column.png rename to redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testEmptyLayout_Column.1.png diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testEmptyLayout_Row.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testEmptyLayout_Row.1.png similarity index 100% rename from redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testEmptyLayout_Row.png rename to redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testEmptyLayout_Row.1.png diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testLayoutWithConstraints_Column_Fill_Fill.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutWithConstraints_Column_Fill_Fill.1.png similarity index 100% rename from redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testLayoutWithConstraints_Column_Fill_Fill.png rename to redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutWithConstraints_Column_Fill_Fill.1.png diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testLayoutWithConstraints_Column_Fill_Wrap.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutWithConstraints_Column_Fill_Wrap.1.png similarity index 100% rename from redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testLayoutWithConstraints_Column_Fill_Wrap.png rename to redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutWithConstraints_Column_Fill_Wrap.1.png diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testLayoutWithConstraints_Column_Wrap_Fill.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutWithConstraints_Column_Wrap_Fill.1.png similarity index 100% rename from redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testLayoutWithConstraints_Column_Wrap_Fill.png rename to redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutWithConstraints_Column_Wrap_Fill.1.png diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testLayoutWithConstraints_Column_Wrap_Wrap.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutWithConstraints_Column_Wrap_Wrap.1.png similarity index 100% rename from redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testLayoutWithConstraints_Column_Wrap_Wrap.png rename to redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutWithConstraints_Column_Wrap_Wrap.1.png diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testLayoutWithConstraints_Row_Fill_Fill.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutWithConstraints_Row_Fill_Fill.1.png similarity index 100% rename from redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testLayoutWithConstraints_Row_Fill_Fill.png rename to redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutWithConstraints_Row_Fill_Fill.1.png diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testLayoutWithConstraints_Row_Fill_Wrap.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutWithConstraints_Row_Fill_Wrap.1.png similarity index 100% rename from redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testLayoutWithConstraints_Row_Fill_Wrap.png rename to redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutWithConstraints_Row_Fill_Wrap.1.png diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testLayoutWithConstraints_Row_Wrap_Fill.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutWithConstraints_Row_Wrap_Fill.1.png similarity index 100% rename from redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testLayoutWithConstraints_Row_Wrap_Fill.png rename to redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutWithConstraints_Row_Wrap_Fill.1.png diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testLayoutWithConstraints_Row_Wrap_Wrap.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutWithConstraints_Row_Wrap_Wrap.1.png similarity index 100% rename from redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testLayoutWithConstraints_Row_Wrap_Wrap.png rename to redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutWithConstraints_Row_Wrap_Wrap.1.png diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testLayoutWithCrossAxisAlignment_Column_Center.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutWithCrossAxisAlignment_Column_Center.1.png similarity index 100% rename from redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testLayoutWithCrossAxisAlignment_Column_Center.png rename to redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutWithCrossAxisAlignment_Column_Center.1.png diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testLayoutWithCrossAxisAlignment_Column_End.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutWithCrossAxisAlignment_Column_End.1.png similarity index 100% rename from redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testLayoutWithCrossAxisAlignment_Column_End.png rename to redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutWithCrossAxisAlignment_Column_End.1.png diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testLayoutWithCrossAxisAlignment_Column_Start.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutWithCrossAxisAlignment_Column_Start.1.png similarity index 100% rename from redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testLayoutWithCrossAxisAlignment_Column_Start.png rename to redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutWithCrossAxisAlignment_Column_Start.1.png diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testLayoutWithCrossAxisAlignment_Column_Stretch.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutWithCrossAxisAlignment_Column_Stretch.1.png similarity index 100% rename from redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testLayoutWithCrossAxisAlignment_Column_Stretch.png rename to redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutWithCrossAxisAlignment_Column_Stretch.1.png diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testLayoutWithCrossAxisAlignment_Row_Center.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutWithCrossAxisAlignment_Row_Center.1.png similarity index 100% rename from redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testLayoutWithCrossAxisAlignment_Row_Center.png rename to redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutWithCrossAxisAlignment_Row_Center.1.png diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testLayoutWithCrossAxisAlignment_Row_End.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutWithCrossAxisAlignment_Row_End.1.png similarity index 100% rename from redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testLayoutWithCrossAxisAlignment_Row_End.png rename to redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutWithCrossAxisAlignment_Row_End.1.png diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testLayoutWithCrossAxisAlignment_Row_Start.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutWithCrossAxisAlignment_Row_Start.1.png similarity index 100% rename from redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testLayoutWithCrossAxisAlignment_Row_Start.png rename to redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutWithCrossAxisAlignment_Row_Start.1.png diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testLayoutWithCrossAxisAlignment_Row_Stretch.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutWithCrossAxisAlignment_Row_Stretch.1.png similarity index 100% rename from redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testLayoutWithCrossAxisAlignment_Row_Stretch.png rename to redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutWithCrossAxisAlignment_Row_Stretch.1.png diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testLayoutWithMarginAndDifferentAlignments_Column.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutWithMarginAndDifferentAlignments_Column.1.png similarity index 100% rename from redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testLayoutWithMarginAndDifferentAlignments_Column.png rename to redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutWithMarginAndDifferentAlignments_Column.1.png diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testLayoutWithMarginAndDifferentAlignments_Row.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutWithMarginAndDifferentAlignments_Row.1.png similarity index 100% rename from redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testLayoutWithMarginAndDifferentAlignments_Row.png rename to redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLayoutWithMarginAndDifferentAlignments_Row.1.png diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testLongLayout_Column.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLongLayout_Column.1.png similarity index 100% rename from redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testLongLayout_Column.png rename to redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLongLayout_Column.1.png diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testLongLayout_Row.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLongLayout_Row.1.png similarity index 100% rename from redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testLongLayout_Row.png rename to redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testLongLayout_Row.1.png diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testRowMargins.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testRowMargins.1.png similarity index 100% rename from redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testRowMargins.png rename to redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testRowMargins.1.png diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testShortLayout_Column.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testShortLayout_Column.1.png similarity index 100% rename from redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testShortLayout_Column.png rename to redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testShortLayout_Column.1.png diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testShortLayout_Row.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testShortLayout_Row.1.png similarity index 100% rename from redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testShortLayout_Row.png rename to redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/testShortLayout_Row.1.png diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testChildWithUpdatedProperty-Optional-initial.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testChildWithUpdatedProperty-Optional-initial.png deleted file mode 100644 index 9a2db64dc5..0000000000 --- a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testChildWithUpdatedProperty-Optional-initial.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0a0934ffacbe63acacebe72f313cb1e23fa4b028d08282fe0b43f5748280abfe -size 67965 diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testChildWithUpdatedProperty-Optional-updated.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testChildWithUpdatedProperty-Optional-updated.png deleted file mode 100644 index ac1637e6e5..0000000000 --- a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewFlexContainerTestHost/verifySnapshot-view-name.testChildWithUpdatedProperty-Optional-updated.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:25c957b7d448f4588963e60e497200831eaabd98a2b5f6e8fde0d7be61c42d6c -size 73537 diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewSpacerTestHost/verifySnapshot-view.testBothSpacer.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewSpacerTestHost/testBothSpacer.1.png similarity index 100% rename from redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewSpacerTestHost/verifySnapshot-view.testBothSpacer.png rename to redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewSpacerTestHost/testBothSpacer.1.png diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewSpacerTestHost/verifySnapshot-view.testHeightOnlySpacer.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewSpacerTestHost/testHeightOnlySpacer.1.png similarity index 100% rename from redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewSpacerTestHost/verifySnapshot-view.testHeightOnlySpacer.png rename to redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewSpacerTestHost/testHeightOnlySpacer.1.png diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewSpacerTestHost/verifySnapshot-view.testWidthOnlySpacer.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewSpacerTestHost/testWidthOnlySpacer.1.png similarity index 100% rename from redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewSpacerTestHost/verifySnapshot-view.testWidthOnlySpacer.png rename to redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewSpacerTestHost/testWidthOnlySpacer.1.png diff --git a/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewSpacerTestHost/verifySnapshot-view.testZeroSpacer.png b/redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewSpacerTestHost/testZeroSpacer.1.png similarity index 100% rename from redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewSpacerTestHost/verifySnapshot-view.testZeroSpacer.png rename to redwood-layout-uiview/RedwoodLayoutUIViewTests/__Snapshots__/UIViewSpacerTestHost/testZeroSpacer.1.png diff --git a/redwood-layout-uiview/src/commonTest/kotlin/app/cash/redwood/layout/uiview/UIViewFlexContainerTest.kt b/redwood-layout-uiview/src/commonTest/kotlin/app/cash/redwood/layout/uiview/UIViewFlexContainerTest.kt index e855747921..8ed33a6762 100644 --- a/redwood-layout-uiview/src/commonTest/kotlin/app/cash/redwood/layout/uiview/UIViewFlexContainerTest.kt +++ b/redwood-layout-uiview/src/commonTest/kotlin/app/cash/redwood/layout/uiview/UIViewFlexContainerTest.kt @@ -28,12 +28,8 @@ import platform.UIKit.UIColor import platform.UIKit.UILabel import platform.UIKit.UIView -interface UIViewFlexContainerTestCallback { - fun verifySnapshot(view: UIView, name: String?) -} - class UIViewFlexContainerTest( - private val callback: UIViewFlexContainerTestCallback, + private val callback: UIViewSnapshotCallback, ) : AbstractFlexContainerTest() { override fun flexContainer(direction: FlexDirection): TestFlexContainer { return UIViewTestFlexContainer(UIViewFlexContainer(direction)) diff --git a/redwood-layout-uiview/src/commonTest/kotlin/app/cash/redwood/layout/uiview/UIViewSnapshotCallback.kt b/redwood-layout-uiview/src/commonTest/kotlin/app/cash/redwood/layout/uiview/UIViewSnapshotCallback.kt new file mode 100644 index 0000000000..2dd8d84767 --- /dev/null +++ b/redwood-layout-uiview/src/commonTest/kotlin/app/cash/redwood/layout/uiview/UIViewSnapshotCallback.kt @@ -0,0 +1,22 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package app.cash.redwood.layout.uiview + +import platform.UIKit.UIView + +interface UIViewSnapshotCallback { + fun verifySnapshot(view: UIView, name: String?) +} diff --git a/redwood-layout-uiview/src/commonTest/kotlin/app/cash/redwood/layout/uiview/UIViewSpacerTest.kt b/redwood-layout-uiview/src/commonTest/kotlin/app/cash/redwood/layout/uiview/UIViewSpacerTest.kt index 53bb053079..584e0e9ba9 100644 --- a/redwood-layout-uiview/src/commonTest/kotlin/app/cash/redwood/layout/uiview/UIViewSpacerTest.kt +++ b/redwood-layout-uiview/src/commonTest/kotlin/app/cash/redwood/layout/uiview/UIViewSpacerTest.kt @@ -27,12 +27,8 @@ import platform.UIKit.UILayoutFittingCompressedSize import platform.UIKit.UIStackView import platform.UIKit.UIView -interface UIViewSpacerTestCallback { - fun verifySnapshot(view: UIView) -} - class UIViewSpacerTest( - private val callback: UIViewSpacerTestCallback, + private val callback: UIViewSnapshotCallback, ) : AbstractSpacerTest() { private val factory = UIViewRedwoodLayoutWidgetFactory() @@ -56,6 +52,6 @@ class UIViewSpacerTest( } override fun verifySnapshot(value: UIView) { - callback.verifySnapshot(value) + callback.verifySnapshot(value, null) } }