test fixups

apple · Jun 30, 2023 · 34fe176 · 34fe176
1 parent 400a8e6
commit 34fe176
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 40 deletions.
diff --git a/Tests/NIOHTTP2Tests/ConfiguringPipelineAsyncMultiplexerTests.swift b/Tests/NIOHTTP2Tests/ConfiguringPipelineAsyncMultiplexerTests.swift
@@ -73,32 +73,30 @@ final class ConfiguringPipelineAsyncMultiplexerTests: XCTestCase {
     func testBasicPipelineCommunicates() async throws {
         let requestCount = 100
 
-
-        let (serverRecorderStream, serverRecorderContinuation) = AsyncStream<InboundRecorder<HTTP2Frame.FramePayload>>.makeStream()
-        var serverRecorderIterator = serverRecorderStream.makeAsyncIterator()
+        let serverRecorder = InboundFramePayloadRecorder()
 
         let clientMultiplexer = try await assertNoThrowWithValue(
             try await self.clientChannel.configureAsyncHTTP2Pipeline(
-                mode: .client, connectionConfiguration: .init(), streamConfiguration: .init()) { channel -> EventLoopFuture<Channel> in
-                    self.serverChannel.eventLoop.makeSucceededFuture(channel)
-                }.get()
+                mode: .client,
+                connectionConfiguration: .init(),
+                streamConfiguration: .init()
+            ) { channel -> EventLoopFuture<Channel> in
+                channel.eventLoop.makeSucceededFuture(channel)
+            }.get()
         )
 
         let serverMultiplexer = try await assertNoThrowWithValue(
             try await self.serverChannel.configureAsyncHTTP2Pipeline(
-                mode: .server, connectionConfiguration: .init(), streamConfiguration: .init()) { channel -> EventLoopFuture<Channel> in
-                    let serverRecorder = InboundFramePayloadRecorder()
-                    serverRecorderContinuation.yield(serverRecorder)
-                    return channel.pipeline.addHandlers([OKResponder(), serverRecorder]).map { _ in return channel }
-                }.get()
+                mode: .server,
+                connectionConfiguration: .init(),
+                streamConfiguration: .init()
+            ) { channel -> EventLoopFuture<Channel> in
+                return channel.pipeline.addHandlers([OKResponder(), serverRecorder]).map { _ in return channel }
+            }.get()
         )
 
         try await assertNoThrow(try await self.assertDoHandshake(client: self.clientChannel, server: self.serverChannel))
 
-
-        let (clientRecorderStream, clientRecorderContinuation) = AsyncStream<InboundRecorder<HTTP2Frame.FramePayload>>.makeStream()
-        var clientRecorderIterator = clientRecorderStream.makeAsyncIterator()
-
         try await withThrowingTaskGroup(of: Int.self, returning: Void.self) { group in
             // server
             group.addTask {
@@ -113,42 +111,25 @@ final class ConfiguringPipelineAsyncMultiplexerTests: XCTestCase {
             for _ in 0 ..< requestCount {
                 // Let's try sending some requests
                 let streamChannel = try await clientMultiplexer.createStreamChannel { channel -> EventLoopFuture<Channel> in
-                    let clientRecorder = InboundFramePayloadRecorder()
-                    clientRecorderContinuation.yield(clientRecorder)
-                    return channel.pipeline.addHandlers([SimpleRequest(), clientRecorder]).map {
+                    return channel.pipeline.addHandlers([SimpleRequest(), InboundFramePayloadRecorder()]).map {
                         return channel
                     }
                 }
 
+                let clientRecorder = try await streamChannel.pipeline.handler(type: InboundFramePayloadRecorder.self).get()
                 try await self.interactInMemory(self.clientChannel, self.serverChannel)
+                clientRecorder.receivedFrames.assertFramePayloadsMatch([ConfiguringPipelineAsyncMultiplexerTests.responseFramePayload])
                 try await streamChannel.closeFuture.get()
-
-                let clientRecorder = await clientRecorderIterator.next()!
-                clientRecorder.framesLock.withLock {
-                    clientRecorder.receivedFrames.assertFramePayloadsMatch([ConfiguringPipelineAsyncMultiplexerTests.responseFramePayload])
-                }
             }
 
-            self.clientChannel.close(promise: nil)
-            await self.clientChannel.testingEventLoop.run()
-            group.cancelAll()
+            try await assertNoThrow(try await self.clientChannel.finish())
+            try await assertNoThrow(try await self.serverChannel.finish())
 
             let serverInboundChannelCount = try await assertNoThrowWithValue(try await group.next()!)
-            XCTAssertEqual(serverInboundChannelCount, requestCount, "We should have created one server-side channel as a result of the one HTTP/2 stream used.")
+            XCTAssertEqual(serverInboundChannelCount, requestCount, "We should have created one server-side channel as a result of the each HTTP/2 stream used.")
         }
 
-        for _ in 0 ..< requestCount {
-            let serverRecorder = await serverRecorderIterator.next()!
-            serverRecorder.framesLock.withLock {
-                serverRecorder.receivedFrames.assertFramePayloadsMatch([ConfiguringPipelineAsyncMultiplexerTests.requestFramePayload])
-            }
-        }
-
-        await self.clientChannel.assertNoFramesReceived()
-        await self.serverChannel.assertNoFramesReceived()
-
-        try await assertNoThrow(try await self.clientChannel.finish(acceptAlreadyClosed: true))
-        try await assertNoThrow(try await self.serverChannel.finish())
+        serverRecorder.receivedFrames.assertFramePayloadsMatch(Array(repeating: ConfiguringPipelineAsyncMultiplexerTests.requestFramePayload, count: requestCount))
     }
 }
 

diff --git a/Tests/NIOHTTP2Tests/HTTP2StreamMultiplexerTests.swift b/Tests/NIOHTTP2Tests/HTTP2StreamMultiplexerTests.swift
@@ -95,7 +95,7 @@ typealias FramePayloadWriteRecorder = WriteRecorder<HTTP2Frame.FramePayload>
 final class InboundRecorder<Frame>: ChannelInboundHandler, @unchecked Sendable {
     typealias InboundIn = Frame
 
-    let framesLock = NIOLock()
+    private let framesLock = NIOLock()
     private var _receivedFrames: [Frame] = []
     var receivedFrames: [Frame] {
         get {