From 15c0e4aa01621203dd8687490597f0bb406b6e1d Mon Sep 17 00:00:00 2001
From: Honza Dvorsky <honza@apple.com>
Date: Mon, 25 Sep 2023 15:12:09 +0200
Subject: [PATCH] [Bug] Make a missing converter helper public

---
 .../Conversion/Converter+Server.swift          |  2 +-
 .../Conversion/Test_Converter+Client.swift     |  2 +-
 .../Conversion/Test_Converter+Common.swift     |  2 +-
 .../Conversion/Test_Converter+Server.swift     | 18 ++----------------
 4 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/Sources/OpenAPIRuntime/Conversion/Converter+Server.swift b/Sources/OpenAPIRuntime/Conversion/Converter+Server.swift
index 0c18509c..db063a67 100644
--- a/Sources/OpenAPIRuntime/Conversion/Converter+Server.swift
+++ b/Sources/OpenAPIRuntime/Conversion/Converter+Server.swift
@@ -274,7 +274,7 @@ extension Converter {
     }
 
     //    | server | get | request body | URLEncodedForm | codable | optional | getOptionalRequestBodyAsURLEncodedForm |
-    func getOptionalRequestBodyAsURLEncodedForm<T: Decodable, C>(
+    public func getOptionalRequestBodyAsURLEncodedForm<T: Decodable, C>(
         _ type: T.Type,
         from data: Data?,
         transforming transform: (T) -> C
diff --git a/Tests/OpenAPIRuntimeTests/Conversion/Test_Converter+Client.swift b/Tests/OpenAPIRuntimeTests/Conversion/Test_Converter+Client.swift
index 6f0e3bae..ff7bbb16 100644
--- a/Tests/OpenAPIRuntimeTests/Conversion/Test_Converter+Client.swift
+++ b/Tests/OpenAPIRuntimeTests/Conversion/Test_Converter+Client.swift
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 import XCTest
-@_spi(Generated)@testable import OpenAPIRuntime
+@_spi(Generated) import OpenAPIRuntime
 
 final class Test_ClientConverterExtensions: Test_Runtime {
 
diff --git a/Tests/OpenAPIRuntimeTests/Conversion/Test_Converter+Common.swift b/Tests/OpenAPIRuntimeTests/Conversion/Test_Converter+Common.swift
index 23c3d1bc..9e9b328f 100644
--- a/Tests/OpenAPIRuntimeTests/Conversion/Test_Converter+Common.swift
+++ b/Tests/OpenAPIRuntimeTests/Conversion/Test_Converter+Common.swift
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 import XCTest
-@_spi(Generated)@testable import OpenAPIRuntime
+@_spi(Generated) import OpenAPIRuntime
 
 final class Test_CommonConverterExtensions: Test_Runtime {
 
diff --git a/Tests/OpenAPIRuntimeTests/Conversion/Test_Converter+Server.swift b/Tests/OpenAPIRuntimeTests/Conversion/Test_Converter+Server.swift
index 70b02923..45e30173 100644
--- a/Tests/OpenAPIRuntimeTests/Conversion/Test_Converter+Server.swift
+++ b/Tests/OpenAPIRuntimeTests/Conversion/Test_Converter+Server.swift
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 import XCTest
-@_spi(Generated)@testable import OpenAPIRuntime
+@_spi(Generated) import OpenAPIRuntime
 
 final class Test_ServerConverterExtensions: Test_Runtime {
 
@@ -92,26 +92,12 @@ final class Test_ServerConverterExtensions: Test_Runtime {
                     "Unexpected error when validating string: \(contentType) against headers: \(headers)"
                 )
             } else {
-                let acceptHeader =
-                    headers
-                    .values(name: "accept")
-                    .joined(separator: ", ")
                 XCTAssertThrowsError(
                     try converter.validateAcceptIfPresent(
                         contentType,
                         in: headers
                     ),
-                    "Expected to throw error when validating string: \(contentType) against headers: \(headers)",
-                    { error in
-                        guard
-                            let err = error as? RuntimeError,
-                            case .unexpectedAcceptHeader(let string) = err
-                        else {
-                            XCTFail("Threw an unexpected error: \(error)")
-                            return
-                        }
-                        XCTAssertEqual(string, acceptHeader)
-                    }
+                    "Expected to throw error when validating string: \(contentType) against headers: \(headers)"
                 )
             }
         }