Skip to content

Revert "Update NSNumberBridging test for init(exactly:)" #1276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 18, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 38 additions & 55 deletions TestFoundation/TestNSNumberBridging.swift
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,10 @@ class TestNSNumberBridging : XCTestCase {
XCTAssertEqual(Int(exactly: interestingValue), int)
let uint = UInt(exactly: number!)
XCTAssertEqual(UInt(exactly: interestingValue), uint)

let float = Float(exactly: number!)
let expectedFloat = Float(exactly: interestingValue)
testFloat(expectedFloat, float)
XCTAssertEqual(Float(interestingValue), float)
let double = Double(exactly: number!)
let expectedDouble = Double(exactly: interestingValue)
testDouble(expectedDouble, double)
XCTAssertEqual(Double(interestingValue), double)
}
let bridged = interestingValue._bridgeToObjectiveC()
testNumber(bridged)
Expand Down Expand Up @@ -137,13 +134,10 @@ class TestNSNumberBridging : XCTestCase {
XCTAssertEqual(Int(exactly: interestingValue), int)
let uint = UInt(exactly: number!)
XCTAssertEqual(UInt(exactly: interestingValue), uint)

let float = Float(exactly: number!)
let expectedFloat = Float(exactly: interestingValue)
testFloat(expectedFloat, float)
XCTAssertEqual(Float(interestingValue), float)
let double = Double(exactly: number!)
let expectedDouble = Double(exactly: interestingValue)
testDouble(expectedDouble, double)
XCTAssertEqual(Double(interestingValue), double)
}
let bridged = interestingValue._bridgeToObjectiveC()
testNumber(bridged)
Expand Down Expand Up @@ -176,13 +170,10 @@ class TestNSNumberBridging : XCTestCase {
XCTAssertEqual(Int(exactly: interestingValue), int)
let uint = UInt(exactly: number!)
XCTAssertEqual(UInt(exactly: interestingValue), uint)

let float = Float(exactly: number!)
let expectedFloat = Float(exactly: interestingValue)
testFloat(expectedFloat, float)
XCTAssertEqual(Float(interestingValue), float)
let double = Double(exactly: number!)
let expectedDouble = Double(exactly: interestingValue)
testDouble(expectedDouble, double)
XCTAssertEqual(Double(interestingValue), double)
}
let bridged = interestingValue._bridgeToObjectiveC()
testNumber(bridged)
Expand Down Expand Up @@ -215,13 +206,10 @@ class TestNSNumberBridging : XCTestCase {
XCTAssertEqual(Int(exactly: interestingValue), int)
let uint = UInt(exactly: number!)
XCTAssertEqual(UInt(exactly: interestingValue), uint)

let float = Float(exactly: number!)
let expectedFloat = Float(exactly: interestingValue)
testFloat(expectedFloat, float)
XCTAssertEqual(Float(interestingValue), float)
let double = Double(exactly: number!)
let expectedDouble = Double(exactly: interestingValue)
testDouble(expectedDouble, double)
XCTAssertEqual(Double(interestingValue), double)
}
let bridged = interestingValue._bridgeToObjectiveC()
testNumber(bridged)
Expand Down Expand Up @@ -254,12 +242,15 @@ class TestNSNumberBridging : XCTestCase {
XCTAssertEqual(Int(exactly: interestingValue), int)
let uint = UInt(exactly: number!)
XCTAssertEqual(UInt(exactly: interestingValue), uint)

let float = Float(exactly: number!)
let expectedFloat = Float(exactly: interestingValue)
testFloat(expectedFloat, float)
let expectedFloat = Float(exactly: int32!)
// these are disabled because of https://bugs.swift.org/browse/SR-4634
if (int32! != Int32.min && int32! != Int32.max &&
int32! != Int32.min + 1 && int32! != Int32.max - 1) {
testFloat(expectedFloat, float)
}
let double = Double(exactly: number!)
let expectedDouble = Double(exactly: interestingValue)
let expectedDouble = Double(exactly: int32!)
testDouble(expectedDouble, double)
}
let bridged = interestingValue._bridgeToObjectiveC()
Expand Down Expand Up @@ -293,12 +284,14 @@ class TestNSNumberBridging : XCTestCase {
XCTAssertEqual(Int(exactly: interestingValue), int)
let uint = UInt(exactly: number!)
XCTAssertEqual(UInt(exactly: interestingValue), uint)

let float = Float(exactly: number!)
let expectedFloat = Float(exactly: interestingValue)
testFloat(expectedFloat, float)
let expectedFloat = Float(exactly: uint32!)
// these are disabled because of https://bugs.swift.org/browse/SR-4634
if (uint32! != UInt32.max && uint32! != UInt32.max - 1) {
testFloat(expectedFloat, float)
}
let double = Double(exactly: number!)
let expectedDouble = Double(exactly: interestingValue)
let expectedDouble = Double(exactly: uint32!)
testDouble(expectedDouble, double)
}
let bridged = interestingValue._bridgeToObjectiveC()
Expand Down Expand Up @@ -332,13 +325,10 @@ class TestNSNumberBridging : XCTestCase {
XCTAssertEqual(Int(exactly: interestingValue), int)
let uint = UInt(exactly: number!)
XCTAssertEqual(UInt(exactly: interestingValue), uint)

let float = Float(exactly: number!)
let expectedFloat = Float(exactly: interestingValue)
testFloat(expectedFloat, float)
XCTAssertEqual(Float(interestingValue), float)
let double = Double(exactly: number!)
let expectedDouble = Double(exactly: interestingValue)
testDouble(expectedDouble, double)
XCTAssertEqual(Double(interestingValue), double)
}
let bridged = interestingValue._bridgeToObjectiveC()
testNumber(bridged)
Expand Down Expand Up @@ -371,13 +361,10 @@ class TestNSNumberBridging : XCTestCase {
XCTAssertEqual(Int(exactly: interestingValue), int)
let uint = UInt(exactly: number!)
XCTAssertEqual(UInt(exactly: interestingValue), uint)

let float = Float(exactly: number!)
let expectedFloat = Float(exactly: interestingValue)
testFloat(expectedFloat, float)
XCTAssertEqual(Float(interestingValue), float)
let double = Double(exactly: number!)
let expectedDouble = Double(exactly: interestingValue)
testDouble(expectedDouble, double)
XCTAssertEqual(Double(interestingValue), double)
}
let bridged = interestingValue._bridgeToObjectiveC()
testNumber(bridged)
Expand Down Expand Up @@ -410,13 +397,10 @@ class TestNSNumberBridging : XCTestCase {
XCTAssertEqual(Int(exactly: interestingValue), int)
let uint = UInt(exactly: number!)
XCTAssertEqual(UInt(exactly: interestingValue), uint)

let float = Float(exactly: number!)
let expectedFloat = Float(exactly: interestingValue)
testFloat(expectedFloat, float)
XCTAssertEqual(Float(interestingValue), float)
let double = Double(exactly: number!)
let expectedDouble = Double(exactly: interestingValue)
testDouble(expectedDouble, double)
XCTAssertEqual(Double(interestingValue), double)
}
let bridged = interestingValue._bridgeToObjectiveC()
testNumber(bridged)
Expand Down Expand Up @@ -449,13 +433,10 @@ class TestNSNumberBridging : XCTestCase {
XCTAssertEqual(Int(exactly: interestingValue), int)
let uint = UInt(exactly: number!)
XCTAssertEqual(UInt(exactly: interestingValue), uint)

let float = Float(exactly: number!)
let expectedFloat = Float(exactly: interestingValue)
testFloat(expectedFloat, float)
XCTAssertEqual(Float(interestingValue), float)
let double = Double(exactly: number!)
let expectedDouble = Double(exactly: interestingValue)
testDouble(expectedDouble, double)
XCTAssertEqual(Double(interestingValue), double)
}
let bridged = interestingValue._bridgeToObjectiveC()
testNumber(bridged)
Expand Down Expand Up @@ -489,11 +470,12 @@ class TestNSNumberBridging : XCTestCase {
let uint = UInt(exactly: number!)
XCTAssertEqual(UInt(exactly: interestingValue), uint)

let float = Float(exactly: number!)
let expectedFloat = Float(exactly: interestingValue)
let float = Float(truncating: number!)
let expectedFloat = interestingValue
testFloat(expectedFloat, float)
let double = Double(exactly: number!)
let expectedDouble = Double(exactly: interestingValue)

let double = Double(truncating: number!)
let expectedDouble = Double(reasonably: interestingValue)
testDouble(expectedDouble, double)
}
let bridged = interestingValue._bridgeToObjectiveC()
Expand Down Expand Up @@ -528,11 +510,12 @@ class TestNSNumberBridging : XCTestCase {
let uint = UInt(exactly: number!)
XCTAssertEqual(UInt(exactly: interestingValue), uint)

let float = Float(exactly: number!)
let expectedFloat = Float(exactly: interestingValue)
let float = Float(truncating: number!)
let expectedFloat = Float(reasonably: interestingValue)
testFloat(expectedFloat, float)

let double = Double(exactly: number!)
let expectedDouble = Double(exactly: interestingValue)
let expectedDouble = interestingValue
testDouble(expectedDouble, double)
}
let bridged = interestingValue._bridgeToObjectiveC()
Expand Down