strip spaces from JSON for Linux testing

mattpolzin · Jan 16, 2020 · 2360974 · 2360974
1 parent 2dbac83
commit 2360974
Show file tree

Hide file tree

Showing 16 changed files with 91 additions and 69 deletions.
diff --git a/Tests/OpenAPIKitTests/ContentTests.swift b/Tests/OpenAPIKitTests/ContentTests.swift
@@ -97,7 +97,7 @@ extension ContentTests {
         let content = OpenAPI.Content(schema: .init(.external("hello.json#/world")))
         let encodedContent = try! testStringFromEncoding(of: content)
 
-        XCTAssertEqual(encodedContent,
+        assertJSONEquivalent(encodedContent,
 """
 {
   "schema" : {
@@ -126,7 +126,7 @@ extension ContentTests {
         let content = OpenAPI.Content(schema: .init(.string))
         let encodedContent = try! testStringFromEncoding(of: content)
 
-        XCTAssertEqual(encodedContent,
+        assertJSONEquivalent(encodedContent,
 """
 {
   "schema" : {
@@ -156,7 +156,7 @@ extension ContentTests {
                                       example: [ "hello": "world" ])
         let encodedContent = try! testStringFromEncoding(of: content)
 
-        XCTAssertEqual(encodedContent,
+        assertJSONEquivalent(encodedContent,
 """
 {
   "example" : {
@@ -210,7 +210,7 @@ extension ContentTests {
                                       examples: ["hello": .b(OpenAPI.Example(value: .init([ "hello": "world" ])))])
         let encodedContent = try! testStringFromEncoding(of: content)
 
-        XCTAssertEqual(encodedContent,
+        assertJSONEquivalent(encodedContent,
 """
 {
   "examples" : {
@@ -303,7 +303,7 @@ extension ContentTests {
                                       encoding: ["json": .init(contentType: .json)])
         let encodedContent = try! testStringFromEncoding(of: content)
 
-        XCTAssertEqual(encodedContent,
+        assertJSONEquivalent(encodedContent,
 """
 {
   "encoding" : {
@@ -346,7 +346,7 @@ extension ContentTests {
 
         let encodedContent = try! testStringFromEncoding(of: content)
 
-        XCTAssertEqual(encodedContent,
+        assertJSONEquivalent(encodedContent,
 """
 {
   "schema" : {
@@ -366,7 +366,7 @@ extension ContentTests {
 
         let encodedContent = try! testStringFromEncoding(of: content)
 
-        XCTAssertEqual(encodedContent,
+        assertJSONEquivalent(encodedContent,
 """
 {
   "schema" : {
@@ -449,7 +449,7 @@ extension ContentTests {
 
         let encodedEncoding = try! testStringFromEncoding(of: encoding)
 
-        XCTAssertEqual(encodedEncoding,
+        assertJSONEquivalent(encodedEncoding,
 """
 {
 
@@ -473,7 +473,7 @@ extension ContentTests {
 
         let encodedEncoding = try! testStringFromEncoding(of: encoding)
 
-        XCTAssertEqual(encodedEncoding,
+        assertJSONEquivalent(encodedEncoding,
 """
 {
   "contentType" : "text\\/csv"
@@ -501,7 +501,7 @@ extension ContentTests {
 
         let encodedEncoding = try! testStringFromEncoding(of: encoding)
 
-        XCTAssertEqual(encodedEncoding,
+        assertJSONEquivalent(encodedEncoding,
 """
 {
   "headers" : {
@@ -544,7 +544,7 @@ extension ContentTests {
 
         let encodedEncoding = try! testStringFromEncoding(of: encoding)
 
-        XCTAssertEqual(encodedEncoding,
+        assertJSONEquivalent(encodedEncoding,
 """
 {
   "style" : "pipeDelimited"
@@ -573,7 +573,7 @@ extension ContentTests {
 
         let encodedEncoding = try! testStringFromEncoding(of: encoding)
 
-        XCTAssertEqual(encodedEncoding,
+        assertJSONEquivalent(encodedEncoding,
 """
 {
   "explode" : false
@@ -602,7 +602,7 @@ extension ContentTests {
 
         let encodedEncoding = try! testStringFromEncoding(of: encoding)
 
-        XCTAssertEqual(encodedEncoding,
+        assertJSONEquivalent(encodedEncoding,
 """
 {
   "allowReserved" : true

diff --git a/Tests/OpenAPIKitTests/DiscriminatorTests.swift b/Tests/OpenAPIKitTests/DiscriminatorTests.swift
@@ -28,7 +28,7 @@ extension DiscriminatorTests {
         let discriminator = OpenAPI.Discriminator(propertyName: "hello")
         let encodedDiscriminator = try! testStringFromEncoding(of: discriminator)
 
-        XCTAssertEqual(encodedDiscriminator,
+        assertJSONEquivalent(encodedDiscriminator,
 """
 {
   "propertyName" : "hello"
@@ -54,7 +54,7 @@ extension DiscriminatorTests {
                                                   mapping: ["hello": "world"])
         let encodedDiscriminator = try! testStringFromEncoding(of: discriminator)
 
-        XCTAssertEqual(encodedDiscriminator,
+        assertJSONEquivalent(encodedDiscriminator,
 """
 {
   "mapping" : {

diff --git a/Tests/OpenAPIKitTests/DocumentInfoTests.swift b/Tests/OpenAPIKitTests/DocumentInfoTests.swift
@@ -40,7 +40,7 @@ extension DocumentInfoTests {
 
         let encodedLicense = try testStringFromEncoding(of: license)
 
-        XCTAssertEqual(encodedLicense,
+        assertJSONEquivalent(encodedLicense,
 """
 {
   "name" : "MIT"
@@ -69,7 +69,7 @@ extension DocumentInfoTests {
 
         let encodedLicense = try testStringFromEncoding(of: license)
 
-        XCTAssertEqual(encodedLicense,
+        assertJSONEquivalent(encodedLicense,
 """
 {
   "name" : "MIT",
@@ -100,7 +100,7 @@ extension DocumentInfoTests {
 
         let encodedContact = try testStringFromEncoding(of: contact)
 
-        XCTAssertEqual(encodedContact,
+        assertJSONEquivalent(encodedContact,
 """
 {
   "name" : "contact"
@@ -129,7 +129,7 @@ extension DocumentInfoTests {
 
         let encodedContact = try testStringFromEncoding(of: contact)
 
-        XCTAssertEqual(encodedContact,
+        assertJSONEquivalent(encodedContact,
 """
 {
   "url" : "http:\\/\\/google.com"
@@ -158,7 +158,7 @@ extension DocumentInfoTests {
 
         let encodedContact = try testStringFromEncoding(of: contact)
 
-        XCTAssertEqual(encodedContact,
+        assertJSONEquivalent(encodedContact,
 """
 {
   "email" : "email"
@@ -187,7 +187,7 @@ extension DocumentInfoTests {
 
         let encodedInfo = try testStringFromEncoding(of: info)
 
-        XCTAssertEqual(encodedInfo,
+        assertJSONEquivalent(encodedInfo,
 """
 {
   "title" : "title",
@@ -222,7 +222,7 @@ extension DocumentInfoTests {
 
         let encodedInfo = try testStringFromEncoding(of: info)
 
-        XCTAssertEqual(encodedInfo,
+        assertJSONEquivalent(encodedInfo,
 """
 {
   "description" : "description",
@@ -263,7 +263,7 @@ extension DocumentInfoTests {
 
         let encodedInfo = try testStringFromEncoding(of: info)
 
-        XCTAssertEqual(encodedInfo,
+        assertJSONEquivalent(encodedInfo,
 """
 {
   "termsOfService" : "http:\\/\\/google.com",
@@ -304,7 +304,7 @@ extension DocumentInfoTests {
 
         let encodedInfo = try testStringFromEncoding(of: info)
 
-        XCTAssertEqual(encodedInfo,
+        assertJSONEquivalent(encodedInfo,
                        """
 {
   "contact" : {
@@ -349,7 +349,7 @@ extension DocumentInfoTests {
 
         let encodedInfo = try testStringFromEncoding(of: info)
 
-        XCTAssertEqual(encodedInfo,
+        assertJSONEquivalent(encodedInfo,
 """
 {
   "license" : {

diff --git a/Tests/OpenAPIKitTests/DocumentTests.swift b/Tests/OpenAPIKitTests/DocumentTests.swift
@@ -69,7 +69,7 @@ final class DocumentTests: XCTestCase {
                     XCTFail("Expected data corrupted decoding error")
                     return
             }
-            XCTAssertEqual(context.debugDescription, "Each key found in a Security Requirement dictionary must refer to a Security Scheme present in the Components dictionary.")
+            assertJSONEquivalent(context.debugDescription, "Each key found in a Security Requirement dictionary must refer to a Security Scheme present in the Components dictionary.")
         }
     }
 }
@@ -86,7 +86,7 @@ extension DocumentTests {
         )
         let encodedDocument = try testStringFromEncoding(of: document)
 
-        XCTAssertEqual(
+        assertJSONEquivalent(
             encodedDocument,
 """
 {

diff --git a/Tests/OpenAPIKitTests/ExampleTests.swift b/Tests/OpenAPIKitTests/ExampleTests.swift
@@ -46,7 +46,7 @@ extension ExampleTests {
                                       value: .init(URL(string: "https://google.com")!))
         let encodedExample = try! testStringFromEncoding(of: example)
 
-        XCTAssertEqual(encodedExample,
+        assertJSONEquivalent(encodedExample,
 """
 {
   "externalValue" : "https:\\/\\/google.com",
@@ -75,7 +75,7 @@ extension ExampleTests {
                                       value: .init("world"))
         let encodedExample = try! testStringFromEncoding(of: example)
 
-        XCTAssertEqual(encodedExample,
+        assertJSONEquivalent(encodedExample,
 """
 {
   "description" : "hello",
@@ -104,7 +104,7 @@ extension ExampleTests {
                                       vendorExtensions: ["x-hello": 10])
         let encodedExample = try! testStringFromEncoding(of: example)
 
-        XCTAssertEqual(encodedExample,
+        assertJSONEquivalent(encodedExample,
                        """
 {
   "value" : "world",
@@ -132,7 +132,7 @@ extension ExampleTests {
         let example = OpenAPI.Example(value: .init("world"))
         let encodedExample = try! testStringFromEncoding(of: example)
 
-        XCTAssertEqual(encodedExample,
+        assertJSONEquivalent(encodedExample,
                        """
 {
   "value" : "world"
@@ -157,7 +157,7 @@ extension ExampleTests {
         let example = OpenAPI.Example(value: .init(URL(string: "https://google.com")!))
         let encodedExample = try! testStringFromEncoding(of: example)
 
-        XCTAssertEqual(encodedExample,
+        assertJSONEquivalent(encodedExample,
 """
 {
   "externalValue" : "https:\\/\\/google.com"

diff --git a/Tests/OpenAPIKitTests/ExternalDocTests.swift b/Tests/OpenAPIKitTests/ExternalDocTests.swift
@@ -27,7 +27,7 @@ extension ExternalDocTests {
 
         let encodedExternalDoc = try! testStringFromEncoding(of: externalDoc)
 
-        XCTAssertEqual(encodedExternalDoc,
+        assertJSONEquivalent(encodedExternalDoc,
 """
 {
   "description" : "hello world",
@@ -56,7 +56,7 @@ extension ExternalDocTests {
 
         let encodedExternalDoc = try! testStringFromEncoding(of: externalDoc)
 
-        XCTAssertEqual(encodedExternalDoc,
+        assertJSONEquivalent(encodedExternalDoc,
 """
 {
   "url" : "http:\\/\\/google.com"

diff --git a/Tests/OpenAPIKitTests/HeaderTests.swift b/Tests/OpenAPIKitTests/HeaderTests.swift
@@ -52,7 +52,7 @@ extension HeaderTests {
 
         let headerEncoding = try testStringFromEncoding(of: header)
 
-        XCTAssertEqual(headerEncoding,
+        assertJSONEquivalent(headerEncoding,
 """
 {
   "content" : {
@@ -95,7 +95,7 @@ extension HeaderTests {
 
         let headerEncoding = try testStringFromEncoding(of: header)
 
-        XCTAssertEqual(headerEncoding,
+        assertJSONEquivalent(headerEncoding,
 """
 {
   "schema" : {
@@ -133,7 +133,7 @@ extension HeaderTests {
 
         let headerEncoding = try testStringFromEncoding(of: header)
 
-        XCTAssertEqual(headerEncoding,
+        assertJSONEquivalent(headerEncoding,
 """
 {
   "content" : {
@@ -186,7 +186,7 @@ extension HeaderTests {
 
         let headerEncoding = try testStringFromEncoding(of: header)
 
-        XCTAssertEqual(headerEncoding,
+        assertJSONEquivalent(headerEncoding,
 """
 {
   "content" : {
@@ -239,7 +239,7 @@ extension HeaderTests {
 
         let headerEncoding = try testStringFromEncoding(of: header)
 
-        XCTAssertEqual(headerEncoding,
+        assertJSONEquivalent(headerEncoding,
 """
 {
   "content" : {