Update SSLTestHelpers, remove deprecation warnings in tests

cham-s · cham-s · commit a74d68435249 · 2024-02-02T21:17:45.000+01:00
diff --git a/Tests/WebSocketKitTests/SSLTestHelpers.swift b/Tests/WebSocketKitTests/SSLTestHelpers.swift
@@ -76,7 +76,7 @@ func generateRSAPrivateKey() -> OpaquePointer {
     precondition(generateRC == 1)
 
     let pkey = CNIOBoringSSL_EVP_PKEY_new()!
-    let assignRC = CNIOBoringSSL_EVP_PKEY_assign(pkey, EVP_PKEY_RSA, rsa)
+    let assignRC = CNIOBoringSSL_EVP_PKEY_assign_RSA(pkey, rsa)
     
     precondition(assignRC == 1)
     return pkey
@@ -125,7 +125,7 @@ func generateSelfSignedCert(keygenFunction: () -> OpaquePointer = generateRSAPri
                                                      NID_commonName,
                                                      MBSTRING_UTF8,
                                                      UnsafeMutablePointer(mutating: pointer),
-                                                     CInt(commonName.lengthOfBytes(using: .utf8)),
+                                                     ossl_ssize_t(commonName.lengthOfBytes(using: .utf8)),
                                                      -1,
                                                      0)
         }
diff --git a/Tests/WebSocketKitTests/WebSocketKitTests.swift b/Tests/WebSocketKitTests/WebSocketKitTests.swift
@@ -516,8 +516,8 @@ final class WebSocketKitTests: XCTestCase {
             return XCTFail("couldn't get port from \(String(reflecting: server.localAddress))")
         }
         WebSocket.connect(to: "ws://localhost:\(port)", on: self.elg) { ws in
-            ws.onPong {
-                $0.close(promise: closePromise)
+            ws.onPong { webSocket, _ in
+                webSocket.close(promise: closePromise)
                 promise.succeed()
             }
             ws.sendPing()
@@ -536,8 +536,8 @@ final class WebSocketKitTests: XCTestCase {
         }
         WebSocket.connect(to: "ws://localhost:\(port)", on: self.elg) { ws in
             ws.pingInterval = .milliseconds(100)
-            ws.onPong {
-                $0.close(promise: closePromise)
+            ws.onPong { webSocket, _ in
+                webSocket.close(promise: closePromise)
                 promise.succeed()
             }
         }.cascadeFailure(to: closePromise)

Original file line number	Diff line number	Diff line change
`@@ -516,8 +516,8 @@ final class WebSocketKitTests: XCTestCase {`
`516`	`516`	`return XCTFail("couldn't get port from \(String(reflecting: server.localAddress))")`
`517`	`517`	`}`
`518`	`518`	`WebSocket.connect(to: "ws://localhost:\(port)", on: self.elg) { ws in`
`519`		`- ws.onPong {`
`520`		`- $0.close(promise: closePromise)`
	`519`	`+ ws.onPong { webSocket, _ in`
	`520`	`+ webSocket.close(promise: closePromise)`
`521`	`521`	`promise.succeed()`
`522`	`522`	`}`
`523`	`523`	`ws.sendPing()`
`@@ -536,8 +536,8 @@ final class WebSocketKitTests: XCTestCase {`
`536`	`536`	`}`
`537`	`537`	`WebSocket.connect(to: "ws://localhost:\(port)", on: self.elg) { ws in`
`538`	`538`	`ws.pingInterval = .milliseconds(100)`
`539`		`- ws.onPong {`
`540`		`- $0.close(promise: closePromise)`
	`539`	`+ ws.onPong { webSocket, _ in`
	`540`	`+ webSocket.close(promise: closePromise)`
`541`	`541`	`promise.succeed()`
`542`	`542`	`}`
`543`	`543`	`}.cascadeFailure(to: closePromise)`