Fixed syntax. Now using config

Author: fabianfett

Sources/AWSLambdaTesting/Lambda+Testing.swift

@@ -23,12 +23,12 @@ extension Lambda {
         public var requestId: String
         public var traceId: String
         public var invokedFunctionArn: String
-        public var timeout: Double
+        public var timeout: DispatchTimeInterval
 
         public init(requestId: String = "\(DispatchTime.now().uptimeNanoseconds)",
                     traceId: String = "Root=\(DispatchTime.now().uptimeNanoseconds);Parent=\(DispatchTime.now().uptimeNanoseconds);Sampled=1",
                     invokedFunctionArn: String = "arn:aws:lambda:us-west-1:\(DispatchTime.now().uptimeNanoseconds):function:custom-runtime",
-                    timeout: Double = 5) {
+                    timeout: DispatchTimeInterval = .seconds(5)) {
             self.requestId = requestId
             self.traceId = traceId
             self.invokedFunctionArn = invokedFunctionArn
@@ -37,28 +37,30 @@ extension Lambda {
     }
 
     public static func test(_ closure: @escaping StringLambdaClosure,
-                            config: TestConfig = .init(),
-                            with payload: String) throws -> String {
+                            with payload: String,
+                            using config: TestConfig = .init()) throws -> String {
         try Self.test(StringLambdaClosureWrapper(closure), config: config, with: payload)
     }
 
     public static func test(_ closure: @escaping StringVoidLambdaClosure,
-                            config: TestConfig = .init(),
-                            with payload: String) throws {
+                            with payload: String,
+                            using config: TestConfig = .init()) throws {
         _ = try Self.test(StringVoidLambdaClosureWrapper(closure), config: config, with: payload)
     }
 
     public static func test<In: Decodable, Out: Encodable>(
         _ closure: @escaping CodableLambdaClosure<In, Out>,
-        config: TestConfig = .init(),
-        with payload: In
+        with payload: In,
+        using config: TestConfig = .init()
     ) throws -> Out {
         try Self.test(CodableLambdaClosureWrapper(closure), config: config, with: payload)
     }
 
-    public static func test<In: Decodable>(_ closure: @escaping CodableVoidLambdaClosure<In>,
-                                           config: TestConfig = .init(),
-                                           with payload: In) throws {
+    public static func test<In: Decodable>(
+        _ closure: @escaping CodableVoidLambdaClosure<In>,
+        with payload: In,
+        using config: TestConfig = .init()
+    ) throws {
         _ = try Self.test(CodableVoidLambdaClosureWrapper(closure), config: config, with: payload)
     }
 

Tests/AWSLambdaTestingTests/Tests.swift

@@ -123,11 +123,12 @@ class LambdaTestingTests: XCTestCase {
     }
 
     func testConfigValues() {
+        let timeout: TimeInterval = 4
         let config = Lambda.TestConfig(
             requestId: "abc123",
             traceId: "hahahihi",
             invokedFunctionArn: "arn:hihi",
-            timeout: 4
+            timeout: .seconds(4)
         )
 
         let myLambda = { (ctx: Lambda.Context, _: String, callback: @escaping (Result<Void, Error>) -> Void) in
@@ -136,11 +137,11 @@ class LambdaTestingTests: XCTestCase {
             XCTAssertEqual(ctx.invokedFunctionArn, config.invokedFunctionArn)
 
             let secondsSinceEpoch = Double(Int64(bitPattern: ctx.deadline.rawValue)) / -1_000_000_000
-            XCTAssertLessThanOrEqual(Date(timeIntervalSince1970: secondsSinceEpoch).timeIntervalSinceNow, config.timeout)
+            XCTAssertEqual(Date(timeIntervalSince1970: secondsSinceEpoch).timeIntervalSinceNow, timeout, accuracy: 0.1)
 
             callback(.success(()))
         }
 
-        XCTAssertNoThrow(try Lambda.test(myLambda, config: config, with: UUID().uuidString))
+        XCTAssertNoThrow(try Lambda.test(myLambda, with: UUID().uuidString, using: config))
     }
 }