Share snapshot callback and improve its output

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 = "<group>"; };
 		CB408CF62AC657EF00E1BA00 /* KotlinHostingXCTestCaseHelper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KotlinHostingXCTestCaseHelper.m; sourceTree = "<group>"; };
 		CB408CF82AC6581100E1BA00 /* KotlinHostingXCTestCaseHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KotlinHostingXCTestCaseHelper.h; sourceTree = "<group>"; };
+		CB9729D22AD82D0C00804E94 /* SnapshotTestingCallback.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SnapshotTestingCallback.swift; sourceTree = "<group>"; };
 /* 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;

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)
+    }
+}

redwood-layout-uiview/RedwoodLayoutUIViewTests/UIViewFlexContainerTestHost.swift

@@ -4,22 +4,6 @@ import UIKit
 
 final class UIViewFlexContainerTestHost: KotlinHostingXCTestCase<UIViewFlexContainerTest> {
     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))
     }
 }

redwood-layout-uiview/RedwoodLayoutUIViewTests/UIViewSpacerTestHost.swift

@@ -1,21 +1,8 @@
-import SnapshotTesting
 import RedwoodLayoutUIViewTestKt
 import UIKit
 
 final class UIViewSpacerTestHost: KotlinHostingXCTestCase<UIViewSpacerTest> {
     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))
     }
 }

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<UIView>() {
   override fun flexContainer(direction: FlexDirection): TestFlexContainer<UIView> {
     return UIViewTestFlexContainer(UIViewFlexContainer(direction))

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?)
+}

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<UIView>() {
   private val factory = UIViewRedwoodLayoutWidgetFactory()
 
@@ -56,6 +52,6 @@ class UIViewSpacerTest(
   }
 
   override fun verifySnapshot(value: UIView) {
-    callback.verifySnapshot(value)
+    callback.verifySnapshot(value, null)
   }
 }