wip: add more tests

SwiftyLab · Mar 4, 2023 · b5824c4 · b5824c4
1 parent 4beae68
commit b5824c4
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/Sources/AsyncObjects/TaskOperation.swift b/Sources/AsyncObjects/TaskOperation.swift
@@ -273,7 +273,9 @@ public final class TaskOperation<R: Sendable>: Operation, AsyncObject, Loggable,
     ) async throws {
         let key = UUID()
         log("Waiting", id: key, file: file, function: function, line: line)
-        for await _ in event { break }
+        var iter = event.makeAsyncIterator()
+        await iter.next()
+
         do {
             try Task.checkCancellation()
         } catch {
@@ -283,10 +285,11 @@ public final class TaskOperation<R: Sendable>: Operation, AsyncObject, Loggable,
             )
             throw error
         }
-        do {
-            let _ = try await execTask?.value
+
+        switch await self.result {
+        case .success:
             log("Finished", id: key, file: file, function: function, line: line)
-        } catch {
+        case .failure(let error):
             log(
                 "Finished with error: \(error)", id: key,
                 file: file, function: function, line: line

diff --git a/Tests/AsyncObjectsTests/TaskOperationTests.swift b/Tests/AsyncObjectsTests/TaskOperationTests.swift
@@ -74,10 +74,13 @@ class TaskOperationTests: XCTestCase {
         try await operation.wait(forSeconds: 3)
     }
 
-    func testFinisheAsyncdWait() async throws {
-        let operation = TaskOperation { /* Do nothing */  }
+    func testAsyncWaitError() async throws {
+        let operation = TaskOperation { throw CancellationError()  }
         operation.signal()
-        try await operation.wait(forSeconds: 3)
+        do {
+            try await operation.wait(forSeconds: 3)
+            XCTFail("Unexpected task progression")
+        } catch is CancellationError {}
     }
 
     func testDeinit() async throws {
@@ -265,6 +268,10 @@ class TaskOperationTaskManagementTests: XCTestCase {
             XCTAssertFalse(error.localizedDescription.isEmpty)
         default: XCTFail("Unexpected operation result")
         }
+        do {
+            try await operation.wait(forSeconds: 3)
+            XCTFail("Unexpected task progression")
+        } catch is DurationTimeoutError {}
     }
 
     func testNotStartedCancellationError() async throws {
@@ -278,6 +285,10 @@ class TaskOperationTaskManagementTests: XCTestCase {
             XCTAssertFalse(error.localizedDescription.isEmpty)
         default: XCTFail("Unexpected operation result")
         }
+        do {
+            try await operation.wait(forSeconds: 3)
+            XCTFail("Unexpected task progression")
+        } catch is CancellationError {}
     }
 }