Skip to content

Commit 67d72ec

Browse files
committed
Updating tests to handle UUID type
1 parent 73ed655 commit 67d72ec

File tree

6 files changed

+16
-7
lines changed

6 files changed

+16
-7
lines changed

Tests/OpenAPIGeneratorCoreTests/Translator/TypeAssignment/Test_TypeMatcher.swift

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ final class Test_TypeMatcher: Test_Core {
2828
(.string(contentEncoding: .base64), "OpenAPIRuntime.Base64EncodedData"),
2929
(.string(.init(format: .date), .init()), "Swift.String"),
3030
(.string(.init(format: .dateTime), .init()), "Foundation.Date"),
31+
(.string(.init(format: .uuid), .init()), "Foundation.UUID"),
3132

3233
(.integer, "Swift.Int"), (.integer(.init(format: .int32), .init()), "Swift.Int32"),
3334
(.integer(.init(format: .int64), .init()), "Swift.Int64"),

Tests/OpenAPIGeneratorReferenceTests/Resources/ReferenceSources/Petstore/Client.swift

+2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@
44
@preconcurrency import struct Foundation.URL
55
@preconcurrency import struct Foundation.Data
66
@preconcurrency import struct Foundation.Date
7+
@preconcurrency import struct Foundation.UUID
78
#else
89
import struct Foundation.URL
910
import struct Foundation.Data
1011
import struct Foundation.Date
12+
import struct Foundation.UUID
1113
#endif
1214
import HTTPTypes
1315
/// Service for managing pet metadata.

Tests/OpenAPIGeneratorReferenceTests/Resources/ReferenceSources/Petstore/Server.swift

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@
44
@preconcurrency import struct Foundation.URL
55
@preconcurrency import struct Foundation.Data
66
@preconcurrency import struct Foundation.Date
7+
@preconcurrency import struct Foundation.UUID
78
#else
89
import struct Foundation.URL
910
import struct Foundation.Data
1011
import struct Foundation.Date
12+
import struct Foundation.UUID
1113
#endif
1214
import HTTPTypes
1315
extension APIProtocol {
@@ -199,7 +201,7 @@ fileprivate extension UniversalServer where APIHandler: APIProtocol {
199201
My_hyphen_Request_hyphen_UUID: try converter.getOptionalHeaderFieldAsURI(
200202
in: request.headerFields,
201203
name: "My-Request-UUID",
202-
as: Swift.String.self
204+
as: Foundation.UUID.self
203205
),
204206
accept: try converter.extractAcceptHeaderIfPresent(in: request.headerFields)
205207
)

Tests/OpenAPIGeneratorReferenceTests/Resources/ReferenceSources/Petstore/Types.swift

+4-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@
44
@preconcurrency import struct Foundation.URL
55
@preconcurrency import struct Foundation.Data
66
@preconcurrency import struct Foundation.Date
7+
@preconcurrency import struct Foundation.UUID
78
#else
89
import struct Foundation.URL
910
import struct Foundation.Data
1011
import struct Foundation.Date
12+
import struct Foundation.UUID
1113
#endif
1214
/// A type that performs HTTP operations defined by the OpenAPI document.
1315
public protocol APIProtocol: Sendable {
@@ -1820,15 +1822,15 @@ public enum Operations {
18201822
/// Request identifier
18211823
///
18221824
/// - Remark: Generated from `#/paths/pets/GET/header/My-Request-UUID`.
1823-
public var My_hyphen_Request_hyphen_UUID: Swift.String?
1825+
public var My_hyphen_Request_hyphen_UUID: Foundation.UUID?
18241826
public var accept: [OpenAPIRuntime.AcceptHeaderContentType<Operations.listPets.AcceptableContentType>]
18251827
/// Creates a new `Headers`.
18261828
///
18271829
/// - Parameters:
18281830
/// - My_hyphen_Request_hyphen_UUID: Request identifier
18291831
/// - accept:
18301832
public init(
1831-
My_hyphen_Request_hyphen_UUID: Swift.String? = nil,
1833+
My_hyphen_Request_hyphen_UUID: Foundation.UUID? = nil,
18321834
accept: [OpenAPIRuntime.AcceptHeaderContentType<Operations.listPets.AcceptableContentType>] = .defaultValues()
18331835
) {
18341836
self.My_hyphen_Request_hyphen_UUID = My_hyphen_Request_hyphen_UUID

Tests/PetstoreConsumerTests/Test_Client.swift

+3-2
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ final class Test_Client: XCTestCase {
3636
}
3737

3838
func testListPets_200() async throws {
39+
let requestUUID = UUID()
3940
transport = .init { (request: HTTPRequest, body: HTTPBody?, baseURL: URL, operationID: String) in
4041
XCTAssertEqual(operationID, "listPets")
4142
XCTAssertEqual(
@@ -44,7 +45,7 @@ final class Test_Client: XCTestCase {
4445
)
4546
XCTAssertEqual(baseURL.absoluteString, "/api")
4647
XCTAssertEqual(request.method, .get)
47-
XCTAssertEqual(request.headerFields, [.accept: "application/json", .init("My-Request-UUID")!: "abcd-1234"])
48+
XCTAssertEqual(request.headerFields, [.accept: "application/json", .init("My-Request-UUID")!: requestUUID.uuidString])
4849
XCTAssertNil(body)
4950
return try HTTPResponse(
5051
status: .ok,
@@ -67,7 +68,7 @@ final class Test_Client: XCTestCase {
6768
let response = try await client.listPets(
6869
.init(
6970
query: .init(limit: 24, habitat: .water, feeds: [.herbivore, .carnivore], since: .test),
70-
headers: .init(My_hyphen_Request_hyphen_UUID: "abcd-1234")
71+
headers: .init(My_hyphen_Request_hyphen_UUID: requestUUID)
7172
)
7273
)
7374
guard case let .ok(value) = response else {

Tests/PetstoreConsumerTests/Test_Server.swift

+3-2
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,13 @@ final class Test_Server: XCTestCase {
2828
}
2929

3030
func testListPets_200() async throws {
31+
let requestUUID = UUID()
3132
client = .init(listPetsBlock: { input in
3233
XCTAssertEqual(input.query.limit, 24)
3334
XCTAssertEqual(input.query.habitat, .water)
3435
XCTAssertEqual(input.query.since, .test)
3536
XCTAssertEqual(input.query.feeds, [.carnivore, .herbivore])
36-
XCTAssertEqual(input.headers.My_hyphen_Request_hyphen_UUID, "abcd-1234")
37+
XCTAssertEqual(input.headers.My_hyphen_Request_hyphen_UUID, requestUUID)
3738
return .ok(
3839
.init(
3940
headers: .init(My_hyphen_Response_hyphen_UUID: "abcd", My_hyphen_Tracing_hyphen_Header: "1234"),
@@ -45,7 +46,7 @@ final class Test_Server: XCTestCase {
4546
.init(
4647
soar_path: "/api/pets?limit=24&habitat=water&feeds=carnivore&feeds=herbivore&since=\(Date.testString)",
4748
method: .get,
48-
headerFields: [.init("My-Request-UUID")!: "abcd-1234"]
49+
headerFields: [.init("My-Request-UUID")!: requestUUID.uuidString]
4950
),
5051
nil,
5152
.init()

0 commit comments

Comments
 (0)