Swift Testing support

pointfreeco · Jul 10, 2024 · 6a04853 · 6a04853
1 parent 416d722
commit 6a04853
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/[email protected] b/[email protected]
@@ -18,14 +18,14 @@ let package = Package(
   ],
   dependencies: [
     .package(url: "https://github.com/pointfreeco/swift-concurrency-extras", from: "1.0.0"),
-    .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.0.0"),
+    .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", branch: "swift-testing"),
   ],
   targets: [
     .target(
       name: "CombineSchedulers",
       dependencies: [
         .product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
-        .product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
+        .product(name: "IssueReporting", package: "xctest-dynamic-overlay"),
       ]
     ),
     .testTarget(

diff --git a/Sources/CombineSchedulers/Concurrency.swift b/Sources/CombineSchedulers/Concurrency.swift
@@ -1,5 +1,6 @@
 #if canImport(Combine)
   @preconcurrency import Combine
+  import ConcurrencyExtras
 
   extension Scheduler {
     /// Suspends the current task for at least the given duration.
@@ -76,14 +77,15 @@
       tolerance: SchedulerTimeType.Stride = .zero,
       options: SchedulerOptions? = nil
     ) -> AsyncStream<SchedulerTimeType> {
-      AsyncStream { continuation in
+      @UncheckedSendable var scheduler = self
+      return AsyncStream { [$scheduler] continuation in
         let cancellable = self.schedule(
           after: self.now.advanced(by: interval),
           interval: interval,
           tolerance: tolerance,
           options: options
         ) {
-          continuation.yield(self.now)
+          continuation.yield($scheduler.wrappedValue.now)
         }
         continuation.onTermination =
           { _ in

diff --git a/Sources/CombineSchedulers/UnimplementedScheduler.swift b/Sources/CombineSchedulers/UnimplementedScheduler.swift
@@ -1,7 +1,7 @@
 #if canImport(Combine)
   import Combine
   import Foundation
-  import XCTestDynamicOverlay
+  import IssueReporting
 
   /// A scheduler that causes the current XCTest test case to fail if it is used.
   ///
@@ -78,7 +78,7 @@
     SchedulerTimeType.Stride: SchedulerTimeIntervalConvertible
   {
     public var minimumTolerance: SchedulerTimeType.Stride {
-      XCTFail(
+      reportIssue(
         """
         \(self.prefix.isEmpty ? "" : "\(self.prefix) - ")\
         An unimplemented scheduler was asked its minimum tolerance.
@@ -88,7 +88,7 @@
     }
 
     public var now: SchedulerTimeType {
-      XCTFail(
+      reportIssue(
         """
         \(self.prefix.isEmpty ? "" : "\(self.prefix) - ")\
         An unimplemented scheduler was asked the current time.
@@ -112,7 +112,7 @@
     }
 
     public func schedule(options _: SchedulerOptions?, _ action: () -> Void) {
-      XCTFail(
+      reportIssue(
         """
         \(self.prefix.isEmpty ? "" : "\(self.prefix) - ")\
         An unimplemented scheduler scheduled an action to run immediately.
@@ -127,7 +127,7 @@
       options _: SchedulerOptions?,
       _ action: () -> Void
     ) {
-      XCTFail(
+      reportIssue(
         """
         \(self.prefix.isEmpty ? "" : "\(self.prefix) - ")\
         An unimplemented scheduler scheduled an action to run later.
@@ -143,7 +143,7 @@
       options _: SchedulerOptions?,
       _ action: () -> Void
     ) -> Cancellable {
-      XCTFail(
+      reportIssue(
         """
         \(self.prefix.isEmpty ? "" : "\(self.prefix) - ")\
         An unimplemented scheduler scheduled an action to run on a timer.