Test store changes (#2236)

* wip

* Minor test store improvements

Author: stephencelis

Sources/ComposableArchitecture/Effect.swift

@@ -150,8 +150,8 @@ extension EffectPublisher where Failure == Never {
   /// - Returns: An effect wrapping the given asynchronous work.
   public static func run(
     priority: TaskPriority? = nil,
-    operation: @escaping @Sendable (Send<Action>) async throws -> Void,
-    catch handler: (@Sendable (Error, Send<Action>) async -> Void)? = nil,
+    operation: @escaping @Sendable (_ send: Send<Action>) async throws -> Void,
+    catch handler: (@Sendable (_ error: Error, _ send: Send<Action>) async -> Void)? = nil,
     fileID: StaticString = #fileID,
     line: UInt = #line
   ) -> Self {

Sources/ComposableArchitecture/TestStore.swift

@@ -1948,27 +1948,30 @@ extension TestStore where ScopedState: Equatable {
 
     let (receivedAction, state) = self.reducer.receivedActions.removeFirst()
     if !predicate(receivedAction) {
+      let receivedActionLater = self.reducer.receivedActions
+        .contains(where: { action, _ in predicate(receivedAction) })
       XCTFailHelper(
         """
-        Received unexpected action: …
+        Received unexpected action\(receivedActionLater ? " before this one" : ""): …
 
         \(unexpectedActionDescription(receivedAction))
         """,
         file: file,
         line: line
       )
-    }
-    let expectedState = self.toScopedState(self.state)
-    do {
-      try self.expectedStateShouldMatch(
-        expected: expectedState,
-        actual: self.toScopedState(state),
-        updateStateToExpectedResult: updateStateToExpectedResult,
-        file: file,
-        line: line
-      )
-    } catch {
-      XCTFail("Threw error: \(error)", file: file, line: line)
+    } else {
+      let expectedState = self.toScopedState(self.state)
+      do {
+        try self.expectedStateShouldMatch(
+          expected: expectedState,
+          actual: self.toScopedState(state),
+          updateStateToExpectedResult: updateStateToExpectedResult,
+          file: file,
+          line: line
+        )
+      } catch {
+        XCTFail("Threw error: \(error)", file: file, line: line)
+      }
     }
     self.reducer.state = state
     if "\(self.file)" == "\(file)" {
@@ -2025,7 +2028,8 @@ extension TestStore where ScopedState: Equatable {
         }
         XCTFail(
           """
-          Expected to receive \(self.exhaustivity == .on ? "an action" : "a matching action"), but received none\
+          Expected to receive \(self.exhaustivity == .on ? "an action" : "a matching action"), but \
+          received none\
           \(nanoseconds > 0 ? " after \(Double(nanoseconds)/Double(NSEC_PER_SEC)) seconds" : "").
 
           \(suggestion)

Tests/ComposableArchitectureTests/TestStoreFailureTests.swift

@@ -221,8 +221,11 @@
       let store = TestStore(initialState: 0) {
         Reduce<Int, Action> { state, action in
           switch action {
-          case .first: return .init(value: .second)
-          case .second: return .none
+          case .first:
+            return .init(value: .second)
+          case .second:
+            state += 1
+            return .none
           }
         }
       }