From fe4f34da83944cb5bd4451cf319fd52f1865d379 Mon Sep 17 00:00:00 2001 From: miyashi Date: Sun, 22 Mar 2020 01:50:28 +0900 Subject: [PATCH] fix test for multiline --- .../Formatter/MultilineFormatterTests.swift | 24 ++-- .../Public/DebugTests.swift | 120 ++++++++++-------- 2 files changed, 86 insertions(+), 58 deletions(-) diff --git a/Tests/SwiftPrettyPrintTests/Core/Formatter/MultilineFormatterTests.swift b/Tests/SwiftPrettyPrintTests/Core/Formatter/MultilineFormatterTests.swift index 7590551..2d6d3f9 100644 --- a/Tests/SwiftPrettyPrintTests/Core/Formatter/MultilineFormatterTests.swift +++ b/Tests/SwiftPrettyPrintTests/Core/Formatter/MultilineFormatterTests.swift @@ -107,18 +107,26 @@ class MultilineFormatterTests: XCTestCase { let fields: [(String, String)] = [ ("name", #""pochi""#), ("owner", """ - Owner(name: "Nanachi", - age: 4) + Owner( + name: "Nanachi", + age: 4 + ) """), ] + let expected = + """ + Dog( + name: "pochi", + owner: Owner( + name: "Nanachi", + age: 4 + ) + ) + """ + formatter = MultilineFormatter(option: option(indent: 2)) - assertEqualLines(formatter.objectString(typeName: "Dog", fields: fields), - """ - Dog(name: "pochi", - owner: Owner(name: "Nanachi", - age: 4)) - """) + assertEqualLines(formatter.objectString(typeName: "Dog", fields: fields), expected) } // MARK: - Helper diff --git a/Tests/SwiftPrettyPrintTests/Public/DebugTests.swift b/Tests/SwiftPrettyPrintTests/Public/DebugTests.swift index 00ddf91..c0e0869 100644 --- a/Tests/SwiftPrettyPrintTests/Public/DebugTests.swift +++ b/Tests/SwiftPrettyPrintTests/Public/DebugTests.swift @@ -96,22 +96,26 @@ class DebugTests: XCTestCase { Debug.prettyPrint(dog, to: &result) assertEqualLines(result, """ - Dog(id: "pochi", - name: "ポチ", - nickname: nil, - age: 3, - homepage: https://www.google.com/) + Dog( + id: "pochi", + name: "ポチ", + nickname: nil, + age: 3, + homepage: https://www.google.com/ + ) """ + "\n") result = "" Debug.debugPrettyPrint(dog, to: &result) assertEqualLines(result, """ - Dog(id: DogId(rawValue: "pochi"), - name: Optional("ポチ"), - nickname: nil, - age: 3, - homepage: Optional(https://www.google.com/)) + Dog( + id: DogId(rawValue: "pochi"), + name: Optional("ポチ"), + nickname: nil, + age: 3, + homepage: Optional(https://www.google.com/) + ) """ + "\n") result = "" @@ -119,16 +123,20 @@ class DebugTests: XCTestCase { assertEqualLines(result, """ [ - Dog(id: "pochi", - name: "ポチ", - nickname: nil, - age: 3, - homepage: https://www.google.com/), - Dog(id: "pochi", - name: "ポチ", - nickname: nil, - age: 3, - homepage: https://www.google.com/) + Dog( + id: "pochi", + name: "ポチ", + nickname: nil, + age: 3, + homepage: https://www.google.com/ + ), + Dog( + id: "pochi", + name: "ポチ", + nickname: nil, + age: 3, + homepage: https://www.google.com/ + ) ] """ + "\n") @@ -137,16 +145,20 @@ class DebugTests: XCTestCase { assertEqualLines(result, """ [ - Dog(id: DogId(rawValue: "pochi"), - name: Optional("ポチ"), - nickname: nil, - age: 3, - homepage: Optional(https://www.google.com/)), - Dog(id: DogId(rawValue: "pochi"), - name: Optional("ポチ"), - nickname: nil, - age: 3, - homepage: Optional(https://www.google.com/)) + Dog( + id: DogId(rawValue: "pochi"), + name: Optional("ポチ"), + nickname: nil, + age: 3, + homepage: Optional(https://www.google.com/) + ), + Dog( + id: DogId(rawValue: "pochi"), + name: Optional("ポチ"), + nickname: nil, + age: 3, + homepage: Optional(https://www.google.com/) + ) ] """ + "\n") @@ -160,16 +172,20 @@ class DebugTests: XCTestCase { assertEqualLines(result, """ [ - "dog-1": Dog(id: "pochi", - name: "ポチ", - nickname: nil, - age: 3, - homepage: https://www.google.com/), - "dog-2": Dog(id: "pochi", - name: "ポチ", - nickname: nil, - age: 3, - homepage: https://www.google.com/) + "dog-1": Dog( + id: "pochi", + name: "ポチ", + nickname: nil, + age: 3, + homepage: https://www.google.com/ + ), + "dog-2": Dog( + id: "pochi", + name: "ポチ", + nickname: nil, + age: 3, + homepage: https://www.google.com/ + ) ] """ + "\n") @@ -178,16 +194,20 @@ class DebugTests: XCTestCase { assertEqualLines(result, """ [ - "dog-1": Dog(id: DogId(rawValue: "pochi"), - name: Optional("ポチ"), - nickname: nil, - age: 3, - homepage: Optional(https://www.google.com/)), - "dog-2": Dog(id: DogId(rawValue: "pochi"), - name: Optional("ポチ"), - nickname: nil, - age: 3, - homepage: Optional(https://www.google.com/)) + "dog-1": Dog( + id: DogId(rawValue: "pochi"), + name: Optional("ポチ"), + nickname: nil, + age: 3, + homepage: Optional(https://www.google.com/) + ), + "dog-2": Dog( + id: DogId(rawValue: "pochi"), + name: Optional("ポチ"), + nickname: nil, + age: 3, + homepage: Optional(https://www.google.com/) + ) ] """ + "\n") }