update unit tests

Author: sebsto

Tests/OpenAPILambdaTests/Router/RouterGraphTest.swift

@@ -14,13 +14,10 @@
 //===----------------------------------------------------------------------===//
 import HTTPTypes
 import OpenAPIRuntime
+import Testing
 
 @testable import OpenAPILambda
 
-// only run unit tests on Swift 6.x
-#if swift(>=6.0)
-import Testing
-
 struct RouterGraphTests {
     @Test("Path with no parameters")
     func testPathNoParams() async throws {
@@ -231,7 +228,7 @@ struct RouterGraphTests {
     //        let method = HTTPRequest.Method(strMethod)!
     //        let graph = prepareGraph(for: method)
     //
-    //        let root: Node? = graph.root()
+    //        let root: node? = graph.root()
     //        XCTAssertNotNil(root)
     //
     //        // when
@@ -323,9 +320,8 @@ struct RouterGraphTests {
 
         //when
         #expect(throws: Never.self) { try graph.find(method: method, path: pathToTest) }
-        let (handler, metadata) = try graph.find(method: method, path: pathToTest)
+        let (_, metadata) = try graph.find(method: method, path: pathToTest)
         #expect(metadata.count == 0)
-        #expect(handler != nil)
     }
 
     @Test(
@@ -338,19 +334,18 @@ struct RouterGraphTests {
     )
     func testFindHandler2(
         pathToTest: String
-    ) throws {
+    ) async throws {
         // given
         let strMethod = "GET"
         let method = HTTPRequest.Method(strMethod)!
         let graph = prepareGraphForFind(for: method)
 
         //when
         #expect(throws: Never.self) {
-            let (handler, metadata) = try graph.find(method: method, path: pathToTest)
+            let (_, metadata) = try graph.find(method: method, path: pathToTest)
 
             // then (we can not test if the query string param have been decoded, that's the job of the openapi runtime.)
             #expect(metadata.count == 1)
-            #expect(handler != nil)
         }
 
     }
@@ -365,9 +360,8 @@ struct RouterGraphTests {
 
         //when
         #expect(throws: Never.self) { try graph.find(method: method, path: pathToTest) }
-        let (handler, metadata) = try graph.find(method: method, path: pathToTest)
+        let (_, metadata) = try graph.find(method: method, path: pathToTest)
         #expect(metadata.count == 1)
-        #expect(handler != nil)
     }
 
     @Test("Find handler error 1")
@@ -440,4 +434,3 @@ struct RouterGraphTests {
     }
 
 }
-#endif

Tests/OpenAPILambdaTests/Router/RouterNodeTest.swift

@@ -14,13 +14,10 @@
 //===----------------------------------------------------------------------===//
 import HTTPTypes
 import OpenAPIRuntime
+import Testing
 
 @testable import OpenAPILambda
 
-// only run unit tests on Swift 6.x
-#if swift(>=6.0)
-import Testing
-
 struct RouterNodeTests {
     @Test("First node is root")
     func testFirstNodeIsRoot() throws {
@@ -114,7 +111,7 @@ struct RouterNodeTests {
     }
 
     @Test("Cannot add node to handler")
-    func testCanNotAddNodeToHandler() {
+    func testCanNotAddNodeToHandler() async {
         // given
         let bodyString = "bodyString"
         let handler: OpenAPIHandler = { a, b, c in (HTTPResponse(status: .ok), HTTPBody(bodyString)) }
@@ -180,7 +177,7 @@ struct RouterNodeTests {
     }
 
     @Test("Retrieve param child exists")
-    func testRetrieveParamChildExist() {
+    func testRetrieveParamChildExist() async {
         // given
         let pathElement = "element1"
         let root = Node()
@@ -196,7 +193,7 @@ struct RouterNodeTests {
     }
 
     @Test("Retrieve param child does not exist")
-    func testRetrieveParamChildNOTExist() {
+    func testRetrieveParamChildNOTExist() async {
         // given
         let pathElement = "element1"
         let root = Node()
@@ -212,4 +209,3 @@ struct RouterNodeTests {
     }
 
 }
-#endif