fix some tests

mattpolzin · Apr 6, 2024 · 7863815 · 7863815
1 parent 8d90a6d
commit 7863815
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/Sources/OpenAPIKit/ExternalLoader.swift b/Sources/OpenAPIKit/ExternalLoader.swift
@@ -26,7 +26,7 @@ public protocol ExternalLoaderContext {
     ///    but the same key for all equal objects. In practice, this probably means that any
     ///    time the same type and URL pair are passed in the same `ComponentKey` should be 
     ///    returned.
-    static func componentKey<T>(type: T.Type, at: URL) throws -> OpenAPI.ComponentKey
+    static func componentKey<T>(type: T.Type, at url: URL) throws -> OpenAPI.ComponentKey
 }
 
 public protocol ExternallyDereferenceable {

diff --git a/Tests/OpenAPIKitTests/Document/DocumentTests.swift b/Tests/OpenAPIKitTests/Document/DocumentTests.swift
@@ -1195,7 +1195,7 @@ extension DocumentTests {
                 return finished
             }
 
-            mutating func nextComponentKey<T>(type: T.Type, at url: URL, given components: OpenAPIKit.OpenAPI.Components) throws -> OpenAPIKit.OpenAPI.ComponentKey {
+            static func componentKey<T>(type: T.Type, at url: URL) throws -> OpenAPIKit.OpenAPI.ComponentKey {
                 // do anything you want here to determine what key the new component should be stored at.
                 // for the example, we will just transform the URL into a valid components key:
                 let urlString = url.pathComponents.dropFirst().joined(separator: "_").replacingOccurrences(of: ".", with: "_")
@@ -1258,8 +1258,7 @@ extension DocumentTests {
         }
        */
 
-       let context = ExampleLoaderContext()
-       try await document.externallyDereference(in: context)
+       try await document.externallyDereference(in: ExampleLoaderContext.self)
 
        // - MARK: After
        print(

diff --git a/Tests/OpenAPIKitTests/Path Item/PathItemTests.swift b/Tests/OpenAPIKitTests/Path Item/PathItemTests.swift
@@ -436,7 +436,7 @@ extension PathItemTests {
 // MARK: External Dereferencing Tests
 extension PathItemTests {
     struct MockLoad: ExternalLoaderContext {
-        func nextComponentKey<T>(type: T.Type, at url: URL, given components: OpenAPI.Components) -> OpenAPI.ComponentKey {
+        static func componentKey<T>(type: T.Type, at url: URL) -> OpenAPI.ComponentKey {
            "hello-world" 
         }
 
@@ -452,12 +452,6 @@ extension PathItemTests {
     }
 
     func test_tmp() async throws {
-        let components = OpenAPI.Components(
-           parameters: [
-               "already-internal":
-                 .init(name: "internal-param", context: .query, schema: .string),   
-           ]
-        )
         let op = OpenAPI.Operation(responses: [:])
         let pathItem = OpenAPI.PathItem(
             summary: "summary",
@@ -480,11 +474,9 @@ extension PathItemTests {
 
         print(pathItem.parameters.debugDescription)
         print("------")
-        let context = MockLoad()
-        var loader = ExternalLoader(components: components, context: context) 
-        let x = try await pathItem.externallyDereferenced(with: &loader)
+        let (x, loaderComponents) = try await pathItem.externallyDereferenced(with: MockLoad.self)
         print(x.parameters.debugDescription)
         print("=======")
-        print(loader.components.parameters)
+        print(loaderComponents.parameters)
     }
 }