averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use string description in test sequence comparison

Browse Source 
Using ObjectIdentifiers on the 32-bit simulator isn't a reliable
comparison method. For the purposes of these tests, it's better to
do a string comparison of the description instead.

rdar://problem/19013004

Swift SVN r23415
This commit is contained in:
David Farler
2014-11-18 21:55:32 +00:00
parent e9d650d01c
commit 14159d942b
2 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
stdlib/unittest/StdlibUnittest.swift.gyb
View File

@@ -1396,23 +1396,22 @@ public func expectEqualSequence<
public func expectEqualsUnordered<
Expected : SequenceType,
Actual : SequenceType
where Expected.Generator.Element == Actual.Generator.Element,
Expected.Generator.Element == AnyObject
where Expected.Generator.Element == Actual.Generator.Element
>(
expected: Expected, actual: Actual,
sameValue: (Expected.Generator.Element, Expected.Generator.Element)->Bool,
compare: (Expected.Generator.Element, Expected.Generator.Element)
-> ExpectedComparisonResult,
stackTrace: SourceLocStack? = nil,
collectMoreInfo: (()->String)? = nil,
file: String = __FILE__, line: UWord = __LINE__
) {
let f = { (x, y) -> Bool in
ObjectIdentifier(x) < ObjectIdentifier(y)
}
let x: [Expected.Generator.Element] = sorted(Array(expected), f)
let y: [Actual.Generator.Element] = sorted(Array(actual), f)
let x: [Expected.Generator.Element] = sorted(
Array(expected), compose(compare, { $0.isLT() }))
let y: [Actual.Generator.Element] = sorted(
Array(actual), compose(compare, { $0.isLT() }))
expectEqualSequence(
x, y, sameValue, stackTrace: stackTrace, collectMoreInfo: collectMoreInfo,
file: file, line: line)
x, y, compose(compare, { $0.isEQ() }), stackTrace: stackTrace,
collectMoreInfo: collectMoreInfo, file: file, line: line)
}
public func expectEqualUnicodeScalars(
@@ -1476,6 +1475,12 @@ public func expectDebugPrinted<T>(
expectDebugPrinted(expectedOneOf: [expected], object, file: file, line: line)
}
func compose<A, B, C>(f: A -> B, g: B -> C) -> A -> C {
return { a in
return g(f(a))
}
}
// ${'Local Variables'}:
// eval: (read-only-mode 1)
// End: