simplify test

Author: millotp

clients/algoliasearch-client-swift/Sources/Core/Networking/RequestBuilder/EchoRequestBuilder.swift

@@ -78,7 +78,7 @@ final class EchoRequestBuilder: RequestBuilder {
             originalBodyData: urlRequest.httpBody,
             path: urlComponents?.percentEncodedPath ?? "",
             host: url.host ?? "",
-            algoliaAgent: headers["user-agent"] ?? "",
+            algoliaAgent: headers["User-Agent"] ?? "",
             queryParameters: queryParameters,
             headers: headers
         )

templates/swift/tests/client/tests.mustache

@@ -29,14 +29,8 @@
         {{/shouldScope}}
         {{#dynamicTemplate}}{{/dynamicTemplate}}
         {{#testUserAgent}}
-          let userAgent = try XCTUnwrap(echoResponse.headers?["User-Agent"])
-          guard let userAgent = userAgent else {
-            XCTFail("Expected user-agent header")
-            return
-          }
-
           let pattern = "{{#lambda.escapeSlash}}{{{match.value}}}{{/lambda.escapeSlash}}"
-          XCTAssertNoThrow(try regexMatch(userAgent, against: pattern), "Expected " + userAgent + " to match the following regex: " + pattern);
+          XCTAssertNoThrow(try regexMatch(echoResponse.algoliaAgent, against: pattern), "Expected " + echoResponse.algoliaAgent + " to match the following regex: " + pattern);
         {{/testUserAgent}}
         {{#testTimeouts}}
           XCTAssertEqual(TimeInterval({{{matchResponseTimeout}}} / 1000), echoResponse.timeout);

tests/output/swift/Tests/Utils/Utils.swift

@@ -97,6 +97,9 @@ public func union(expected: Any?, received: Any?) -> Any? {
 }
 
 public func regexMatch(_ received: String, against: String) -> Bool {
-    let matches = try! NSRegularExpression(pattern: against).matches(in: received, range: .init(location: 0, length: received.utf16.count))
+    let matches = try! NSRegularExpression(pattern: against).matches(
+        in: received,
+        range: .init(location: 0, length: received.utf16.count)
+    )
     return !matches.isEmpty
 }