Code review

apple · May 29, 2024 · ba8f9fb · ba8f9fb
1 parent a982359
commit ba8f9fb
Show file tree

Hide file tree

Showing 3 changed files with 80 additions and 10 deletions.
diff --git a/Sources/NIOEmbedded/AsyncTestingEventLoop.swift b/Sources/NIOEmbedded/AsyncTestingEventLoop.swift
@@ -355,6 +355,12 @@ public final class NIOAsyncTestingEventLoop: EventLoop, @unchecked Sendable {
 extension NIOAsyncTestingEventLoop: NIOSerialEventLoopExecutor { }
 #endif
 
+// MARK: TaskExecutor conformance
+#if compiler(>=6.0)
+@available(macOS 9999.0, iOS 9999.0, watchOS 9999.0, tvOS 9999.0, *)
+extension NIOAsyncTestingEventLoop: NIOTaskEventLoopExecutor { }
+#endif
+
 /// This is a thread-safe promise creation store.
 ///
 /// We use this to keep track of where promises come from in the `NIOAsyncTestingEventLoop`.

diff --git a/Sources/NIOEmbedded/Embedded.swift b/Sources/NIOEmbedded/Embedded.swift
@@ -240,6 +240,13 @@ public final class EmbeddedEventLoop: EventLoop {
         fatalError("EmbeddedEventLoop is not thread safe and cannot be used as a SerialExecutor. Use NIOAsyncTestingEventLoop instead.")
     }
     #endif
+
+    #if compiler(>=6.0)
+    @available(macOS 9999.0, iOS 9999.0, watchOS 9999.0, tvOS 9999.0, *)
+    public var taskExecutor: any TaskExecutor {
+        fatalError("EmbeddedEventLoop is not thread safe and cannot be used as a TaskExecutor. Use NIOAsyncTestingEventLoop instead.")
+    }
+    #endif
 }
 
 @usableFromInline

diff --git a/Tests/NIOPosixTests/TaskExecutorTests.swift b/Tests/NIOPosixTests/TaskExecutorTests.swift
@@ -17,32 +17,89 @@ import NIOPosix
 import XCTest
 
 final class TaskExecutorTests: XCTestCase {
+
+    #if compiler(>=6.0)
     @available(macOS 9999.0, iOS 9999.0, watchOS 9999.0, tvOS 9999.0, *)
-    func testBasicExecutorFitsOnEventLoop_MTELG() async throws {
+    func _runTests(loop1: some EventLoop, loop2: some EventLoop) async {
+        await withTaskGroup(of: Void.self) { taskGroup in
+            taskGroup.addTask(executorPreference: loop1.taskExecutor) {
+                loop1.assertInEventLoop()
+                loop2.assertNotInEventLoop()
+
+                withUnsafeCurrentTask { task in
+                    // this currently fails on macOS
+                    XCTAssertEqual(task?.unownedTaskExecutor, loop1.taskExecutor.asUnownedTaskExecutor())
+                }
+            }
+
+            taskGroup.addTask(executorPreference: loop2.taskExecutor) {
+                loop1.assertNotInEventLoop()
+                loop2.assertInEventLoop()
+
+                withUnsafeCurrentTask { task in
+                    // this currently fails on macOS
+                    XCTAssertEqual(task?.unownedTaskExecutor, loop2.taskExecutor.asUnownedTaskExecutor())
+                }
+            }
+        }
+
+        let task = Task(executorPreference: loop1.taskExecutor) {
+            loop1.assertInEventLoop()
+            loop2.assertNotInEventLoop()
+
+            withUnsafeCurrentTask { task in
+                // this currently fails on macOS
+                XCTAssertEqual(task?.unownedTaskExecutor, loop1.taskExecutor.asUnownedTaskExecutor())
+            }
+        }
+
+        await task.value
+    }
+    #endif
+
+    @available(macOS 9999.0, iOS 9999.0, watchOS 9999.0, tvOS 9999.0, *)
+    func testSelectableEventLoopAsTaskExecutor() async throws {
         #if compiler(>=6.0)
         let group = MultiThreadedEventLoopGroup(numberOfThreads: 2)
         defer {
             try! group.syncShutdownGracefully()
         }
-        let loops = Array(group.makeIterator())
+        var iterator = group.makeIterator()
+        let loop1 = iterator.next()!
+        let loop2 = iterator.next()!
+
+        await self._runTests(loop1: loop1, loop2: loop2)
+        #endif
+    }
+
+    @available(macOS 9999.0, iOS 9999.0, watchOS 9999.0, tvOS 9999.0, *)
+    func testAsyncTestingEventLoopAsTaskExecutor() async throws {
+        #if compiler(>=6.0)
+        let loop1 = NIOAsyncTestingEventLoop()
+        let loop2 = NIOAsyncTestingEventLoop()
+        defer {
+            try? loop1.syncShutdownGracefully()
+            try? loop2.syncShutdownGracefully()
+        }
+
         await withTaskGroup(of: Void.self) { taskGroup in
-            taskGroup.addTask(executorPreference: loops[0].taskExecutor) {
-                loops[0].assertInEventLoop()
-                loops[1].assertNotInEventLoop()
+            taskGroup.addTask(executorPreference: loop1.taskExecutor) {
+                loop1.assertInEventLoop()
+                loop2.assertNotInEventLoop()
 
                 withUnsafeCurrentTask { task in
                     // this currently fails on macOS
-                    XCTAssertEqual(task?.unownedTaskExecutor, loops[0].taskExecutor.asUnownedTaskExecutor())
+                    XCTAssertEqual(task?.unownedTaskExecutor, loop1.taskExecutor.asUnownedTaskExecutor())
                 }
             }
 
-            taskGroup.addTask(executorPreference: loops[1].taskExecutor) {
-                loops[0].assertNotInEventLoop()
-                loops[1].assertInEventLoop()
+            taskGroup.addTask(executorPreference: loop2) {
+                loop1.assertNotInEventLoop()
+                loop2.assertInEventLoop()
 
                 withUnsafeCurrentTask { task in
                     // this currently fails on macOS
-                    XCTAssertEqual(task?.unownedTaskExecutor, loops[1].taskExecutor.asUnownedTaskExecutor())
+                    XCTAssertEqual(task?.unownedTaskExecutor, loop2.taskExecutor.asUnownedTaskExecutor())
                 }
             }
         }