Update URISerializer & Parser Tests

Author: kstefanou52

Sources/OpenAPIRuntime/URICoder/Serialization/URISerializer.swift

@@ -65,7 +65,7 @@ extension CharacterSet {
 extension URISerializer {
 
     /// A serializer error.
-    private enum SerializationError: Swift.Error {
+    enum SerializationError: Swift.Error, Equatable {
 
         /// Nested containers are not supported.
         case nestedContainersNotSupported

Tests/OpenAPIRuntimeTests/URICoder/Parsing/Test_URIParser.swift

@@ -30,7 +30,7 @@ final class Test_URIParser: Test_Runtime {
                     simpleUnexplode: .custom("", value: ["": [""]]),
                     formDataExplode: "empty=",
                     formDataUnexplode: "empty=",
-                    deepObjectExplode: "empty="
+                    deepObjectExplode: "object%5Bempty%5D="
                 ),
                 value: ["empty": [""]]
             ),
@@ -54,7 +54,7 @@ final class Test_URIParser: Test_Runtime {
                     simpleUnexplode: .custom("fred", value: ["": ["fred"]]),
                     formDataExplode: "who=fred",
                     formDataUnexplode: "who=fred",
-                    deepObjectExplode: "who=fred"
+                    deepObjectExplode: "object%5Bwho%5D=fred"
                 ),
                 value: ["who": ["fred"]]
             ),
@@ -66,7 +66,7 @@ final class Test_URIParser: Test_Runtime {
                     simpleUnexplode: .custom("Hello%20World", value: ["": ["Hello World"]]),
                     formDataExplode: "hello=Hello+World",
                     formDataUnexplode: "hello=Hello+World",
-                    deepObjectExplode: "hello=Hello%20World"
+                    deepObjectExplode: "object%5Bhello%5D=Hello%20World"
                 ),
                 value: ["hello": ["Hello World"]]
             ),
@@ -78,7 +78,7 @@ final class Test_URIParser: Test_Runtime {
                     simpleUnexplode: .custom("red,green,blue", value: ["": ["red", "green", "blue"]]),
                     formDataExplode: "list=red&list=green&list=blue",
                     formDataUnexplode: "list=red,green,blue",
-                    deepObjectExplode: "list=red&list=green&list=blue"
+                    deepObjectExplode: .custom("object%5Blist%5D=red&object%5Blist%5D=green&object%5Blist%5D=blue", value: [:])
                 ),
                 value: ["list": ["red", "green", "blue"]]
             ),
@@ -99,7 +99,7 @@ final class Test_URIParser: Test_Runtime {
                         "keys=comma,%2C,dot,.,semi,%3B",
                         value: ["keys": ["comma", ",", "dot", ".", "semi", ";"]]
                     ), 
-                    deepObjectExplode: "comma=%2C&dot=.&semi=%3B"
+                    deepObjectExplode: "keys%5Bcomma%5D=%2C&keys%5Bdot%5D=.&keys%5Bsemi%5D=%3B"
                 ),
                 value: ["semi": [";"], "dot": ["."], "comma": [","]]
             ),
@@ -123,6 +123,7 @@ final class Test_URIParser: Test_Runtime {
             try testVariant(.simpleUnexplode, variants.simpleUnexplode)
             try testVariant(.formDataExplode, variants.formDataExplode)
             try testVariant(.formDataUnexplode, variants.formDataUnexplode)
+            try testVariant(.deepObjectExplode, variants.deepObjectExplode)
         }
     }
 }

Tests/OpenAPIRuntimeTests/URICoder/Serialization/Test_URISerializer.swift

@@ -110,7 +110,10 @@ final class Test_URISerializer: Test_Runtime {
                     simpleUnexplode: "red,green,blue",
                     formDataExplode: "list=red&list=green&list=blue",
                     formDataUnexplode: "list=red,green,blue",
-                    deepObjectExplode: nil
+                    deepObjectExplode: .custom(
+                        "list=red&list=green&list=blue", 
+                        expectedError: .deepObjectsArrayNotSupported
+                    )
                 )
             ),
             makeCase(
@@ -131,26 +134,36 @@ final class Test_URISerializer: Test_Runtime {
             ),
         ]
         for testCase in cases {
-            func testVariant(_ variant: Case.Variant, _ expectedString: String) throws {
+            func testVariant(_ variant: Case.Variant, _ input: Case.Variants.Input) throws {
                 var serializer = URISerializer(configuration: variant.config)
-                let encodedString = try serializer.serializeNode(testCase.value, forKey: testCase.key)
-                XCTAssertEqual(
-                    encodedString,
-                    expectedString,
-                    "Failed for config: \(variant.name)",
-                    file: testCase.file,
-                    line: testCase.line
-                )
+                do {
+                    let encodedString = try serializer.serializeNode(testCase.value, forKey: testCase.key)
+                    XCTAssertEqual(
+                        encodedString,
+                        input.string,
+                        "Failed for config: \(variant.name)",
+                        file: testCase.file,
+                        line: testCase.line
+                    )
+                } catch {
+                    guard let expectedError = input.expectedError,
+                          let serializationError = error as? URISerializer.SerializationError else { throw error }
+                    XCTAssertEqual(
+                        expectedError,
+                        serializationError,
+                        "Failed for config: \(variant.name)",
+                        file: testCase.file,
+                        line: testCase.line
+                    )
+                }
             }
             try testVariant(.formExplode, testCase.variants.formExplode)
             try testVariant(.formUnexplode, testCase.variants.formUnexplode)
             try testVariant(.simpleExplode, testCase.variants.simpleExplode)
             try testVariant(.simpleUnexplode, testCase.variants.simpleUnexplode)
             try testVariant(.formDataExplode, testCase.variants.formDataExplode)
             try testVariant(.formDataUnexplode, testCase.variants.formDataUnexplode)
-            if let deepObjectExplode = testCase.variants.deepObjectExplode {
-                try testVariant(.deepObjectExplode, deepObjectExplode)
-            }
+            try testVariant(.deepObjectExplode, testCase.variants.deepObjectExplode)
         }
     }
 }
@@ -170,13 +183,33 @@ extension Test_URISerializer {
             static let deepObjectExplode: Self = .init(name: "deepObjectExplode", config: .deepObjectExplode)
         }
         struct Variants {
-            var formExplode: String
-            var formUnexplode: String
-            var simpleExplode: String
-            var simpleUnexplode: String
-            var formDataExplode: String
-            var formDataUnexplode: String
-            var deepObjectExplode: String?
+            
+            struct Input: ExpressibleByStringLiteral {
+                var string: String
+                var expectedError: URISerializer.SerializationError?
+                
+                init(string: String, expectedError: URISerializer.SerializationError? = nil) {
+                    self.string = string
+                    self.expectedError = expectedError
+                }
+                
+                static func custom(_ string: String, expectedError: URISerializer.SerializationError) -> Self {
+                    .init(string: string, expectedError: expectedError)
+                }
+                
+                init(stringLiteral value: String) {
+                    self.string = value
+                    self.expectedError = nil
+                }
+            }
+            
+            var formExplode: Input
+            var formUnexplode: Input
+            var simpleExplode: Input
+            var simpleUnexplode: Input
+            var formDataExplode: Input
+            var formDataUnexplode: Input
+            var deepObjectExplode: Input
         }
         var value: URIEncodedNode
         var key: String