Skip to content

Commit 3867e7e

Browse files
DougGregorDougGregor
committed
Remove XCTAssert(Not)Equal overloads made obsolete by conditional conformances.
The various array types, Optional, and Dictionary are now Equatable when their element types are Equatable, so we can remove the overloads meant to support those use cases. Fixes rdar://problem/17924430.
1 parent 2674f2f commit 3867e7e

File tree

1 file changed

+0
-110
lines changed

1 file changed

+0
-110
lines changed

‎Sources/XCTest/Public/XCTAssert.swift

Lines changed: 0 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -169,61 +169,6 @@ public func XCTAssertEqual<T: Equatable>(_ expression1: @autoclosure () throws -
169169
}
170170
}
171171

172-
public func XCTAssertEqual<T: Equatable>(_ expression1: @autoclosure () throws -> T?, _ expression2: @autoclosure () throws -> T?, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
173-
_XCTEvaluateAssertion(.equal, message: message, file: file, line: line) {
174-
let (value1, value2) = (try expression1(), try expression2())
175-
if value1 == value2 {
176-
return .success
177-
} else {
178-
return .expectedFailure("(\"\(String(describing: value1))\") is not equal to (\"\(String(describing: value2))\")")
179-
}
180-
}
181-
}
182-
183-
public func XCTAssertEqual<T: Equatable>(_ expression1: @autoclosure () throws -> ArraySlice<T>, _ expression2: @autoclosure () throws -> ArraySlice<T>, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
184-
_XCTEvaluateAssertion(.equal, message: message, file: file, line: line) {
185-
let (value1, value2) = (try expression1(), try expression2())
186-
if value1 == value2 {
187-
return .success
188-
} else {
189-
return .expectedFailure("(\"\(value1)\") is not equal to (\"\(value2)\")")
190-
}
191-
}
192-
}
193-
194-
public func XCTAssertEqual<T: Equatable>(_ expression1: @autoclosure () throws -> ContiguousArray<T>, _ expression2: @autoclosure () throws -> ContiguousArray<T>, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
195-
_XCTEvaluateAssertion(.equal, message: message, file: file, line: line) {
196-
let (value1, value2) = (try expression1(), try expression2())
197-
if value1 == value2 {
198-
return .success
199-
} else {
200-
return .expectedFailure("(\"\(value1)\") is not equal to (\"\(value2)\")")
201-
}
202-
}
203-
}
204-
205-
public func XCTAssertEqual<T: Equatable>(_ expression1: @autoclosure () throws -> [T], _ expression2: @autoclosure () throws -> [T], _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
206-
_XCTEvaluateAssertion(.equal, message: message, file: file, line: line) {
207-
let (value1, value2) = (try expression1(), try expression2())
208-
if value1 == value2 {
209-
return .success
210-
} else {
211-
return .expectedFailure("(\"\(value1)\") is not equal to (\"\(value2)\")")
212-
}
213-
}
214-
}
215-
216-
public func XCTAssertEqual<T, U: Equatable>(_ expression1: @autoclosure () throws -> [T: U], _ expression2: @autoclosure () throws -> [T: U], _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
217-
_XCTEvaluateAssertion(.equal, message: message, file: file, line: line) {
218-
let (value1, value2) = (try expression1(), try expression2())
219-
if value1 == value2 {
220-
return .success
221-
} else {
222-
return .expectedFailure("(\"\(value1)\") is not equal to (\"\(value2)\")")
223-
}
224-
}
225-
}
226-
227172
public func XCTAssertEqual<T: FloatingPoint>(_ expression1: @autoclosure () throws -> T, _ expression2: @autoclosure () throws -> T, accuracy: T, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
228173
_XCTEvaluateAssertion(.equalWithAccuracy, message: message, file: file, line: line) {
229174
let (value1, value2) = (try expression1(), try expression2())
@@ -317,61 +262,6 @@ public func XCTAssertNotEqual<T: Equatable>(_ expression1: @autoclosure () throw
317262
}
318263
}
319264

320-
public func XCTAssertNotEqual<T: Equatable>(_ expression1: @autoclosure () throws -> T?, _ expression2: @autoclosure () throws -> T?, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
321-
_XCTEvaluateAssertion(.notEqual, message: message, file: file, line: line) {
322-
let (value1, value2) = (try expression1(), try expression2())
323-
if value1 != value2 {
324-
return .success
325-
} else {
326-
return .expectedFailure("(\"\(String(describing: value1))\") is equal to (\"\(String(describing: value2))\")")
327-
}
328-
}
329-
}
330-
331-
public func XCTAssertNotEqual<T: Equatable>(_ expression1: @autoclosure () throws -> ContiguousArray<T>, _ expression2: @autoclosure () throws -> ContiguousArray<T>, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
332-
_XCTEvaluateAssertion(.notEqual, message: message, file: file, line: line) {
333-
let (value1, value2) = (try expression1(), try expression2())
334-
if value1 != value2 {
335-
return .success
336-
} else {
337-
return .expectedFailure("(\"\(value1)\") is equal to (\"\(value2)\")")
338-
}
339-
}
340-
}
341-
342-
public func XCTAssertNotEqual<T: Equatable>(_ expression1: @autoclosure () throws -> ArraySlice<T>, _ expression2: @autoclosure () throws -> ArraySlice<T>, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
343-
_XCTEvaluateAssertion(.notEqual, message: message, file: file, line: line) {
344-
let (value1, value2) = (try expression1(), try expression2())
345-
if value1 != value2 {
346-
return .success
347-
} else {
348-
return .expectedFailure("(\"\(value1)\") is equal to (\"\(value2)\")")
349-
}
350-
}
351-
}
352-
353-
public func XCTAssertNotEqual<T: Equatable>(_ expression1: @autoclosure () throws -> [T], _ expression2: @autoclosure () throws -> [T], _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
354-
_XCTEvaluateAssertion(.notEqual, message: message, file: file, line: line) {
355-
let (value1, value2) = (try expression1(), try expression2())
356-
if value1 != value2 {
357-
return .success
358-
} else {
359-
return .expectedFailure("(\"\(value1)\") is equal to (\"\(value2)\")")
360-
}
361-
}
362-
}
363-
364-
public func XCTAssertNotEqual<T, U: Equatable>(_ expression1: @autoclosure () throws -> [T: U], _ expression2: @autoclosure () throws -> [T: U], _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
365-
_XCTEvaluateAssertion(.notEqual, message: message, file: file, line: line) {
366-
let (value1, value2) = (try expression1(), try expression2())
367-
if value1 != value2 {
368-
return .success
369-
} else {
370-
return .expectedFailure("(\"\(value1)\") is equal to (\"\(value2)\")")
371-
}
372-
}
373-
}
374-
375265
public func XCTAssertNotEqual<T: FloatingPoint>(_ expression1: @autoclosure () throws -> T, _ expression2: @autoclosure () throws -> T, accuracy: T, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
376266
_XCTEvaluateAssertion(.notEqualWithAccuracy, message: message, file: file, line: line) {
377267
let (value1, value2) = (try expression1(), try expression2())

0 commit comments

Comments
 (0)