wip

Author: davdroman

Sources/AtomicTransition/AtomicTransitionBuilder.swift

@@ -5,7 +5,7 @@ public struct AtomicTransitionBuilder {
         first
     }
 
-    public static func buildPartialBlock(accumulated: some AtomicTransitionProtocol, next: some AtomicTransitionProtocol) -> some AtomicTransitionProtocol {
+    public static func buildPartialBlock<T1: AtomicTransitionProtocol, T2: AtomicTransitionProtocol>(accumulated: T1, next: T2) -> Combined<T1, T2> {
         Combined(accumulated, next)
     }
     #else

Sources/TestUtils/AtomicTransition+Mocks.swift

@@ -12,8 +12,28 @@ extension AtomicTransition {
     }
 }
 
+public struct Spy: AtomicTransitionProtocol {
+    public typealias Handler = (TransientView, TransitionOperation, Container) -> Void
+
+    private let handler: Handler
+
+    public init(handler: @escaping Handler) {
+        self.handler = handler
+    }
+
+    public func transition(_ view: TransientView, for operation: TransitionOperation, in container: Container) {
+        handler(view, operation, container)
+    }
+}
+
 extension AtomicTransition.Operation {
     public static func random() -> Self {
         [.insertion, .removal].randomElement()!
     }
 }
+
+extension AtomicTransitionOperation {
+    public static func random() -> Self {
+        [.insertion, .removal].randomElement()!
+    }
+}

Tests/AtomicTransitionTests/CombinedTests.swift

@@ -4,37 +4,43 @@ import TestUtils
 final class CombinedTests: XCTestCase {
     func test() {
         let viewUsed = UnimplementedAnimatorTransientView()
-        let operationUsed = AtomicTransition.Operation.random()
-        let contextUsed = UnimplementedUIKitContext()
+        let operationUsed = AtomicTransitionOperation.random()
+        let containerUsed = UIView()
 
-        var sequence: [Character] = []
-        let sut = AtomicTransition
-            .spy { view, operation, context in
+        let expectation1 = self.expectation(description: "Transition 1")
+        let expectation2 = self.expectation(description: "Transition 2")
+        let expectation3 = self.expectation(description: "Transition 3")
+        let expectation4 = self.expectation(description: "Transition 4")
+
+        let sut = Combined {
+            Spy { view, operation, container in
                 XCTAssertIdentical(view, viewUsed)
                 XCTAssertEqual(operation, operationUsed)
-                XCTAssertIdentical(context, contextUsed)
-                sequence.append("a")
+                XCTAssertIdentical(container, containerUsed)
+                expectation1.fulfill()
             }
-            .combined(with: .spy { view, operation, context in
+            Spy { view, operation, container in
                 XCTAssertIdentical(view, viewUsed)
                 XCTAssertEqual(operation, operationUsed)
-                XCTAssertIdentical(context, contextUsed)
-                sequence.append("b")
-            })
-            .combined(with: .spy { view, operation, context in
+                XCTAssertIdentical(container, containerUsed)
+                expectation2.fulfill()
+            }
+            Spy { view, operation, container in
                 XCTAssertIdentical(view, viewUsed)
                 XCTAssertEqual(operation, operationUsed)
-                XCTAssertIdentical(context, contextUsed)
-                sequence.append("c")
-            })
-            .combined(with: .spy { view, operation, context in
+                XCTAssertIdentical(container, containerUsed)
+                expectation3.fulfill()
+            }
+            Spy { view, operation, container in
                 XCTAssertIdentical(view, viewUsed)
                 XCTAssertEqual(operation, operationUsed)
-                XCTAssertIdentical(context, contextUsed)
-                sequence.append("d")
-            })
-        XCTAssertEqual(sequence, [])
-        sut.prepare(viewUsed, for: operationUsed, in: contextUsed)
-        XCTAssertEqual(sequence, ["a", "b", "c", "d"])
+                XCTAssertIdentical(container, containerUsed)
+                expectation4.fulfill()
+            }
+        }
+
+        sut.transition(viewUsed, for: operationUsed, in: containerUsed)
+
+        wait(for: [expectation1, expectation2, expectation3, expectation4], timeout: 0, enforceOrder: true)
     }
 }