add byte to message verifier test, fixes #41 (#68)

Author: tanner0101

Package.swift

@@ -1,8 +1,11 @@
-// swift-tools-version:5.0
+// swift-tools-version:5.1
 import PackageDescription
 
 let package = Package(
     name: "postgres-nio",
+    platforms: [
+       .macOS(.v10_14)
+    ],
     products: [
         .library(name: "PostgresNIO", targets: ["PostgresNIO"]),
     ],
@@ -14,7 +17,11 @@ let package = Package(
     ],
     targets: [
         .target(name: "CMD5", dependencies: []),
-        .target(name: "PostgresNIO", dependencies: ["CMD5", "Logging", "Metrics", "NIO", "NIOSSL"]),
-        .testTarget(name: "PostgresNIOTests", dependencies: ["PostgresNIO"]),
+        .target(name: "PostgresNIO", dependencies: [
+            "CMD5", "Logging", "Metrics", "NIO", "NIOSSL"
+        ]),
+        .testTarget(name: "PostgresNIOTests", dependencies: [
+            "PostgresNIO", "NIOTestUtils"
+        ]),
     ]
 )

Sources/PostgresNIO/Message/PostgresMessage+0.swift

@@ -1,9 +1,16 @@
 /// A frontend or backend Postgres message.
-public struct PostgresMessage {
-    public var identifier: Identifier
-    
+public struct PostgresMessage: Equatable {
+    public var identifier: Identifier    
     public var data: ByteBuffer
-    
+
+    public init<Data>(identifier: Identifier, bytes: Data)
+        where Data: Sequence, Data.Element == UInt8
+    {
+        var buffer = ByteBufferAllocator().buffer(capacity: 0)
+        buffer.writeBytes(bytes)
+        self.init(identifier: identifier, data: buffer)
+    }
+
     public init(identifier: Identifier, data: ByteBuffer) {
         self.identifier = identifier
         self.data = data

Sources/PostgresNIO/Message/PostgresMessage+Authentication.swift

@@ -24,6 +24,18 @@ extension PostgresMessage {
                 throw PostgresError.protocol("Unkonwn authentication request type: \(type)")
             }
         }
+
+        public func serialize(into buffer: inout ByteBuffer) throws {
+            switch self {
+            case .ok:
+                buffer.writeInteger(0, as: Int32.self)
+            case .plaintext:
+                buffer.writeInteger(3, as: Int32.self)
+            case .md5(let salt):
+                buffer.writeInteger(5, as: Int32.self)
+                buffer.writeBytes(salt)
+            }
+        }
 
         /// AuthenticationOk
         /// Specifies that the authentication was successful.

Sources/PostgresNIO/Message/PostgresMessageDecoder.swift

@@ -24,7 +24,7 @@ public final class PostgresMessageDecoder: ByteToMessageDecoder {
         guard let identifier = peekBuffer.readInteger(as: UInt8.self).map(PostgresMessage.Identifier.init) else {
             return .needMoreData
         }
-        
+
         let message: PostgresMessage
 
         // special ssl case, no body
@@ -48,7 +48,6 @@ public final class PostgresMessageDecoder: ByteToMessageDecoder {
 
         // there is sufficient data, use this buffer
         buffer = peekBuffer
-        
         context.fireChannelRead(wrapInboundOut(message))
         return .continue
     }

Tests/PostgresNIOTests/PostgresNIOTests.swift

@@ -1,6 +1,7 @@
 import Logging
 import PostgresNIO
 import XCTest
+import NIOTestUtils
 
 final class PostgresNIOTests: XCTestCase {
     private var group: EventLoopGroup!
@@ -992,8 +993,42 @@ final class PostgresNIOTests: XCTestCase {
         XCTAssertEqual(rows[0].column("int")?.uint8, 5)
     }
 
-}
+    func testMessageDecoder() throws {
+        let sample: [UInt8] = [
+            0x52, // R - authentication
+                0x00, 0x00, 0x00, 0x0C, // length = 12
+                0x00, 0x00, 0x00, 0x05, // md5
+                0x01, 0x02, 0x03, 0x04, // salt
+            0x4B, // B - backend key data
+                0x00, 0x00, 0x00, 0x0C, // length = 12
+                0x05, 0x05, 0x05, 0x05, // process id
+                0x01, 0x01, 0x01, 0x01, // secret key
+        ]
+        var input = ByteBufferAllocator().buffer(capacity: 0)
+        input.writeBytes(sample)
 
+        let output: [PostgresMessage] = [
+            PostgresMessage(identifier: .authentication, bytes: [
+                0x00, 0x00, 0x00, 0x05,
+                0x01, 0x02, 0x03, 0x04,
+            ]),
+            PostgresMessage(identifier: .backendKeyData, bytes: [
+                0x05, 0x05, 0x05, 0x05,
+                0x01, 0x01, 0x01, 0x01,
+            ])
+        ]
+        do {
+            try ByteToMessageDecoderVerifier.verifyDecoder(
+                inputOutputPairs: [(input, output)],
+                decoderFactory: {
+                    PostgresMessageDecoder()
+                }
+            )
+        } catch {
+            XCTFail("\(error)")
+        }
+    }
+}
 
 private func performance(function: String = #function) -> Bool {
     if _isDebugAssertConfiguration() {