use custom-dump in Tests

onvista-media · Jun 13, 2024 · aa5bf42 · aa5bf42
1 parent 295300a
commit aa5bf42
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 68 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -1,5 +1,5 @@
 {
-  "originHash" : "3fe8e27ed5eaef1937b54d6d0f1e2690f0f6014e78cc25e5b9657cba0cd97545",
+  "originHash" : "4e766abbb273cc20334bf5fbd1dbc1772d169cb913232c62e7331d7fc90f1f6d",
   "pins" : [
     {
       "identity" : "swift-argument-parser",
@@ -10,6 +10,15 @@
         "version" : "1.4.0"
       }
     },
+    {
+      "identity" : "swift-custom-dump",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-custom-dump",
+      "state" : {
+        "revision" : "f01efb26f3a192a0e88dcdb7c3c391ec2fc25d9c",
+        "version" : "1.3.0"
+      }
+    },
     {
       "identity" : "swiftlintplugin",
       "kind" : "remoteSourceControl",
@@ -18,6 +27,15 @@
         "revision" : "a0f7b12c7be228592d924f29f654ebbd924ac9c5",
         "version" : "0.55.1"
       }
+    },
+    {
+      "identity" : "xctest-dynamic-overlay",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/xctest-dynamic-overlay",
+      "state" : {
+        "revision" : "6f30bdba373bbd7fbfe241dddd732651f2fbd1e2",
+        "version" : "1.1.2"
+      }
     }
   ],
   "version" : 3

diff --git a/Package.swift b/Package.swift
@@ -12,7 +12,8 @@ let package = Package(
     dependencies: [
         // Dependencies declare other packages that this package depends on.
         .package(url: "https://github.com/apple/swift-argument-parser", from: "1.2.0"),
-        .package(url: "https://github.com/lukepistrol/SwiftLintPlugin", from: "0.2.2")
+        .package(url: "https://github.com/lukepistrol/SwiftLintPlugin", from: "0.2.2"),
+        .package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "1.3.0")
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
@@ -29,7 +30,10 @@ let package = Package(
         ),
         .testTarget(
             name: "modelgenTests",
-            dependencies: [ "modelgen" ],
+            dependencies: [ 
+                "modelgen",
+                .product(name: "CustomDump", package: "swift-custom-dump")
+            ],
             path: "Tests"
         )
     ]

diff --git a/Tests/ArrayOfArrayTest.swift b/Tests/ArrayOfArrayTest.swift
@@ -4,6 +4,7 @@
 //  Copyright © 2023 onvista media GmbH. All rights reserved.
 //
 
+import CustomDump
 import XCTest
 @testable import modelgen
 
@@ -108,7 +109,7 @@ extension ArrayItem: ParentProtocol {}
         let spec = try JSONDecoder().decode(OpenApiSpec.self, from: spec.data(using: .utf8)!)
         let generator = Generator(spec: spec)
         generator.generate(modelName: "ArrayItem", skipHeader: true)
-        print(generator.buffer)
-        XCTAssertEqual(String(generator.buffer.dropLast(1)), multiline: expectedResult)
+
+        XCTAssertNoDifference(String(generator.buffer.dropLast(1)), expectedResult)
     }
 }
diff --git a/Tests/AssertEqual+Multiline.swift b/Tests/AssertEqual+Multiline.swift
diff --git a/Tests/EnumTest.swift b/Tests/EnumTest.swift
@@ -4,6 +4,7 @@
 //  Copyright © 2023 onvista media GmbH. All rights reserved.
 //
 
+import CustomDump
 import XCTest
 @testable import modelgen
 
@@ -44,7 +45,7 @@ final class EnumTest: XCTestCase {
         let spec = try JSONDecoder().decode(OpenApiSpec.self, from: spec.data(using: .utf8)!)
         let generator = Generator(spec: spec)
         generator.generate(modelName: "Enum", skipHeader: true)
-        XCTAssertEqual(String(generator.buffer.dropLast(1)), multiline: expected)
+        XCTAssertNoDifference(String(generator.buffer.dropLast(1)), expected)
     }
 
 }
diff --git a/Tests/InheritanceTest1.swift b/Tests/InheritanceTest1.swift
@@ -4,6 +4,7 @@
 //  Copyright © 2023 onvista media GmbH. All rights reserved.
 //
 
+import CustomDump
 import XCTest
 @testable import modelgen
 
@@ -139,13 +140,13 @@ extension Dog: AnimalProtocol {}
         let spec = try JSONDecoder().decode(OpenApiSpec.self, from: spec.data(using: .utf8)!)
         let generator = Generator(spec: spec)
         generator.generate(modelName: "Animal", skipHeader: true)
-        XCTAssertEqual(String(generator.buffer.dropLast(1)), multiline: expectedBase)
+        XCTAssertNoDifference(String(generator.buffer.dropLast(1)), expectedBase)
     }
 
     func testChildClassDog() throws {
         let spec = try JSONDecoder().decode(OpenApiSpec.self, from: spec.data(using: .utf8)!)
         let generator = Generator(spec: spec)
         generator.generate(modelName: "Dog", skipHeader: true)
-        XCTAssertEqual(String(generator.buffer.dropLast(1)), multiline: expectedDog)
+        XCTAssertNoDifference(String(generator.buffer.dropLast(1)), expectedDog)
     }
 }
diff --git a/Tests/InheritanceTest2.swift b/Tests/InheritanceTest2.swift
@@ -4,6 +4,7 @@
 //  Copyright © 2023 onvista media GmbH. All rights reserved.
 //
 
+import CustomDump
 import XCTest
 @testable import modelgen
 
@@ -200,13 +201,13 @@ extension Dog: AnimalProtocol {}
         let spec = try JSONDecoder().decode(OpenApiSpec.self, from: spec.data(using: .utf8)!)
         let generator = Generator(spec: spec)
         generator.generate(modelName: "Animal", skipHeader: true)
-        XCTAssertEqual(String(generator.buffer.dropLast(1)), multiline: expectedBase)
+        XCTAssertNoDifference(String(generator.buffer.dropLast(1)), expectedBase)
     }
 
     func testChildClassDog() throws {
         let spec = try JSONDecoder().decode(OpenApiSpec.self, from: spec.data(using: .utf8)!)
         let generator = Generator(spec: spec)
         generator.generate(modelName: "Dog", skipHeader: true)
-        XCTAssertEqual(String(generator.buffer.dropLast(1)), multiline: expectedDog)
+        XCTAssertNoDifference(String(generator.buffer.dropLast(1)), expectedDog)
     }
 }
diff --git a/Tests/PODTest.swift b/Tests/PODTest.swift
@@ -4,6 +4,7 @@
 //  Copyright © 2023 onvista media GmbH. All rights reserved.
 //
 
+import CustomDump
 import XCTest
 @testable import modelgen
 
@@ -125,6 +126,6 @@ final class PODTest: XCTestCase {
         let generator = Generator(spec: spec)
         generator.generate(modelName: "POD", skipHeader: true)
         let output = String(generator.buffer.dropLast(1))
-        XCTAssertEqual(output, multiline: expected)
+        XCTAssertNoDifference(output, expected)
     }
 }
diff --git a/Tests/RequestTest.swift b/Tests/RequestTest.swift
@@ -5,6 +5,7 @@
 //  Created by Gereon Steffens on 03.05.24.
 //
 
+import CustomDump
 import XCTest
 @testable import modelgen
 
@@ -140,6 +141,6 @@ public struct GetStatusRequest {
         let generator = Generator(spec: spec)
         let req = try XCTUnwrap(spec.paths?["/status"]?["get"])
         generator.generate(path: "/status", method: "GET", request: req, skipHeader: true)
-        XCTAssertEqual(String(generator.buffer.dropLast(1)), multiline: expectedOutput)
+        XCTAssertNoDifference(String(generator.buffer.dropLast(1)), expectedOutput)
     }
 }