Fix Tests and Linux build

p4checo · p4checo · commit 97f46e0802b4 · 2022-12-31T18:53:02.000Z
## Changes

- Fix Tests.

- Add missing Linux compile time checks.
diff --git a/Examples/CaseStudies/SwiftUICaseStudies/02-Effects-Basics.swift b/Examples/CaseStudies/SwiftUICaseStudies/02-Effects-Basics.swift
@@ -50,6 +50,7 @@ struct EffectsBasics: ReducerProtocol {
       return state.count >= 0
         ? .none
         : .task {
+          try await self.mainQueue.sleep(for: .seconds(1))
           return .decrementDelayResponse
         }
         .cancellable(id: DelayID.self)
diff --git a/Examples/CaseStudies/SwiftUICaseStudiesTests/01-GettingStarted-AnimationsTests.swift b/Examples/CaseStudies/SwiftUICaseStudiesTests/01-GettingStarted-AnimationsTests.swift
@@ -12,8 +12,8 @@ final class AnimationTests: XCTestCase {
       reducer: Animations()
     )
 
-    let mainQueue = DispatchQueue.test
-    store.dependencies.mainQueue = mainQueue.eraseToAnyScheduler()
+    let mainQueue = TestScheduler()
+    store.dependencies.mainQueue = mainQueue
 
     await store.send(.rainbowButtonTapped)
     await store.receive(.setColor(.red)) {
@@ -64,8 +64,8 @@ final class AnimationTests: XCTestCase {
       reducer: Animations()
     )
 
-    let mainQueue = DispatchQueue.test
-    store.dependencies.mainQueue = mainQueue.eraseToAnyScheduler()
+    let mainQueue = TestScheduler()
+    store.dependencies.mainQueue = mainQueue
 
     await store.send(.rainbowButtonTapped)
     await store.receive(.setColor(.red)) {
diff --git a/Examples/CaseStudies/SwiftUICaseStudiesTests/02-Effects-BasicsTests.swift b/Examples/CaseStudies/SwiftUICaseStudiesTests/02-Effects-BasicsTests.swift
@@ -12,7 +12,7 @@ final class EffectsBasicsTests: XCTestCase {
       reducer: EffectsBasics()
     )
 
-    store.dependencies.mainQueue = .immediate
+    store.dependencies.mainQueue = ImmediateScheduler()
 
     await store.send(.incrementButtonTapped) {
       $0.count = 1
@@ -29,7 +29,7 @@ final class EffectsBasicsTests: XCTestCase {
     )
 
     store.dependencies.factClient.fetch = { "\($0) is a good number Brent" }
-    store.dependencies.mainQueue = .immediate
+    store.dependencies.mainQueue = ImmediateScheduler()
 
     await store.send(.incrementButtonTapped) {
       $0.count = 1
@@ -49,7 +49,7 @@ final class EffectsBasicsTests: XCTestCase {
       reducer: EffectsBasics()
     )
 
-    store.dependencies.mainQueue = .immediate
+    store.dependencies.mainQueue = ImmediateScheduler()
 
     await store.send(.decrementButtonTapped) {
       $0.count = -1
@@ -65,7 +65,7 @@ final class EffectsBasicsTests: XCTestCase {
       reducer: EffectsBasics()
     )
 
-    store.dependencies.mainQueue = DispatchQueue.test.eraseToAnyScheduler()
+    store.dependencies.mainQueue = TestScheduler()
 
     await store.send(.decrementButtonTapped) {
       $0.count = -1
diff --git a/Examples/CaseStudies/SwiftUICaseStudiesTests/02-Effects-RefreshableTests.swift b/Examples/CaseStudies/SwiftUICaseStudiesTests/02-Effects-RefreshableTests.swift
@@ -13,7 +13,7 @@ final class RefreshableTests: XCTestCase {
     )
 
     store.dependencies.factClient.fetch = { "\($0) is a good number." }
-    store.dependencies.mainQueue = .immediate
+    store.dependencies.mainQueue = ImmediateScheduler()
 
     await store.send(.incrementButtonTapped) {
       $0.count = 1
@@ -32,7 +32,7 @@ final class RefreshableTests: XCTestCase {
 
     struct FactError: Equatable, Error {}
     store.dependencies.factClient.fetch = { _ in throw FactError() }
-    store.dependencies.mainQueue = .immediate
+    store.dependencies.mainQueue = ImmediateScheduler()
 
     await store.send(.incrementButtonTapped) {
       $0.count = 1
@@ -51,7 +51,7 @@ final class RefreshableTests: XCTestCase {
       try await Task.sleep(nanoseconds: NSEC_PER_SEC)
       return "\($0) is a good number."
     }
-    store.dependencies.mainQueue = .immediate
+    store.dependencies.mainQueue = ImmediateScheduler()
 
     await store.send(.incrementButtonTapped) {
       $0.count = 1
diff --git a/Examples/CaseStudies/SwiftUICaseStudiesTests/02-Effects-TimersTests.swift b/Examples/CaseStudies/SwiftUICaseStudiesTests/02-Effects-TimersTests.swift
@@ -12,8 +12,8 @@ final class TimersTests: XCTestCase {
       reducer: Timers()
     )
 
-    let mainQueue = DispatchQueue.test
-    store.dependencies.mainQueue = mainQueue.eraseToAnyScheduler()
+    let mainQueue = TestScheduler()
+    store.dependencies.mainQueue = mainQueue
 
     await store.send(.toggleTimerButtonTapped) {
       $0.isTimerActive = true
diff --git a/Examples/CaseStudies/SwiftUICaseStudiesTests/02-Effects-WebSocketTests.swift b/Examples/CaseStudies/SwiftUICaseStudiesTests/02-Effects-WebSocketTests.swift
@@ -15,7 +15,7 @@ final class WebSocketTests: XCTestCase {
     let actions = AsyncStream<WebSocketClient.Action>.streamWithContinuation()
     let messages = AsyncStream<TaskResult<WebSocketClient.Message>>.streamWithContinuation()
 
-    store.dependencies.mainQueue = .immediate
+    store.dependencies.mainQueue = ImmediateScheduler()
     store.dependencies.webSocket.open = { _, _, _ in actions.stream }
     store.dependencies.webSocket.receive = { _ in messages.stream }
     store.dependencies.webSocket.send = { _, _ in }
@@ -66,7 +66,7 @@ final class WebSocketTests: XCTestCase {
     let actions = AsyncStream<WebSocketClient.Action>.streamWithContinuation()
     let messages = AsyncStream<TaskResult<WebSocketClient.Message>>.streamWithContinuation()
 
-    store.dependencies.mainQueue = .immediate
+    store.dependencies.mainQueue = ImmediateScheduler()
     store.dependencies.webSocket.open = { _, _, _ in actions.stream }
     store.dependencies.webSocket.receive = { _ in messages.stream }
     store.dependencies.webSocket.send = { _, _ in
@@ -108,10 +108,10 @@ final class WebSocketTests: XCTestCase {
     )
 
     let actions = AsyncStream<WebSocketClient.Action>.streamWithContinuation()
-    let mainQueue = DispatchQueue.test
+    let mainQueue = TestScheduler()
     var pingsCount = 0
 
-    store.dependencies.mainQueue = mainQueue.eraseToAnyScheduler()
+    store.dependencies.mainQueue = mainQueue
     store.dependencies.webSocket.open = { _, _, _ in actions.stream }
     store.dependencies.webSocket.receive = { _ in try await Task.never() }
     store.dependencies.webSocket.sendPing = { @MainActor _ in pingsCount += 1 }
@@ -144,7 +144,7 @@ final class WebSocketTests: XCTestCase {
 
     let actions = AsyncStream<WebSocketClient.Action>.streamWithContinuation()
 
-    store.dependencies.mainQueue = .immediate
+    store.dependencies.mainQueue = ImmediateScheduler()
     store.dependencies.webSocket.open = { _, _, _ in actions.stream }
     store.dependencies.webSocket.receive = { _ in try await Task.never() }
     store.dependencies.webSocket.sendPing = { _ in try await Task.never() }
diff --git a/Examples/CaseStudies/SwiftUICaseStudiesTests/04-HigherOrderReducers-LifecycleTests.swift b/Examples/CaseStudies/SwiftUICaseStudiesTests/04-HigherOrderReducers-LifecycleTests.swift
@@ -13,8 +13,8 @@ final class LifecycleTests: XCTestCase {
       reducer: LifecycleDemo()
     )
 
-    let mainQueue = DispatchQueue.test
-    store.dependencies.mainQueue = mainQueue.eraseToAnyScheduler()
+    let mainQueue = TestScheduler()
+    store.dependencies.mainQueue = mainQueue
 
     await store.send(.toggleTimerButtonTapped) {
       $0.count = 0
diff --git a/Examples/CaseStudies/SwiftUICaseStudiesTests/04-HigherOrderReducers-ReusableFavoritingTests.swift b/Examples/CaseStudies/SwiftUICaseStudiesTests/04-HigherOrderReducers-ReusableFavoritingTests.swift
@@ -58,7 +58,7 @@ final class ReusableComponentsFavoritingTests: XCTestCase {
         "Favoriting failed."
       }
     }
-    let scheduler = DispatchQueue.test
+    let scheduler = TestScheduler()
 
     let episodes: IdentifiedArrayOf<Episode.State> = [
       Episode.State(
diff --git a/Sources/ComposableArchitecture/Documentation.docc/Articles/DependencyManagement.md b/Sources/ComposableArchitecture/Documentation.docc/Articles/DependencyManagement.md
@@ -180,7 +180,7 @@ func testTodos() async {
   )
 
   store.dependencies.date = .constant(Date(timeIntervalSinceReferenceDate: 1234567890))
-  store.dependencies.mainQueue = .immediate
+  store.dependencies.mainQueue = ImmediateScheduler()
   store.dependencies.uuid = .incrementing
 
   // ...
diff --git a/Sources/ComposableArchitecture/Documentation.docc/Articles/MigratingToTheReducerProtocol.md b/Sources/ComposableArchitecture/Documentation.docc/Articles/MigratingToTheReducerProtocol.md
@@ -583,7 +583,7 @@ override dependencies driving a feature.
 For example, to install a test scheduler as the main queue dependency:
 
 ```swift
-let mainQueue = DispatchQueue.test
+let mainQueue = TestScheduler()
 store.dependencies.mainQueue = mainQueue
 
 await store.send(.timerButtonStarted)
diff --git a/Sources/ComposableArchitecture/Documentation.docc/Articles/Testing.md b/Sources/ComposableArchitecture/Documentation.docc/Articles/Testing.md
@@ -363,7 +363,7 @@ let store = TestStore(
   reducer: Feature()
 )
 
-store.dependencies.mainQueue = .immediate
+store.dependencies.mainQueue = ImmediateScheduler()
 ```
 
 With that small change we can drop the `timeout` arguments from the
diff --git a/Sources/ComposableArchitecture/Effects/Publisher/Timer.swift b/Sources/ComposableArchitecture/Effects/Publisher/Timer.swift
@@ -50,7 +50,7 @@ extension Effect where Action == Date, Failure == Never {
   ///     reducer: Feature()
   ///     )
   ///
-  ///   store.dependencies.mainQueue = mainQueue.eraseToAnyScheduler()
+  ///   store.dependencies.mainQueue = mainQueue
   ///
   ///   await store.send(.startButtonTapped)
   ///
diff --git a/Sources/ComposableArchitecture/TestStore.swift b/Sources/ComposableArchitecture/TestStore.swift
@@ -148,8 +148,8 @@ import XCTestDynamicOverlay
 /// )
 ///
 /// // Create a test dispatch scheduler to control the timing of effects
-/// let mainQueue = DispatchQueue.test
-/// store.dependencies.mainQueue = mainQueue.eraseToAnyScheduler()
+/// let mainQueue = TestScheduler()
+/// store.dependencies.mainQueue = mainQueue
 ///
 ///     // Simulate a search response with one item
 /// store.dependencies.mainQueue.apiClient.search = { _ in
diff --git a/Sources/ComposableArchitecture/ViewStore.swift b/Sources/ComposableArchitecture/ViewStore.swift
@@ -107,7 +107,9 @@ public final class ViewStore<ViewState, ViewAction> {
       .startWithValues {
         [weak objectWillChange = self.objectWillChange, weak _state = self._state] in
         guard let objectWillChange = objectWillChange, let _state = _state else { return }
-        objectWillChange.send()
+        #if canImport(Combine)
+          objectWillChange.send()
+        #endif
         _state.value = $0
       }
   }
@@ -141,7 +143,9 @@ public final class ViewStore<ViewState, ViewAction> {
       .startWithValues {
         [weak objectWillChange = self.objectWillChange, weak _state = self._state] in
         guard let objectWillChange = objectWillChange, let _state = _state else { return }
-        objectWillChange.send()
+          #if canImport(Combine)
+            objectWillChange.send()
+          #endif
         _state.value = $0
       }
   }
@@ -254,7 +258,7 @@ public final class ViewStore<ViewState, ViewAction> {
   /// This means you can either use the value passed to the closure or you can reach into
   /// `viewStore.state` directly.
   ///
-  public var produced: StoreProducer<State> {
+  public var produced: StoreProducer<ViewState> {
     StoreProducer(viewStore: self)
   }
 
diff --git a/Tests/ComposableArchitectureTests/ComposableArchitectureTests.swift b/Tests/ComposableArchitectureTests/ComposableArchitectureTests.swift
@@ -152,7 +152,7 @@ import XCTest
       await store.send(.incr) { $0 = 2 }
       await store.send(.cancel)
       // NB: Wait a bit more time to handle effects so this test is less brittle in CI
-      await store.finish(timeout: 500 * NSEC_PER_MSEC)
+      await store.finish(timeout: NSEC_PER_SEC)
     }
   }
 #endif
diff --git a/Tests/ComposableArchitectureTests/EffectCancellationTests.swift b/Tests/ComposableArchitectureTests/EffectCancellationTests.swift
@@ -1,7 +1,11 @@
 @_spi(Internals) import ComposableArchitecture
 import XCTest
 
-@testable import ReactiveSwift
+#if DEBUG
+  @testable import ReactiveSwift
+#else
+  import ReactiveSwift
+#endif
 
 final class EffectCancellationTests: XCTestCase {
   struct CancelID: Hashable {}
@@ -65,7 +69,7 @@ final class EffectCancellationTests: XCTestCase {
     var value: Int?
 
     Effect(value: 1)
-      .deferred(for: 0.15, scheduler: QueueScheduler.main)
+      .deferred(for: 0.5, scheduler: QueueScheduler.main)
       .cancellable(id: CancelID())
       .producer
       .startWithValues { value = $0 }
@@ -180,59 +184,61 @@ final class EffectCancellationTests: XCTestCase {
     XCTAssertEqual(values, [1])
   }
 
-  func testConcurrentCancels() {
-    let queues = [
-      DispatchQueue.main,
-      DispatchQueue.global(qos: .background),
-      DispatchQueue.global(qos: .default),
-      DispatchQueue.global(qos: .unspecified),
-      DispatchQueue.global(qos: .userInitiated),
-      DispatchQueue.global(qos: .userInteractive),
-      DispatchQueue.global(qos: .utility),
-    ]
-    let ids = (1...10).map { _ in UUID() }
-
-    let effect = Effect.merge(
-      // Original upper bound was 1000, but it was triggering EXC_BAD_ACCESS crashes...
-      // Enabling ThreadSanitizer reveals data races in RAS internals, more specifically
-      // `TransformerCore.start` (accessing `hasDeliveredTerminalEvent` var), which can
-      // be the cause?
-      (1...200).map { idx -> Effect<Int, Never> in
-        let id = ids[idx % 10]
-
-        return Effect.merge(
-          Effect(value: idx)
-            .deferred(
-              for: Double.random(in: 1...100) / 1000,
-              scheduler: QueueScheduler(internalQueue: queues.randomElement()!)
-            )
-            .cancellable(id: id),
-
-          SignalProducer(value: ())
-            .delay(
-              Double.random(in: 1...100) / 1000,
-              on: QueueScheduler(internalQueue: queues.randomElement()!)
-            )
-            .flatMap(.latest) { Effect.cancel(id: id).producer }
-            .eraseToEffect()
-        )
-      }
-    )
+  #if DEBUG
+    func testConcurrentCancels() {
+      let queues = [
+        DispatchQueue.main,
+        DispatchQueue.global(qos: .background),
+        DispatchQueue.global(qos: .default),
+        DispatchQueue.global(qos: .unspecified),
+        DispatchQueue.global(qos: .userInitiated),
+        DispatchQueue.global(qos: .userInteractive),
+        DispatchQueue.global(qos: .utility),
+      ]
+      let ids = (1...10).map { _ in UUID() }
+
+      let effect = Effect.merge(
+        // Original upper bound was 1000, but it was triggering EXC_BAD_ACCESS crashes...
+        // Enabling ThreadSanitizer reveals data races in RAS internals, more specifically
+        // `TransformerCore.start` (accessing `hasDeliveredTerminalEvent` var), which can
+        // be the cause?
+        (1...200).map { idx -> Effect<Int, Never> in
+          let id = ids[idx % 10]
+
+          return Effect.merge(
+            Effect(value: idx)
+              .deferred(
+                for: Double.random(in: 1...100) / 1000,
+                scheduler: QueueScheduler(internalQueue: queues.randomElement()!)
+              )
+              .cancellable(id: id),
+
+            SignalProducer(value: ())
+              .delay(
+                Double.random(in: 1...100) / 1000,
+                on: QueueScheduler(internalQueue: queues.randomElement()!)
+              )
+              .flatMap(.latest) { Effect.cancel(id: id).producer }
+              .eraseToEffect()
+          )
+        }
+      )
 
-    let expectation = self.expectation(description: "wait")
-    effect
-      .producer
-      .on(completed: { expectation.fulfill() }, value: { _ in })
-      .start()
-    self.wait(for: [expectation], timeout: 999)
+      let expectation = self.expectation(description: "wait")
+      effect
+        .producer
+        .on(completed: { expectation.fulfill() }, value: { _ in })
+        .start()
+      self.wait(for: [expectation], timeout: 999)
 
-    for id in ids {
-      XCTAssertNil(
-        _cancellationCancellables[_CancelToken(id: id)],
-        "cancellationCancellables should not contain id \(id)"
-      )
+      for id in ids {
+        XCTAssertNil(
+          _cancellationCancellables[_CancelToken(id: id)],
+          "cancellationCancellables should not contain id \(id)"
+        )
+      }
     }
-  }
+  #endif
 
   func testNestedCancels() {
     let id = UUID()

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ struct EffectsBasics: ReducerProtocol {`
`50`	`50`	`return state.count >= 0`
`51`	`51`	`? .none`
`52`	`52`	`: .task {`
	`53`	`+ try await self.mainQueue.sleep(for: .seconds(1))`
`53`	`54`	`return .decrementDelayResponse`
`54`	`55`	`}`
`55`	`56`	`.cancellable(id: DelayID.self)`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ final class TimersTests: XCTestCase {`
`12`	`12`	`reducer: Timers()`
`13`	`13`	`)`
`14`	`14`
`15`		`- let mainQueue = DispatchQueue.test`
`16`		`- store.dependencies.mainQueue = mainQueue.eraseToAnyScheduler()`
	`15`	`+ let mainQueue = TestScheduler()`
	`16`	`+ store.dependencies.mainQueue = mainQueue`
`17`	`17`
`18`	`18`	`await store.send(.toggleTimerButtonTapped) {`
`19`	`19`	`$0.isTimerActive = true`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@ final class LifecycleTests: XCTestCase {`
`13`	`13`	`reducer: LifecycleDemo()`
`14`	`14`	`)`
`15`	`15`
`16`		`- let mainQueue = DispatchQueue.test`
`17`		`- store.dependencies.mainQueue = mainQueue.eraseToAnyScheduler()`
	`16`	`+ let mainQueue = TestScheduler()`
	`17`	`+ store.dependencies.mainQueue = mainQueue`
`18`	`18`
`19`	`19`	`await store.send(.toggleTimerButtonTapped) {`
`20`	`20`	`$0.count = 0`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ final class ReusableComponentsFavoritingTests: XCTestCase {`
`58`	`58`	`"Favoriting failed."`
`59`	`59`	`}`
`60`	`60`	`}`
`61`		`- let scheduler = DispatchQueue.test`
	`61`	`+ let scheduler = TestScheduler()`
`62`	`62`
`63`	`63`	`let episodes: IdentifiedArrayOf<Episode.State> = [`
`64`	`64`	`Episode.State(`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ func testTodos() async {`
`180`	`180`	`)`
`181`	`181`
`182`	`182`	`store.dependencies.date = .constant(Date(timeIntervalSinceReferenceDate: 1234567890))`
`183`		`- store.dependencies.mainQueue = .immediate`
	`183`	`+ store.dependencies.mainQueue = ImmediateScheduler()`
`184`	`184`	`store.dependencies.uuid = .incrementing`
`185`	`185`
`186`	`186`	`// ...`