fix more warnings in newer compilers (#1178)

Motivation: Newer Swift compilers have more diagnostics which cause warnings in NIO. Modifications: Fix those warnings. Result: Fewer warnings.
apple · Oct 22, 2019 · 63458d4 · 63458d4
1 parent 4761f96
commit 63458d4
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/Tests/NIOWebSocketTests/WebSocketFrameDecoderTest.swift b/Tests/NIOWebSocketTests/WebSocketFrameDecoderTest.swift
@@ -325,9 +325,10 @@ public final class WebSocketFrameDecoderTest: XCTestCase {
         let wrongFrame: [UInt8] = [0x81, 0xFE, 0x40, 0x01]
         self.buffer.writeBytes(wrongFrame)
         XCTAssertThrowsError(try self.decoderChannel.writeInbound(self.buffer)) { error in
-            if case .some(.dataReceivedInErrorState(let data)) = error as? ByteToMessageDecoderError {
+            if case .some(.dataReceivedInErrorState(let innerError, let data)) = error as? ByteToMessageDecoderError {
                 // ok
-                XCTAssertEqual(wrongFrame, Array(data.1.readableBytesView))
+                XCTAssertEqual(.fragmentedControlFrame, innerError as? NIOWebSocketError)
+                XCTAssertEqual(wrongFrame, Array(data.readableBytesView))
             } else {
                 XCTFail("unexpected error: \(error)")
             }
@@ -458,9 +459,10 @@ public final class WebSocketFrameDecoderTest: XCTestCase {
         let wrongFrame: [UInt8] = [0x81, 0xFE, 0x40, 0x01]
         self.buffer.writeBytes(wrongFrame)
         XCTAssertThrowsError(try self.decoderChannel.writeInbound(self.buffer)) { error in
-            if case .some(.dataReceivedInErrorState(let data)) = error as? ByteToMessageDecoderError {
+            if case .some(.dataReceivedInErrorState(let innerError, let data)) = error as? ByteToMessageDecoderError {
                 // ok
-                XCTAssertEqual(wrongFrame, Array(data.1.readableBytesView))
+                XCTAssertEqual(.fragmentedControlFrame, innerError as? NIOWebSocketError)
+                XCTAssertEqual(wrongFrame, Array(data.readableBytesView))
             } else {
                 XCTFail("unexpected error: \(error)")
             }
@@ -569,9 +571,10 @@ public final class WebSocketFrameDecoderTest: XCTestCase {
         let wrongFrame: [UInt8] = [0x81, 0xFE, 0x40, 0x01]
         self.buffer.writeBytes(wrongFrame)
         XCTAssertThrowsError(try self.decoderChannel.writeInbound(self.buffer)) { error in
-            if case .some(.dataReceivedInErrorState(let data)) = error as? ByteToMessageDecoderError {
+            if case .some(.dataReceivedInErrorState(let innerError, let data)) = error as? ByteToMessageDecoderError {
                 // ok
-                XCTAssertEqual(wrongFrame, Array(data.1.readableBytesView))
+                XCTAssertEqual(.fragmentedControlFrame, innerError as? NIOWebSocketError)
+                XCTAssertEqual(wrongFrame, Array(data.readableBytesView))
             } else {
                 XCTFail("unexpected error: \(error)")
             }