Skip to content

Commit 4264eff

Browse files
author
Greg Parker
authored
Merge pull request #1276 from apple/revert-1274-nc-fpexactly
Revert "Update NSNumberBridging test for init(exactly:)"
2 parents e36488f + 00a8ca4 commit 4264eff

File tree

1 file changed

+38
-55
lines changed

1 file changed

+38
-55
lines changed

‎TestFoundation/TestNSNumberBridging.swift

Lines changed: 38 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,10 @@ class TestNSNumberBridging : XCTestCase {
9898
XCTAssertEqual(Int(exactly: interestingValue), int)
9999
let uint = UInt(exactly: number!)
100100
XCTAssertEqual(UInt(exactly: interestingValue), uint)
101-
102101
let float = Float(exactly: number!)
103-
let expectedFloat = Float(exactly: interestingValue)
104-
testFloat(expectedFloat, float)
102+
XCTAssertEqual(Float(interestingValue), float)
105103
let double = Double(exactly: number!)
106-
let expectedDouble = Double(exactly: interestingValue)
107-
testDouble(expectedDouble, double)
104+
XCTAssertEqual(Double(interestingValue), double)
108105
}
109106
let bridged = interestingValue._bridgeToObjectiveC()
110107
testNumber(bridged)
@@ -137,13 +134,10 @@ class TestNSNumberBridging : XCTestCase {
137134
XCTAssertEqual(Int(exactly: interestingValue), int)
138135
let uint = UInt(exactly: number!)
139136
XCTAssertEqual(UInt(exactly: interestingValue), uint)
140-
141137
let float = Float(exactly: number!)
142-
let expectedFloat = Float(exactly: interestingValue)
143-
testFloat(expectedFloat, float)
138+
XCTAssertEqual(Float(interestingValue), float)
144139
let double = Double(exactly: number!)
145-
let expectedDouble = Double(exactly: interestingValue)
146-
testDouble(expectedDouble, double)
140+
XCTAssertEqual(Double(interestingValue), double)
147141
}
148142
let bridged = interestingValue._bridgeToObjectiveC()
149143
testNumber(bridged)
@@ -176,13 +170,10 @@ class TestNSNumberBridging : XCTestCase {
176170
XCTAssertEqual(Int(exactly: interestingValue), int)
177171
let uint = UInt(exactly: number!)
178172
XCTAssertEqual(UInt(exactly: interestingValue), uint)
179-
180173
let float = Float(exactly: number!)
181-
let expectedFloat = Float(exactly: interestingValue)
182-
testFloat(expectedFloat, float)
174+
XCTAssertEqual(Float(interestingValue), float)
183175
let double = Double(exactly: number!)
184-
let expectedDouble = Double(exactly: interestingValue)
185-
testDouble(expectedDouble, double)
176+
XCTAssertEqual(Double(interestingValue), double)
186177
}
187178
let bridged = interestingValue._bridgeToObjectiveC()
188179
testNumber(bridged)
@@ -215,13 +206,10 @@ class TestNSNumberBridging : XCTestCase {
215206
XCTAssertEqual(Int(exactly: interestingValue), int)
216207
let uint = UInt(exactly: number!)
217208
XCTAssertEqual(UInt(exactly: interestingValue), uint)
218-
219209
let float = Float(exactly: number!)
220-
let expectedFloat = Float(exactly: interestingValue)
221-
testFloat(expectedFloat, float)
210+
XCTAssertEqual(Float(interestingValue), float)
222211
let double = Double(exactly: number!)
223-
let expectedDouble = Double(exactly: interestingValue)
224-
testDouble(expectedDouble, double)
212+
XCTAssertEqual(Double(interestingValue), double)
225213
}
226214
let bridged = interestingValue._bridgeToObjectiveC()
227215
testNumber(bridged)
@@ -254,12 +242,15 @@ class TestNSNumberBridging : XCTestCase {
254242
XCTAssertEqual(Int(exactly: interestingValue), int)
255243
let uint = UInt(exactly: number!)
256244
XCTAssertEqual(UInt(exactly: interestingValue), uint)
257-
258245
let float = Float(exactly: number!)
259-
let expectedFloat = Float(exactly: interestingValue)
260-
testFloat(expectedFloat, float)
246+
let expectedFloat = Float(exactly: int32!)
247+
// these are disabled because of https://bugs.swift.org/browse/SR-4634
248+
if (int32! != Int32.min && int32! != Int32.max &&
249+
int32! != Int32.min + 1 && int32! != Int32.max - 1) {
250+
testFloat(expectedFloat, float)
251+
}
261252
let double = Double(exactly: number!)
262-
let expectedDouble = Double(exactly: interestingValue)
253+
let expectedDouble = Double(exactly: int32!)
263254
testDouble(expectedDouble, double)
264255
}
265256
let bridged = interestingValue._bridgeToObjectiveC()
@@ -293,12 +284,14 @@ class TestNSNumberBridging : XCTestCase {
293284
XCTAssertEqual(Int(exactly: interestingValue), int)
294285
let uint = UInt(exactly: number!)
295286
XCTAssertEqual(UInt(exactly: interestingValue), uint)
296-
297287
let float = Float(exactly: number!)
298-
let expectedFloat = Float(exactly: interestingValue)
299-
testFloat(expectedFloat, float)
288+
let expectedFloat = Float(exactly: uint32!)
289+
// these are disabled because of https://bugs.swift.org/browse/SR-4634
290+
if (uint32! != UInt32.max && uint32! != UInt32.max - 1) {
291+
testFloat(expectedFloat, float)
292+
}
300293
let double = Double(exactly: number!)
301-
let expectedDouble = Double(exactly: interestingValue)
294+
let expectedDouble = Double(exactly: uint32!)
302295
testDouble(expectedDouble, double)
303296
}
304297
let bridged = interestingValue._bridgeToObjectiveC()
@@ -332,13 +325,10 @@ class TestNSNumberBridging : XCTestCase {
332325
XCTAssertEqual(Int(exactly: interestingValue), int)
333326
let uint = UInt(exactly: number!)
334327
XCTAssertEqual(UInt(exactly: interestingValue), uint)
335-
336328
let float = Float(exactly: number!)
337-
let expectedFloat = Float(exactly: interestingValue)
338-
testFloat(expectedFloat, float)
329+
XCTAssertEqual(Float(interestingValue), float)
339330
let double = Double(exactly: number!)
340-
let expectedDouble = Double(exactly: interestingValue)
341-
testDouble(expectedDouble, double)
331+
XCTAssertEqual(Double(interestingValue), double)
342332
}
343333
let bridged = interestingValue._bridgeToObjectiveC()
344334
testNumber(bridged)
@@ -371,13 +361,10 @@ class TestNSNumberBridging : XCTestCase {
371361
XCTAssertEqual(Int(exactly: interestingValue), int)
372362
let uint = UInt(exactly: number!)
373363
XCTAssertEqual(UInt(exactly: interestingValue), uint)
374-
375364
let float = Float(exactly: number!)
376-
let expectedFloat = Float(exactly: interestingValue)
377-
testFloat(expectedFloat, float)
365+
XCTAssertEqual(Float(interestingValue), float)
378366
let double = Double(exactly: number!)
379-
let expectedDouble = Double(exactly: interestingValue)
380-
testDouble(expectedDouble, double)
367+
XCTAssertEqual(Double(interestingValue), double)
381368
}
382369
let bridged = interestingValue._bridgeToObjectiveC()
383370
testNumber(bridged)
@@ -410,13 +397,10 @@ class TestNSNumberBridging : XCTestCase {
410397
XCTAssertEqual(Int(exactly: interestingValue), int)
411398
let uint = UInt(exactly: number!)
412399
XCTAssertEqual(UInt(exactly: interestingValue), uint)
413-
414400
let float = Float(exactly: number!)
415-
let expectedFloat = Float(exactly: interestingValue)
416-
testFloat(expectedFloat, float)
401+
XCTAssertEqual(Float(interestingValue), float)
417402
let double = Double(exactly: number!)
418-
let expectedDouble = Double(exactly: interestingValue)
419-
testDouble(expectedDouble, double)
403+
XCTAssertEqual(Double(interestingValue), double)
420404
}
421405
let bridged = interestingValue._bridgeToObjectiveC()
422406
testNumber(bridged)
@@ -449,13 +433,10 @@ class TestNSNumberBridging : XCTestCase {
449433
XCTAssertEqual(Int(exactly: interestingValue), int)
450434
let uint = UInt(exactly: number!)
451435
XCTAssertEqual(UInt(exactly: interestingValue), uint)
452-
453436
let float = Float(exactly: number!)
454-
let expectedFloat = Float(exactly: interestingValue)
455-
testFloat(expectedFloat, float)
437+
XCTAssertEqual(Float(interestingValue), float)
456438
let double = Double(exactly: number!)
457-
let expectedDouble = Double(exactly: interestingValue)
458-
testDouble(expectedDouble, double)
439+
XCTAssertEqual(Double(interestingValue), double)
459440
}
460441
let bridged = interestingValue._bridgeToObjectiveC()
461442
testNumber(bridged)
@@ -489,11 +470,12 @@ class TestNSNumberBridging : XCTestCase {
489470
let uint = UInt(exactly: number!)
490471
XCTAssertEqual(UInt(exactly: interestingValue), uint)
491472

492-
let float = Float(exactly: number!)
493-
let expectedFloat = Float(exactly: interestingValue)
473+
let float = Float(truncating: number!)
474+
let expectedFloat = interestingValue
494475
testFloat(expectedFloat, float)
495-
let double = Double(exactly: number!)
496-
let expectedDouble = Double(exactly: interestingValue)
476+
477+
let double = Double(truncating: number!)
478+
let expectedDouble = Double(reasonably: interestingValue)
497479
testDouble(expectedDouble, double)
498480
}
499481
let bridged = interestingValue._bridgeToObjectiveC()
@@ -528,11 +510,12 @@ class TestNSNumberBridging : XCTestCase {
528510
let uint = UInt(exactly: number!)
529511
XCTAssertEqual(UInt(exactly: interestingValue), uint)
530512

531-
let float = Float(exactly: number!)
532-
let expectedFloat = Float(exactly: interestingValue)
513+
let float = Float(truncating: number!)
514+
let expectedFloat = Float(reasonably: interestingValue)
533515
testFloat(expectedFloat, float)
516+
534517
let double = Double(exactly: number!)
535-
let expectedDouble = Double(exactly: interestingValue)
518+
let expectedDouble = interestingValue
536519
testDouble(expectedDouble, double)
537520
}
538521
let bridged = interestingValue._bridgeToObjectiveC()

0 commit comments

Comments
 (0)