From 7a5026269000ab04fd9ad61f65e96d7baad5397c Mon Sep 17 00:00:00 2001 From: Shai Mishali Date: Tue, 13 Aug 2024 14:17:16 +0300 Subject: [PATCH] expectDifference/expectNoDifference rename cleanups While upgrading I noticed some of the docs / existing tests still use the old naming, so took a few moments to update. --- Sources/CustomDump/Diff.swift | 2 +- .../Documentation.docc/CustomDump.md | 18 +- Sources/CustomDump/ExpectNoDifference.swift | 6 +- .../Conformances/FoundationTests.swift | 76 ++++---- .../Conformances/SwiftTests.swift | 10 +- Tests/CustomDumpTests/DiffTests.swift | 118 ++++++------ Tests/CustomDumpTests/DumpTests.swift | 178 +++++++++--------- ...ests.swift => ExpectDifferenceTests.swift} | 14 +- ...ce.swift => ExpectNoDifferenceTests.swift} | 22 ++- .../XCTAssertNoDifferenceTests.swift | 17 -- 10 files changed, 230 insertions(+), 231 deletions(-) rename Tests/CustomDumpTests/{XCTAssertDifferenceTests.swift => ExpectDifferenceTests.swift} (74%) rename Tests/CustomDumpTests/{ExpectNoDifference.swift => ExpectNoDifferenceTests.swift} (67%) delete mode 100644 Tests/CustomDumpTests/XCTAssertNoDifferenceTests.swift diff --git a/Sources/CustomDump/Diff.swift b/Sources/CustomDump/Diff.swift index ab375020..3c21a8b2 100644 --- a/Sources/CustomDump/Diff.swift +++ b/Sources/CustomDump/Diff.swift @@ -3,7 +3,7 @@ /// /// This can be a great tool to use for building debug tools for applications and libraries. For /// example, this library uses ``diff(_:_:format:)`` to implement -/// ``XCTAssertNoDifference(_:_:_:file:line:)``, which asserts that two values are equal, and +/// ``expectNoDifference(_:_:_:file:line:)``, which asserts that two values are equal, and /// if they are not the failure message is a nicely formatted diff showing exactly what part of the /// values are not equal. /// diff --git a/Sources/CustomDump/Documentation.docc/CustomDump.md b/Sources/CustomDump/Documentation.docc/CustomDump.md index 79ba292a..c5a7375a 100644 --- a/Sources/CustomDump/Documentation.docc/CustomDump.md +++ b/Sources/CustomDump/Documentation.docc/CustomDump.md @@ -245,7 +245,7 @@ application to print the before and after state when favoriting a landmark:   ] ``` -### XCTAssertNoDifference +### expectNoDifference The `XCTAssertEqual` function from `XCTest` allows you to assert that two values are equal, and if they are not the test suite will fail with a message: @@ -265,15 +265,15 @@ few moments of hunting through the message to see that the only difference is th at the end of the name. The problem gets worse if the type is more complex, consisting of nested structures and large collections. -This library also ships with an ``XCTAssertNoDifference(_:_:_:file:line:)`` function to mitigate +This library also ships with an ``expectNoDifference(_:_:_:file:line:)`` function to mitigate these problems. It works like `XCTAssertEqual` except the failure message uses a nicely formatted diff to show exactly what is different between the two values: ```swift -XCTAssertNoDifference(user, other) +expectNoDifference(user, other) ``` ```diff -XCTAssertNoDifference failed: … +expectNoDifference failed: …   User(   favoriteNumbers: […], @@ -285,10 +285,10 @@ XCTAssertNoDifference failed: … (First: -, Second: +) ``` -### XCTAssertDifference +### expectDifference -``XCTAssertDifference(_:_:operation:changes:file:line:)-8xfxw`` provides the inverse of -`XCTAssertNoDifference`: it asserts that a value has a set of changes by evaluating a given +``expectDifference(_:_:operation:changes:file:line:)-8xfxw`` provides the inverse of +`expectNoDifference`: it asserts that a value has a set of changes by evaluating a given expression before and after a given operation and then comparing the results. For example, given a very simple counter structure, we can write a test against its incrementing @@ -305,7 +305,7 @@ struct Counter { } var counter = Counter() -XCTAssertDifference(counter) { +expectDifference(counter) { counter.increment() } changes: { $0.count = 1 @@ -320,7 +320,7 @@ just the fields you want to assert against in the `changes` closure: ```swift counter.increment() -XCTAssertDifference(counter) { +expectDifference(counter) { $0.count = 1 // Don't need to further describe how `isOdd` has changed } diff --git a/Sources/CustomDump/ExpectNoDifference.swift b/Sources/CustomDump/ExpectNoDifference.swift index 38f78027..d3e2d72f 100644 --- a/Sources/CustomDump/ExpectNoDifference.swift +++ b/Sources/CustomDump/ExpectNoDifference.swift @@ -13,14 +13,14 @@ import IssueReporting /// XCTAssertEqual failed: ("User(id: 42, name: "Blob")") is not equal to ("User(id: 42, name: "Blob, Esq.")") /// ``` /// -/// `XCTAssertNoDifference` uses the output of ``diff(_:_:format:)`` to display a failure message, +/// `expectNoDifference` uses the output of ``diff(_:_:format:)`` to display a failure message, /// which helps highlight the differences between the given values: /// /// ```swift -/// XCTAssertNoDifference(user1, user2) +/// expectNoDifference(user1, user2) /// ``` /// ```text -/// XCTAssertNoDifference failed: … +/// expectNoDifference failed: … /// /// User( /// id: 42, diff --git a/Tests/CustomDumpTests/Conformances/FoundationTests.swift b/Tests/CustomDumpTests/Conformances/FoundationTests.swift index fb88a9db..77a6cdba 100644 --- a/Tests/CustomDumpTests/Conformances/FoundationTests.swift +++ b/Tests/CustomDumpTests/Conformances/FoundationTests.swift @@ -15,7 +15,7 @@ final class FoundationTests: XCTestCase { try? AttributedString(markdown: "Hello, **Blob**!"), to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ "Hello, Blob!" @@ -33,7 +33,7 @@ final class FoundationTests: XCTestCase { 42 as CFNumber, to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ 42 @@ -49,7 +49,7 @@ final class FoundationTests: XCTestCase { Date(timeIntervalSince1970: 0), to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ Date(1970-01-01T00:00:00.000Z) @@ -62,7 +62,7 @@ final class FoundationTests: XCTestCase { NestedDate(date: Date(timeIntervalSince1970: 0)), to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ NestedDate(date: Date(1970-01-01T00:00:00.000Z)) @@ -78,7 +78,7 @@ final class FoundationTests: XCTestCase { Decimal(string: "1.23"), to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ 1.23 @@ -92,7 +92,7 @@ final class FoundationTests: XCTestCase { [1, 2, 3] as NSArray, to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ [ @@ -116,7 +116,7 @@ final class FoundationTests: XCTestCase { attributedString, to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ "Hello, Blob!" @@ -132,7 +132,7 @@ final class FoundationTests: XCTestCase { calendar, to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ Calendar( @@ -157,7 +157,7 @@ final class FoundationTests: XCTestCase { NSCountedSet(array: [1, 2, 2, 3, 3, 3]), to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ Set([ @@ -176,7 +176,7 @@ final class FoundationTests: XCTestCase { NSData(data: .init(repeating: 0, count: 4)), to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ Data(4 bytes) @@ -192,7 +192,7 @@ final class FoundationTests: XCTestCase { NSDate(timeIntervalSince1970: 0), to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ Date(1970-01-01T00:00:00.000Z) @@ -207,7 +207,7 @@ final class FoundationTests: XCTestCase { [1: "1", 2: "2", 3: "3"] as NSDictionary, to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ [ @@ -231,7 +231,7 @@ final class FoundationTests: XCTestCase { ), to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ NSError( @@ -245,7 +245,7 @@ final class FoundationTests: XCTestCase { ) #if !os(Windows) && !os(WASI) - class SubclassedError: NSError {} + class SubclassedError: NSError, @unchecked Sendable {} dump = "" customDump( @@ -258,7 +258,7 @@ final class FoundationTests: XCTestCase { ), to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ NSError( @@ -279,7 +279,7 @@ final class FoundationTests: XCTestCase { dump = "" customDump(BridgedError.thisIsFine(94) as NSError, to: &dump) #if os(iOS) || os(macOS) || os(tvOS) || os(watchOS) - XCTAssertNoDifference( + expectNoDifference( dump, """ FoundationTests.BridgedError.thisIsFine(94) @@ -287,7 +287,7 @@ final class FoundationTests: XCTestCase { ) #elseif compiler(>=5.4) // Can't unwrap bridged Errors on Linux: https://bugs.swift.org/browse/SR-15191 - XCTAssertNoDifference( + expectNoDifference( dump.replacingOccurrences( of: #"\(unknown context at \$[[:xdigit:]]+\)\."#, with: "", @@ -312,7 +312,7 @@ final class FoundationTests: XCTestCase { NSException(name: .genericException, reason: "Oops!", userInfo: nil), to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ NSException( @@ -333,7 +333,7 @@ final class FoundationTests: XCTestCase { NSExpression(format: "1 + 1"), to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ 1 + 1 @@ -348,7 +348,7 @@ final class FoundationTests: XCTestCase { NSIndexPath(), to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ [] @@ -362,7 +362,7 @@ final class FoundationTests: XCTestCase { NSIndexSet(indexSet: [1, 2, 3, 5, 7]), to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ IndexSet( @@ -382,7 +382,7 @@ final class FoundationTests: XCTestCase { NSLocale(localeIdentifier: "en_US"), to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ Locale(en_US) @@ -396,7 +396,7 @@ final class FoundationTests: XCTestCase { NSMeasurement(doubleValue: 42, unit: Unit(symbol: "kg")), to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ Measurement( @@ -414,7 +414,7 @@ final class FoundationTests: XCTestCase { NSNotification(name: .init(rawValue: "co.pointfree"), object: nil, userInfo: nil), to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ Notification(name: "co.pointfree") @@ -429,7 +429,7 @@ final class FoundationTests: XCTestCase { NSNull(), to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ NSNull() @@ -443,7 +443,7 @@ final class FoundationTests: XCTestCase { 1 as NSNumber, to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ 1 @@ -456,7 +456,7 @@ final class FoundationTests: XCTestCase { NSNumber(), to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ (null pointer) @@ -471,7 +471,7 @@ final class FoundationTests: XCTestCase { [1, 2, 3] as NSOrderedSet, to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ [ @@ -489,7 +489,7 @@ final class FoundationTests: XCTestCase { NSRange(0..<1), to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ 0..<1 @@ -503,7 +503,7 @@ final class FoundationTests: XCTestCase { NSSet(array: [1, 2, 3]), to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ Set([ @@ -522,7 +522,7 @@ final class FoundationTests: XCTestCase { NSTimeZone(forSecondsFromGMT: 0), to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ TimeZone( @@ -543,14 +543,14 @@ final class FoundationTests: XCTestCase { to: &dump ) #if os(Windows) || os(WASI) - XCTAssertNoDifference( + expectNoDifference( dump, """ URL(file:///tmp) """ ) #else - XCTAssertNoDifference( + expectNoDifference( dump, """ URL(file:///tmp/) @@ -565,7 +565,7 @@ final class FoundationTests: XCTestCase { NSURLComponents(string: "https://www.pointfree.co/login?redirect=episodes"), to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ URLComponents( @@ -589,7 +589,7 @@ final class FoundationTests: XCTestCase { NSURLQueryItem(name: "search", value: "composable architecture"), to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ URLQueryItem( @@ -610,7 +610,7 @@ final class FoundationTests: XCTestCase { request, to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ URLRequest( @@ -640,7 +640,7 @@ final class FoundationTests: XCTestCase { NSUUID(uuidString: "deadbeef-dead-beef-dead-beefdeadbeef"), to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ UUID(DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF) @@ -654,7 +654,7 @@ final class FoundationTests: XCTestCase { URL(string: "https://www.pointfree.co/"), to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ URL(https://www.pointfree.co/) diff --git a/Tests/CustomDumpTests/Conformances/SwiftTests.swift b/Tests/CustomDumpTests/Conformances/SwiftTests.swift index 3a052e58..80f66842 100644 --- a/Tests/CustomDumpTests/Conformances/SwiftTests.swift +++ b/Tests/CustomDumpTests/Conformances/SwiftTests.swift @@ -9,7 +9,7 @@ final class SwiftTests: XCTestCase { character, to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ "a" @@ -26,7 +26,7 @@ final class SwiftTests: XCTestCase { objectIdentifier, to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump.replacingOccurrences( of: ":?\\s*0x[\\da-f]+(\\s*)", with: "$1", options: .regularExpression), """ @@ -42,7 +42,7 @@ final class SwiftTests: XCTestCase { string, to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ "hello world!" @@ -57,7 +57,7 @@ final class SwiftTests: XCTestCase { scalar, to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ "a" @@ -72,7 +72,7 @@ final class SwiftTests: XCTestCase { user, to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ HashableUser( diff --git a/Tests/CustomDumpTests/DiffTests.swift b/Tests/CustomDumpTests/DiffTests.swift index 5f531105..18e2e0ce 100644 --- a/Tests/CustomDumpTests/DiffTests.swift +++ b/Tests/CustomDumpTests/DiffTests.swift @@ -12,7 +12,7 @@ final class DiffTests: XCTestCase { nil ) - XCTAssertNoDifference( + expectNoDifference( diff( (1, (2, 3)) as Any, "Blob" @@ -31,7 +31,7 @@ final class DiffTests: XCTestCase { } func testAnyType() { - XCTAssertNoDifference( + expectNoDifference( diff( Foo.Bar.self as Any.Type, Foo.self @@ -44,7 +44,7 @@ final class DiffTests: XCTestCase { } func testClass() { - XCTAssertNoDifference( + expectNoDifference( diff( UserClass( id: 42, @@ -67,7 +67,7 @@ final class DiffTests: XCTestCase { """ ) - XCTAssertNoDifference( + expectNoDifference( diff( NSObject(), NSObject() @@ -78,7 +78,7 @@ final class DiffTests: XCTestCase { """ ) - XCTAssertNoDifference( + expectNoDifference( diff( RepeatedObject(id: "a"), RepeatedObject(id: "b") @@ -115,7 +115,7 @@ final class DiffTests: XCTestCase { struct Three { let u1: User, u2: User, u3: User } - XCTAssertNoDifference( + expectNoDifference( diff( Three(u1: u1, u2: u2, u3: u2), Three(u1: u1, u2: u2, u3: u3) @@ -133,7 +133,7 @@ final class DiffTests: XCTestCase { """ ) - XCTAssertNoDifference( + expectNoDifference( diff( [u1, u2, u2], [u1, u2, u3] @@ -155,7 +155,7 @@ final class DiffTests: XCTestCase { } func testCollection() { - XCTAssertNoDifference( + expectNoDifference( diff( [ User( @@ -215,7 +215,7 @@ final class DiffTests: XCTestCase { other.insert(42, at: 300) other.remove(at: 700) - XCTAssertNoDifference( + expectNoDifference( diff(largeArray, other), """ [ @@ -236,7 +236,7 @@ final class DiffTests: XCTestCase { } func testDictionary() { - XCTAssertNoDifference( + expectNoDifference( diff( [ 1: User( @@ -279,7 +279,7 @@ final class DiffTests: XCTestCase { """ ) - XCTAssertNoDifference( + expectNoDifference( diff( OrderedDictionary(pairs: [ 1: User( @@ -322,7 +322,7 @@ final class DiffTests: XCTestCase { """ ) - XCTAssertNoDifference( + expectNoDifference( diff( OrderedDictionary(pairs: [ 0: User( @@ -382,7 +382,7 @@ final class DiffTests: XCTestCase { other[300] = "42" other[700] = nil - XCTAssertNoDifference( + expectNoDifference( diff(largeDictionary, other), """ [ @@ -405,7 +405,7 @@ final class DiffTests: XCTestCase { XCTAssertEqual( diff(Enum.baz(fizz: 1.2, buzz: "Blob"), Enum.baz(fizz: 1.2, buzz: "Blob")), nil) - XCTAssertNoDifference( + expectNoDifference( diff(Enum.foo, Enum.bar(42)), """ - Enum.foo @@ -413,7 +413,7 @@ final class DiffTests: XCTestCase { """ ) - XCTAssertNoDifference( + expectNoDifference( diff(Enum.bar(42), Enum.bar(43)), """ - Enum.bar(42) @@ -421,7 +421,7 @@ final class DiffTests: XCTestCase { """ ) - XCTAssertNoDifference( + expectNoDifference( diff(Enum.fizz(42, buzz: "Blob"), Enum.fizz(42, buzz: "Glob")), """ Enum.fizz( @@ -432,7 +432,7 @@ final class DiffTests: XCTestCase { """ ) - XCTAssertNoDifference( + expectNoDifference( diff( Nested.nest(.fizz(42, buzz: "Blob")), Nested.nest(.fizz(42, buzz: "Glob")) @@ -448,7 +448,7 @@ final class DiffTests: XCTestCase { """ ) - XCTAssertNoDifference( + expectNoDifference( diff( Enum.foo, Enum.buzz @@ -459,7 +459,7 @@ final class DiffTests: XCTestCase { """ ) - XCTAssertNoDifference( + expectNoDifference( diff( Nested.nest(.foo), Nested.nest(.buzz) @@ -470,7 +470,7 @@ final class DiffTests: XCTestCase { """ ) - XCTAssertNoDifference( + expectNoDifference( diff( Nested.largerNest(1, .foo), Nested.largerNest(1, .buzz) @@ -493,7 +493,7 @@ final class DiffTests: XCTestCase { var offset: Offset let result: String } - XCTAssertNoDifference( + expectNoDifference( diff( State(offset: .page(1), result: "Hello, world!"), State(offset: .page(1), result: "Good night, moon!") @@ -517,7 +517,7 @@ final class DiffTests: XCTestCase { nil ) - XCTAssertNoDifference( + expectNoDifference( diff(User?(.init(id: 42, name: "Blob")), nil), """ - User( @@ -527,7 +527,7 @@ final class DiffTests: XCTestCase { + nil """ ) - XCTAssertNoDifference( + expectNoDifference( diff(User?(.init(id: 42, name: "Blob")), User?(.init(id: 42, name: "Blob, Esq."))), """ User( @@ -542,7 +542,7 @@ final class DiffTests: XCTestCase { func testSet() { XCTAssertEqual(diff(Set([1, 2, 3]), Set([1, 2, 3])), nil) - XCTAssertNoDifference( + expectNoDifference( diff( Set([1, 2, 3]), Set([1, 3, 4]) @@ -564,7 +564,7 @@ final class DiffTests: XCTestCase { other.remove(102) other.insert(9999) - XCTAssertNoDifference( + expectNoDifference( diff(largeSet, other), """ Set([ @@ -579,7 +579,7 @@ final class DiffTests: XCTestCase { func testSingleValue() { XCTAssertEqual(diff(1, 1), nil) - XCTAssertNoDifference( + expectNoDifference( diff(1, 2), """ - 1 @@ -588,7 +588,7 @@ final class DiffTests: XCTestCase { ) XCTAssertEqual(diff(true, true), nil) - XCTAssertNoDifference( + expectNoDifference( diff(true, false), """ - true @@ -598,7 +598,7 @@ final class DiffTests: XCTestCase { } func testStruct() { - XCTAssertNoDifference( + expectNoDifference( diff( NeverEqual(), NeverEqual() @@ -610,7 +610,7 @@ final class DiffTests: XCTestCase { """ ) - XCTAssertNoDifference( + expectNoDifference( diff( User( id: 42, @@ -630,7 +630,7 @@ final class DiffTests: XCTestCase { """ ) - XCTAssertNoDifference( + expectNoDifference( diff( Pair( driver: User( @@ -665,7 +665,7 @@ final class DiffTests: XCTestCase { """ ) - XCTAssertNoDifference( + expectNoDifference( diff( NeverEqualUser(id: 1, name: "Blob"), NeverEqualUser(id: 1, name: "Blob") @@ -680,7 +680,7 @@ final class DiffTests: XCTestCase { func testTuple() { XCTAssertEqual(diff((1, 2), (1, 2)), nil) - XCTAssertNoDifference( + expectNoDifference( diff((1, 2), (1, 3)), """ ( @@ -692,7 +692,7 @@ final class DiffTests: XCTestCase { ) XCTAssertEqual(diff((blob: 1, 2), (blob: 1, 2)), nil) - XCTAssertNoDifference( + expectNoDifference( diff((blob: 1, 2), (blob: 1, 3)), """ ( @@ -704,7 +704,7 @@ final class DiffTests: XCTestCase { ) XCTAssertEqual(diff((1, (2, 3)), (1, (2, 3))), nil) - XCTAssertNoDifference( + expectNoDifference( diff((1, (2, 3)), (0, (2, 3))), """ ( @@ -716,7 +716,7 @@ final class DiffTests: XCTestCase { ) XCTAssertEqual(diff((1, ()), (1, ())), nil) - XCTAssertNoDifference( + expectNoDifference( diff((1, ()), (0, ())), """ ( @@ -731,7 +731,7 @@ final class DiffTests: XCTestCase { #if !os(WASI) func testNestedCustomMirror() { #if compiler(>=5.4) - XCTAssertNoDifference( + expectNoDifference( diff( NestedDate(date: Date(timeIntervalSince1970: 0)), NestedDate(date: Date(timeIntervalSince1970: 1)) @@ -746,7 +746,7 @@ final class DiffTests: XCTestCase { #endif func testMultilineString() { - XCTAssertNoDifference( + expectNoDifference( diff( """ Hello, @@ -766,7 +766,7 @@ final class DiffTests: XCTestCase { """# ) - XCTAssertNoDifference( + expectNoDifference( diff( """ Hello, @@ -786,7 +786,7 @@ final class DiffTests: XCTestCase { """# ) - XCTAssertNoDifference( + expectNoDifference( diff( Email( subject: "RE: Upcoming Event", @@ -827,7 +827,7 @@ final class DiffTests: XCTestCase { """ ) - XCTAssertNoDifference( + expectNoDifference( diff( Email( subject: "RE: Upcoming Event", @@ -863,7 +863,7 @@ final class DiffTests: XCTestCase { } func testAnyHashable() { - XCTAssertNoDifference( + expectNoDifference( diff( AnyHashable(42), AnyHashable(43) @@ -874,7 +874,7 @@ final class DiffTests: XCTestCase { """ ) - XCTAssertNoDifference( + expectNoDifference( diff( [ AnyHashable(1): User(id: 1, name: "Blob"), @@ -925,7 +925,7 @@ final class DiffTests: XCTestCase { var other = user other.friends[0].friends[0].friends[0].name += " Else" - XCTAssertNoDifference( + expectNoDifference( diff(user, other), """ FriendlyUser( @@ -958,7 +958,7 @@ final class DiffTests: XCTestCase { #endif func testInterleavedIndices() { - XCTAssertNoDifference( + expectNoDifference( diff( [ 1, @@ -1000,7 +1000,7 @@ final class DiffTests: XCTestCase { } func testNamespacedTypes() { - XCTAssertNoDifference( + expectNoDifference( diff( Namespaced.Class(x: 0), Namespaced.Class(x: 1) @@ -1011,7 +1011,7 @@ final class DiffTests: XCTestCase { """ ) - XCTAssertNoDifference( + expectNoDifference( diff( Namespaced.Enum.x(0), Namespaced.Enum.x(1) @@ -1022,7 +1022,7 @@ final class DiffTests: XCTestCase { """ ) - XCTAssertNoDifference( + expectNoDifference( diff( Namespaced.Struct(x: 0), Namespaced.Struct(x: 1) @@ -1035,7 +1035,7 @@ final class DiffTests: XCTestCase { } func testCustomMirror() { - XCTAssertNoDifference( + expectNoDifference( diff( LoginState( email: "blob@pointfree.co", @@ -1059,7 +1059,7 @@ final class DiffTests: XCTestCase { } func testCustomOverride() { - XCTAssertNoDifference( + expectNoDifference( diff( Wrapper(rawValue: 1), Wrapper(rawValue: 2) @@ -1070,7 +1070,7 @@ final class DiffTests: XCTestCase { """ ) - XCTAssertNoDifference( + expectNoDifference( diff( Wrapper( rawValue: LoginState( @@ -1098,7 +1098,7 @@ final class DiffTests: XCTestCase { } func testDifferentTypes() { - XCTAssertNoDifference( + expectNoDifference( diff( 29.99 as Float as Any, 29.99 as Double as Any @@ -1109,7 +1109,7 @@ final class DiffTests: XCTestCase { """ ) - XCTAssertNoDifference( + expectNoDifference( diff( [ "value": 29.99 as Float @@ -1158,7 +1158,7 @@ final class DiffTests: XCTestCase { var children: Stack } } - XCTAssertNoDifference( + expectNoDifference( diff( Parent.State(children: Stack(elements: [(.init(rawValue: 0), Child.State())])), Parent.State(children: Stack(elements: [(.init(rawValue: 1), Child.State())])) @@ -1184,7 +1184,7 @@ final class DiffTests: XCTestCase { var date: Double var results: Results } - XCTAssertNoDifference( + expectNoDifference( diff( State(date: 123_456_789, results: Results()), State(date: 123_456_790, results: Results()) @@ -1207,7 +1207,7 @@ final class DiffTests: XCTestCase { } let blobSr = Value(name: "Blob Sr.") let blobJr = Value(name: "Blob Jr.") - XCTAssertNoDifference( + expectNoDifference( diff( blobSr, blobJr @@ -1228,7 +1228,7 @@ final class DiffTests: XCTestCase { } let obj = Shared() - XCTAssertNoDifference( + expectNoDifference( diff(obj, obj), """ #1 User( @@ -1239,7 +1239,7 @@ final class DiffTests: XCTestCase { """ ) - XCTAssertNoDifference( + expectNoDifference( diff(Shared(), Shared()), """ - #1 User( @@ -1253,7 +1253,7 @@ final class DiffTests: XCTestCase { """ ) - XCTAssertNoDifference( + expectNoDifference( diff([obj, obj, obj], [obj, obj, Shared()]), """ [ @@ -1280,7 +1280,7 @@ final class DiffTests: XCTestCase { var count = 0 } let stats = State(stats: Shared(before: Stats(), after: Stats(count: 1))) - XCTAssertNoDifference( + expectNoDifference( diff(stats, stats), """ DiffTests.State( diff --git a/Tests/CustomDumpTests/DumpTests.swift b/Tests/CustomDumpTests/DumpTests.swift index 06893f64..a5cdc2c7 100644 --- a/Tests/CustomDumpTests/DumpTests.swift +++ b/Tests/CustomDumpTests/DumpTests.swift @@ -16,7 +16,7 @@ import XCTest @available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) final class DumpTests: XCTestCase { func testAnyType() { - XCTAssertNoDifference( + expectNoDifference( String(customDumping: Foo.Bar.self), """ Foo.Bar.self @@ -26,77 +26,77 @@ final class DumpTests: XCTestCase { struct Feature { struct State {} } - XCTAssertNoDifference( + expectNoDifference( String(customDumping: Feature.State.self), """ DumpTests.Feature.State.self """ ) - XCTAssertNoDifference( + expectNoDifference( String(customDumping: (x: Double, y: Double).self), """ (x: Double, y: Double).self """ ) - XCTAssertNoDifference( + expectNoDifference( String(customDumping: Double?.self), """ Double?.self """ ) - XCTAssertNoDifference( + expectNoDifference( String(customDumping: [Int].self), """ [Int].self """ ) - XCTAssertNoDifference( + expectNoDifference( String(customDumping: [String: Int].self), """ [String: Int].self """ ) - XCTAssertNoDifference( + expectNoDifference( String(customDumping: [[Double: Double?]].self), """ [[Double: Double?]].self """ ) - XCTAssertNoDifference( + expectNoDifference( String(customDumping: [[Double: Double]?].self), """ [[Double: Double]?].self """ ) - XCTAssertNoDifference( + expectNoDifference( String(customDumping: [[Double: [Double]]]?.self), """ [[Double: [Double]]]?.self """ ) - XCTAssertNoDifference( + expectNoDifference( String(customDumping: [[[Double: Double]]]?.self), """ [[[Double: Double]]]?.self """ ) - XCTAssertNoDifference( + expectNoDifference( String(customDumping: [Double: [Double?]].self), """ [Double: [Double?]].self """ ) - XCTAssertNoDifference( + expectNoDifference( String(customDumping: [Double: [Double]?].self), """ [Double: [Double]?].self @@ -112,7 +112,7 @@ final class DumpTests: XCTestCase { var dump = "" customDump(user, to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, """ UserClass( @@ -124,7 +124,7 @@ final class DumpTests: XCTestCase { dump = "" customDump(user, to: &dump, maxDepth: 0) - XCTAssertNoDifference( + expectNoDifference( dump, """ UserClass(…) @@ -136,7 +136,7 @@ final class DumpTests: XCTestCase { dump = "" customDump(foo, to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, """ RecursiveFoo( @@ -164,7 +164,7 @@ final class DumpTests: XCTestCase { var dump = "" customDump(users, to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, """ [ @@ -186,7 +186,7 @@ final class DumpTests: XCTestCase { dump = "" customDump(users, to: &dump, maxDepth: 1) - XCTAssertNoDifference( + expectNoDifference( dump, """ [ @@ -199,7 +199,7 @@ final class DumpTests: XCTestCase { dump = "" customDump(users, to: &dump, maxDepth: 0) - XCTAssertNoDifference( + expectNoDifference( dump, """ […] @@ -222,7 +222,7 @@ final class DumpTests: XCTestCase { ], to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ [ @@ -252,7 +252,7 @@ final class DumpTests: XCTestCase { ], to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ [ @@ -283,7 +283,7 @@ final class DumpTests: XCTestCase { ] as KeyValuePairs), to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ [ @@ -305,7 +305,7 @@ final class DumpTests: XCTestCase { let content: [String: Int] } - XCTAssertNoDifference( + expectNoDifference( """ DumpTests.NestedDictionary( content: [ @@ -328,7 +328,7 @@ final class DumpTests: XCTestCase { func testEnum() { var dump = "" customDump(Enum.foo, to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, """ Enum.foo @@ -337,7 +337,7 @@ final class DumpTests: XCTestCase { dump = "" customDump(Enum.bar(42), to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, """ Enum.bar(42) @@ -346,7 +346,7 @@ final class DumpTests: XCTestCase { dump = "" customDump(Enum.fu(bar: 42), to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, """ Enum.fu(bar: 42) @@ -355,7 +355,7 @@ final class DumpTests: XCTestCase { dump = "" customDump(Enum.baz(fizz: 0.9, buzz: "2"), to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, """ Enum.baz( @@ -367,7 +367,7 @@ final class DumpTests: XCTestCase { dump = "" customDump(Enum.fizz(0.9, buzz: "2"), to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, """ Enum.fizz( @@ -379,7 +379,7 @@ final class DumpTests: XCTestCase { dump = "" customDump(Nested.nest(.fizz(0.9, buzz: "2")), to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, """ Nested.nest( @@ -395,7 +395,7 @@ final class DumpTests: XCTestCase { func testOptional() { var dump = "" customDump(User?(.init(id: 42, name: "Blob")), to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, """ User( @@ -407,7 +407,7 @@ final class DumpTests: XCTestCase { dump = "" customDump(User?(nil), to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, """ nil @@ -418,7 +418,7 @@ final class DumpTests: XCTestCase { func testSet() { var dump = "" customDump(Set([1, 2, 3]), to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, """ Set([ @@ -433,7 +433,7 @@ final class DumpTests: XCTestCase { func testSingleValue() { var dump = "" customDump(1, to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, """ 1 @@ -442,7 +442,7 @@ final class DumpTests: XCTestCase { dump = "" customDump(true, to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, """ true @@ -458,7 +458,7 @@ final class DumpTests: XCTestCase { var dump = "" customDump(user, to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, """ User( @@ -470,7 +470,7 @@ final class DumpTests: XCTestCase { dump = "" customDump(user, to: &dump, maxDepth: 0) - XCTAssertNoDifference( + expectNoDifference( dump, """ User(…) @@ -490,7 +490,7 @@ final class DumpTests: XCTestCase { dump = "" customDump(pair, to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, """ Pair( @@ -508,7 +508,7 @@ final class DumpTests: XCTestCase { dump = "" customDump(pair, to: &dump, maxDepth: 1) - XCTAssertNoDifference( + expectNoDifference( dump, """ Pair( @@ -522,7 +522,7 @@ final class DumpTests: XCTestCase { func testTuple() { var dump = "" customDump((1, 2), to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, """ ( @@ -534,7 +534,7 @@ final class DumpTests: XCTestCase { dump = "" customDump((x: 1, y: 2, ()), to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, """ ( @@ -549,42 +549,42 @@ final class DumpTests: XCTestCase { func testString() { var dump = "" customDump("Hello!", to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, #""Hello!""# ) dump = "" customDump(#"Hello, "world!""#, to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, ##"#"Hello, "world!""#"## ) dump = "" customDump(####"This has a "### in it"####, to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, #####"####"This has a "### in it"####"##### ) dump = "" customDump("This has a \\ in it", to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, ##"#"This has a \ in it"#"## ) dump = "" customDump("This has no special characters in it", to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, "\"This has no special characters in it\"" ) dump = "" customDump("This has a \t in it", to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, "\"This has a \\t in it\"" ) @@ -593,7 +593,7 @@ final class DumpTests: XCTestCase { func testMultilineString() { var dump = "" customDump("Hello,\nWorld!", to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, #""" """ @@ -605,7 +605,7 @@ final class DumpTests: XCTestCase { dump = "" customDump("Hello,\nWorld!"[...], to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, #""" """ @@ -630,7 +630,7 @@ final class DumpTests: XCTestCase { ), to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ Email( @@ -658,7 +658,7 @@ final class DumpTests: XCTestCase { """##, to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, ###""" ##""" @@ -675,7 +675,7 @@ final class DumpTests: XCTestCase { func testAnyHashable() { var dump = "" customDump(AnyHashable(42), to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, """ 42 @@ -690,7 +690,7 @@ final class DumpTests: XCTestCase { ], to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ [ @@ -714,7 +714,7 @@ final class DumpTests: XCTestCase { if #available(macOS 13.3, iOS 16.4, watchOS 9.4, tvOS 16.4, *) { dump = "" customDump(\UserClass.name, to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, #""" \UserClass.name @@ -723,7 +723,7 @@ final class DumpTests: XCTestCase { dump = "" customDump(\Pair.driver.name, to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, #""" \Pair.driver.name @@ -732,7 +732,7 @@ final class DumpTests: XCTestCase { dump = "" customDump(\(x: Double, y: Double).x, to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, #""" \(x: Double, y: Double).x @@ -742,7 +742,7 @@ final class DumpTests: XCTestCase { #if DEBUG dump = "" customDump(\User.name.count, to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, #""" \User.name.count @@ -751,7 +751,7 @@ final class DumpTests: XCTestCase { dump = "" customDump(\Item.$isInStock, to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, #""" \Item.$isInStock @@ -760,7 +760,7 @@ final class DumpTests: XCTestCase { dump = "" customDump(\Wrapped.count, to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, #""" \Wrapped.subscript(dynamicMember: ) @@ -772,7 +772,7 @@ final class DumpTests: XCTestCase { } else { dump = "" customDump(\UserClass.name, to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, #""" \UserClass.name @@ -781,7 +781,7 @@ final class DumpTests: XCTestCase { dump = "" customDump(\Pair.driver.name, to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, #""" \Pair.driver.name @@ -790,7 +790,7 @@ final class DumpTests: XCTestCase { dump = "" customDump(\User.name.count, to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, #""" KeyPath @@ -799,7 +799,7 @@ final class DumpTests: XCTestCase { dump = "" customDump(\(x: Double, y: Double).x, to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, #""" WritableKeyPath<(x: Double, y: Double), Double> @@ -808,7 +808,7 @@ final class DumpTests: XCTestCase { dump = "" customDump(\Item.$isInStock, to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, #""" KeyPath> @@ -817,7 +817,7 @@ final class DumpTests: XCTestCase { dump = "" customDump(\Wrapped.count, to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, #""" KeyPath, Int> @@ -833,7 +833,7 @@ final class DumpTests: XCTestCase { Namespaced.Class(x: 0), to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ Namespaced.Class(x: 0) @@ -845,7 +845,7 @@ final class DumpTests: XCTestCase { Namespaced.Enum.x(0), to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ Namespaced.Enum.x(0) @@ -857,7 +857,7 @@ final class DumpTests: XCTestCase { Namespaced.Struct(x: 0), to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ Namespaced.Struct(x: 0) @@ -871,7 +871,7 @@ final class DumpTests: XCTestCase { Result, Error>.success(.success(42)), to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ Result.success( @@ -889,7 +889,7 @@ final class DumpTests: XCTestCase { Inline.self, to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ DumpTests.Inline.self @@ -901,7 +901,7 @@ final class DumpTests: XCTestCase { Inline(), to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ DumpTests.Inline() @@ -912,7 +912,7 @@ final class DumpTests: XCTestCase { func testCustomMirror() { var dump = "" customDump(Button(), to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, """ Button.cancel( @@ -931,7 +931,7 @@ final class DumpTests: XCTestCase { ), to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ LoginState( @@ -945,7 +945,7 @@ final class DumpTests: XCTestCase { func testCustomOverride() { var dump = "" customDump(Wrapper(rawValue: 42), to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, """ 42 @@ -956,7 +956,7 @@ final class DumpTests: XCTestCase { func testStandardLibrary() { var dump = "" customDump("©" as Character, to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, """ "©" @@ -965,7 +965,7 @@ final class DumpTests: XCTestCase { dump = "" customDump("Blob" as StaticString, to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, """ "Blob" @@ -974,7 +974,7 @@ final class DumpTests: XCTestCase { dump = "" customDump("©" as UnicodeScalar, to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, """ "©" @@ -996,7 +996,7 @@ final class DumpTests: XCTestCase { customDump(Doctor(), to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, """ DumpTests.Doctor( @@ -1027,7 +1027,7 @@ final class DumpTests: XCTestCase { customDump(Surgeon(), to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, """ DumpTests.Surgeon( @@ -1081,7 +1081,7 @@ final class DumpTests: XCTestCase { var dump = "" customDump(subject, to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, """ DumpTests.Parent( @@ -1156,7 +1156,7 @@ final class DumpTests: XCTestCase { user2, ], to: &dump) - XCTAssertNoDifference( + expectNoDifference( dump, """ [ @@ -1191,14 +1191,14 @@ final class DumpTests: XCTestCase { func testDuration() { guard #available(macOS 13, iOS 16, watchOS 9, tvOS 16, *) else { return } - XCTAssertNoDifference( + expectNoDifference( String(customDumping: Duration.seconds(5)), """ 5 seconds """ ) - XCTAssertNoDifference( + expectNoDifference( String(customDumping: Duration.seconds(5) + .milliseconds(123)), """ 5 seconds, 123 milliseconds @@ -1214,7 +1214,7 @@ final class DumpTests: XCTestCase { CGRect(x: 0.5, y: 0.5, width: 1.5, height: 1.5), to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ CGRect( @@ -1239,7 +1239,7 @@ final class DumpTests: XCTestCase { Animation.easeInOut, to: &dump ) - XCTAssertNoDifference( + expectNoDifference( dump, """ Animation.easeInOut @@ -1254,7 +1254,7 @@ final class DumpTests: XCTestCase { let name = "Blob Sr." let _$observationRegistrar = ObservationRegistrar() } - XCTAssertNoDifference( + expectNoDifference( String(customDumping: Object()), """ DumpTests.Object( @@ -1266,7 +1266,7 @@ final class DumpTests: XCTestCase { let name = "Blob Jr." let _$observationRegistrar = ObservationRegistrar() } - XCTAssertNoDifference( + expectNoDifference( String(customDumping: Value()), """ DumpTests.Value( @@ -1290,7 +1290,7 @@ final class DumpTests: XCTestCase { ) } } - XCTAssertNoDifference( + expectNoDifference( String(customDumping: Object()), """ DumpTests.Object( @@ -1325,7 +1325,7 @@ final class DumpTests: XCTestCase { let obj1 = DiffableObject() let obj2 = DiffableObject() - XCTAssertNoDifference( + expectNoDifference( String( customDumping: DiffableObjectsParent( objs1: DiffableObjects(obj1: obj1, obj2: obj1), @@ -1346,7 +1346,7 @@ final class DumpTests: XCTestCase { """ ) - XCTAssertNoDifference( + expectNoDifference( String( customDumping: DiffableObjectsParent( objs1: DiffableObjects(obj1: obj1, obj2: obj2), @@ -1394,7 +1394,7 @@ final class DumpTests: XCTestCase { let objs2 = DiffableObjects(obj1: obj2, obj2: obj2) let objsParent = DiffableObjectsParent(objs1: objs1, objs2: objs2) - XCTAssertNoDifference( + expectNoDifference( String(customDumping: objsParent), """ DumpTests.DiffableObjectsParent( diff --git a/Tests/CustomDumpTests/XCTAssertDifferenceTests.swift b/Tests/CustomDumpTests/ExpectDifferenceTests.swift similarity index 74% rename from Tests/CustomDumpTests/XCTAssertDifferenceTests.swift rename to Tests/CustomDumpTests/ExpectDifferenceTests.swift index f9f134f0..0128b631 100644 --- a/Tests/CustomDumpTests/XCTAssertDifferenceTests.swift +++ b/Tests/CustomDumpTests/ExpectDifferenceTests.swift @@ -2,31 +2,31 @@ import CustomDump import XCTest @available(*, deprecated) -class XCTAssertDifferencesTests: XCTestCase { - func testXCTAssertDifference() { +class ExpectDifferencesTests: XCTestCase { + func testExpectDifference() { var user = User(id: 42, name: "Blob") func increment(_ root: inout Value, at keyPath: WritableKeyPath) { root[keyPath: keyPath] += 1 } - XCTAssertDifference(user) { + expectDifference(user) { increment(&user, at: \.id) } changes: { $0.id = 43 } } - func testXCTAssertDifference_NonExhaustive() { + func testExpectDifference_NonExhaustive() { let user = User(id: 42, name: "Blob") - XCTAssertDifference(user) { + expectDifference(user) { $0.id = 42 $0.name = "Blob" } } #if DEBUG && compiler(>=5.4) && (os(iOS) || os(macOS) || os(tvOS) || os(watchOS)) - func testXCTAssertDifference_Failure() { + func testExpectDifference_Failure() { var user = User(id: 42, name: "Blob") func increment(_ root: inout Value, at keyPath: WritableKeyPath) { root[keyPath: keyPath] += 1 @@ -34,7 +34,7 @@ class XCTAssertDifferencesTests: XCTestCase { XCTExpectFailure() - XCTAssertDifference(user) { + expectDifference(user) { increment(&user, at: \.id) } changes: { $0.id = 44 diff --git a/Tests/CustomDumpTests/ExpectNoDifference.swift b/Tests/CustomDumpTests/ExpectNoDifferenceTests.swift similarity index 67% rename from Tests/CustomDumpTests/ExpectNoDifference.swift rename to Tests/CustomDumpTests/ExpectNoDifferenceTests.swift index 75f70b95..8315fdee 100644 --- a/Tests/CustomDumpTests/ExpectNoDifference.swift +++ b/Tests/CustomDumpTests/ExpectNoDifferenceTests.swift @@ -1,6 +1,8 @@ +import CustomDump +import Foundation +import XCTest + #if canImport(Testing) - import CustomDump - import Foundation import Testing @Suite @@ -36,5 +38,19 @@ } } } - #endif + +@available(iOS 13, macOS 10.15, tvOS 13, watchOS 6, *) +class ExpectNoDifferenceXCTests: XCTestCase { + #if DEBUG && compiler(>=5.4) && (os(iOS) || os(macOS) || os(tvOS) || os(watchOS)) + func testExpectNoDifference() { + XCTExpectFailure() + + let user = User(id: 42, name: "Blob") + var other = user + other.name += " Sr." + + expectNoDifference(user, other) + } + #endif +} diff --git a/Tests/CustomDumpTests/XCTAssertNoDifferenceTests.swift b/Tests/CustomDumpTests/XCTAssertNoDifferenceTests.swift deleted file mode 100644 index fa9f3fc0..00000000 --- a/Tests/CustomDumpTests/XCTAssertNoDifferenceTests.swift +++ /dev/null @@ -1,17 +0,0 @@ -import CustomDump -import XCTest - -@available(iOS 13, macOS 10.15, tvOS 13, watchOS 6, *) -class XCTAssertNoDifferenceTests: XCTestCase { - #if DEBUG && compiler(>=5.4) && (os(iOS) || os(macOS) || os(tvOS) || os(watchOS)) - func testXCTAssertNoDifference() { - XCTExpectFailure() - - let user = User(id: 42, name: "Blob") - var other = user - other.name += " Sr." - - XCTAssertNoDifference(user, other) - } - #endif -}