diff --git a/Sources/TextBuilder/TextBuilder.swift b/Sources/TextBuilder/TextBuilder.swift index 9fbf864..834cb39 100644 --- a/Sources/TextBuilder/TextBuilder.swift +++ b/Sources/TextBuilder/TextBuilder.swift @@ -41,7 +41,7 @@ public struct TextBuilderWith { } public static func buildArray(_ components: [Text?]) -> Text? { - components.lazy.compactMap { $0 }.joined(separator: Separator.separator.map(Text.init)) + components.lazy.compactMap { $0 }.joined(separator: Separator.separator.map { Text($0) }) } @inlinable diff --git a/Tests/TextBuilderTests/TextBuilderTests.swift b/Tests/TextBuilderTests/TextBuilderTests.swift index 7fd3275..24b9613 100644 --- a/Tests/TextBuilderTests/TextBuilderTests.swift +++ b/Tests/TextBuilderTests/TextBuilderTests.swift @@ -5,7 +5,7 @@ import XCTest final class TextBuilderTests: XCTestCase { func testBasicTextBuilder() { - XCTAssertNoDifference( + expectNoDifference( basicTextBuilderText(), Text("Lorem").underline().foregroundColor(.blue) + Text("ipsum dolor") + @@ -15,7 +15,7 @@ final class TextBuilderTests: XCTestCase { } func testSpacedTextBuilder() { - XCTAssertNoDifference( + expectNoDifference( spacedTextBuilderText(), Text("Lorem").underline().foregroundColor(.blue) + Text(verbatim: " ") + @@ -28,7 +28,7 @@ final class TextBuilderTests: XCTestCase { } func testMultilineTextBuilder() { - XCTAssertNoDifference( + expectNoDifference( multilineTextBuilderText(), Text("Lorem").underline().foregroundColor(.blue) + Text(verbatim: "\n") + @@ -41,7 +41,7 @@ final class TextBuilderTests: XCTestCase { } func testCustomTextBuilder() { - XCTAssertNoDifference( + expectNoDifference( customTextBuilderText(), Text("Lorem").underline().foregroundColor(.blue) + Text(verbatim: " 🍆 ") + @@ -54,7 +54,7 @@ final class TextBuilderTests: XCTestCase { } func testComplexTextBuilder() { - XCTAssertNoDifference( + expectNoDifference( complexTextBuilderText(), Text(verbatim: "Lorem").underline().foregroundColor(.blue) + Text(verbatim: " ") + diff --git a/Tests/TextBuilderTests/TextExtensionsTests.swift b/Tests/TextBuilderTests/TextExtensionsTests.swift index 822b9d1..e64a3e0 100644 --- a/Tests/TextBuilderTests/TextExtensionsTests.swift +++ b/Tests/TextBuilderTests/TextExtensionsTests.swift @@ -5,7 +5,7 @@ import XCTest final class TextExtensionsTests: XCTestCase { func testJoined_noSeparator() { - XCTAssertNoDifference( + expectNoDifference( textArray.joined(), Text("Lorem").underline().foregroundColor(.blue) + Text("ipsum dolor") + @@ -15,7 +15,7 @@ final class TextExtensionsTests: XCTestCase { } func testJoined_spaceSeparator() { - XCTAssertNoDifference( + expectNoDifference( textArray.joined(separator: Text(" ")), Text("Lorem").underline().foregroundColor(.blue) + Text(" ") + @@ -28,7 +28,7 @@ final class TextExtensionsTests: XCTestCase { } func testJoined_formattedSeparator() { - XCTAssertNoDifference( + expectNoDifference( textArray.joined(separator: Text(" ** ").italic().foregroundColor(.green)), Text("Lorem").underline().foregroundColor(.blue) + Text(" ** ").italic().foregroundColor(.green) + @@ -41,14 +41,14 @@ final class TextExtensionsTests: XCTestCase { } func testInit_noSeparator() { - XCTAssertNoDifference( + expectNoDifference( Text(content: textArrayBuilderText), Text("Lorem").underline().foregroundColor(.blue) + Text("ipsum dolor") + Text("sit").bold() + Text("amet, consectetur") ) - XCTAssertNoDifference( + expectNoDifference( Text(separator: nil, content: textArrayBuilderText), Text("Lorem").underline().foregroundColor(.blue) + Text("ipsum dolor") + @@ -58,7 +58,7 @@ final class TextExtensionsTests: XCTestCase { } func testInit_blankSeparator() { - XCTAssertNoDifference( + expectNoDifference( Text(separator: Text(""), content: textArrayBuilderText), Text("Lorem").underline().foregroundColor(.blue) + Text("") + @@ -68,7 +68,7 @@ final class TextExtensionsTests: XCTestCase { Text("") + Text("amet, consectetur") ) - XCTAssertNoDifference( + expectNoDifference( Text(separator: "", content: textArrayBuilderText), Text("Lorem").underline().foregroundColor(.blue) + Text(verbatim: "") + @@ -81,7 +81,7 @@ final class TextExtensionsTests: XCTestCase { } func testInit_spaceSeparator() { - XCTAssertNoDifference( + expectNoDifference( Text(separator: Text(" "), content: textArrayBuilderText), Text("Lorem").underline().foregroundColor(.blue) + Text(" ") + @@ -91,7 +91,7 @@ final class TextExtensionsTests: XCTestCase { Text(" ") + Text("amet, consectetur") ) - XCTAssertNoDifference( + expectNoDifference( Text(separator: " ", content: textArrayBuilderText), Text("Lorem").underline().foregroundColor(.blue) + Text(verbatim: " ") + @@ -104,7 +104,7 @@ final class TextExtensionsTests: XCTestCase { } func testInit_newlineSeparator() { - XCTAssertNoDifference( + expectNoDifference( Text(separator: Text("\n"), content: textArrayBuilderText), Text("Lorem").underline().foregroundColor(.blue) + Text("\n") + @@ -114,7 +114,7 @@ final class TextExtensionsTests: XCTestCase { Text("\n") + Text("amet, consectetur") ) - XCTAssertNoDifference( + expectNoDifference( Text(separator: "\n", content: textArrayBuilderText), Text("Lorem").underline().foregroundColor(.blue) + Text(verbatim: "\n") +