Merge pull request #1218 from spevans/pr_sr_5871
diff --git a/Foundation.xcodeproj/project.pbxproj b/Foundation.xcodeproj/project.pbxproj
index 5461afe..424e3e4 100644
--- a/Foundation.xcodeproj/project.pbxproj
+++ b/Foundation.xcodeproj/project.pbxproj
@@ -309,6 +309,7 @@
61E011821C1B599A000037DD /* CFMachPort.c in Sources */ = {isa = PBXBuildFile; fileRef = 5B5D88D01BBC9AAC00234F36 /* CFMachPort.c */; };
63DCE9D21EAA430100E9CB02 /* ISO8601DateFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63DCE9D11EAA430100E9CB02 /* ISO8601DateFormatter.swift */; };
63DCE9D41EAA432400E9CB02 /* TestISO8601DateFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63DCE9D31EAA432400E9CB02 /* TestISO8601DateFormatter.swift */; };
+ 684C79011F62B611005BD73E /* TestNSNumberBridging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 684C79001F62B611005BD73E /* TestNSNumberBridging.swift */; };
6EB768281D18C12C00D4B719 /* UUID.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EB768271D18C12C00D4B719 /* UUID.swift */; };
7900433B1CACD33E00ECCBF1 /* TestNSCompoundPredicate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 790043391CACD33E00ECCBF1 /* TestNSCompoundPredicate.swift */; };
7900433C1CACD33E00ECCBF1 /* TestNSPredicate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7900433A1CACD33E00ECCBF1 /* TestNSPredicate.swift */; };
@@ -767,6 +768,7 @@
61F8AE7C1C180FC600FB62F0 /* TestNotificationCenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNotificationCenter.swift; sourceTree = "<group>"; };
63DCE9D11EAA430100E9CB02 /* ISO8601DateFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ISO8601DateFormatter.swift; sourceTree = "<group>"; };
63DCE9D31EAA432400E9CB02 /* TestISO8601DateFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestISO8601DateFormatter.swift; sourceTree = "<group>"; };
+ 684C79001F62B611005BD73E /* TestNSNumberBridging.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSNumberBridging.swift; sourceTree = "<group>"; };
6E203B8C1C1303BB003B2576 /* TestBundle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestBundle.swift; sourceTree = "<group>"; };
6EB768271D18C12C00D4B719 /* UUID.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UUID.swift; sourceTree = "<group>"; };
790043391CACD33E00ECCBF1 /* TestNSCompoundPredicate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSCompoundPredicate.swift; sourceTree = "<group>"; };
@@ -1459,6 +1461,7 @@
5EF673AB1C28B527006212A3 /* TestNotificationQueue.swift */,
5B6F17921C48631C00935030 /* TestNSNull.swift */,
EA66F63F1BF1619600136161 /* TestNSNumber.swift */,
+ 684C79001F62B611005BD73E /* TestNSNumberBridging.swift */,
D5C40F321CDA1D460005690C /* TestOperationQueue.swift */,
D834F9931C31C4060023812A /* TestNSOrderedSet.swift */,
BDFDF0A61DFF5B3E00C04CC5 /* TestPersonNameComponents.swift */,
@@ -2437,6 +2440,7 @@
3EA9D6701EF0532D00B362D6 /* TestJSONEncoder.swift in Sources */,
D512D17C1CD883F00032E6A5 /* TestFileHandle.swift in Sources */,
D4FE895B1D703D1100DA7986 /* TestURLRequest.swift in Sources */,
+ 684C79011F62B611005BD73E /* TestNSNumberBridging.swift in Sources */,
5B13B33A1C582D4C00651CE2 /* TestNSNumber.swift in Sources */,
5B13B3521C582D4C00651CE2 /* TestNSValue.swift in Sources */,
5B13B3311C582D4C00651CE2 /* TestIndexPath.swift in Sources */,
diff --git a/Foundation/ByteCountFormatter.swift b/Foundation/ByteCountFormatter.swift
index e268880..3234e4e 100644
--- a/Foundation/ByteCountFormatter.swift
+++ b/Foundation/ByteCountFormatter.swift
@@ -13,8 +13,6 @@
public let rawValue : UInt
public init(rawValue: UInt) { self.rawValue = rawValue }
- // This causes default units appropriate for the platform to be used. Specifying any units explicitly causes just those units to be used in showing the number.
- public static let useDefault = Units(rawValue: 0)
// Specifying any of the following causes the specified units to be used in showing the number.
public static let useBytes = Units(rawValue: 1 << 0)
public static let useKB = Units(rawValue: 1 << 1)
@@ -50,9 +48,9 @@
NSUnimplemented()
}
- /* Specify the units that can be used in the output. If ByteCountFormatter.Units.useDefault, uses platform-appropriate settings; otherwise will only use the specified units. This is the default value. Note that ZB and YB cannot be covered by the range of possible values, but you can still choose to use these units to get fractional display ("0.0035 ZB" for instance).
+ /* Specify the units that can be used in the output. If ByteCountFormatter.Units is empty, uses platform-appropriate settings; otherwise will only use the specified units. This is the default value. Note that ZB and YB cannot be covered by the range of possible values, but you can still choose to use these units to get fractional display ("0.0035 ZB" for instance).
*/
- open var allowedUnits: Units = .useDefault
+ open var allowedUnits: Units = []
/* Specify how the count is displayed by indicating the number of bytes to be used for kilobyte. The default setting is ByteCountFormatter.CountStyle.fileCount, which is the system specific value for file and storage sizes.
*/
@@ -127,52 +125,52 @@
*/
private func convertValue(fromByteCount byteCount: Int64, for byteSize: [Unit: Double]) -> String {
let byte = Double(byteCount)
- if byte == 0, allowsNonnumericFormatting, allowedUnits == .useDefault, includesUnit, includesCount {
+ if byte == 0, allowsNonnumericFormatting, allowedUnits == [], includesUnit, includesCount {
return partsToIncludeFor(value: "Zero", unit: Unit.KB)
} else if byte == 1 || byte == -1 {
- if allowedUnits.contains(.useAll) || allowedUnits == .useDefault {
+ if allowedUnits.contains(.useAll) || allowedUnits == [] {
return formatNumberFor(bytes: byte, unit: Unit.byte)
} else {
return valueToUseFor(byteCount: byte, unit: allowedUnits)
}
} else if byte < byteSize[Unit.KB]! && byte > -byteSize[Unit.KB]!{
- if allowedUnits.contains(.useAll) || allowedUnits == .useDefault {
+ if allowedUnits.contains(.useAll) || allowedUnits == [] {
return formatNumberFor(bytes: byte, unit: Unit.bytes)
} else {
return valueToUseFor(byteCount: byte, unit: allowedUnits)
}
} else if byte < byteSize[Unit.MB]! && byte > -byteSize[Unit.MB]! {
- if allowedUnits.contains(.useAll) || allowedUnits == .useDefault {
+ if allowedUnits.contains(.useAll) || allowedUnits == [] {
return divide(byte, by: byteSize, for: .KB)
}
return valueToUseFor(byteCount: byte, unit: allowedUnits)
} else if byte < byteSize[Unit.GB]! && byte > -byteSize[Unit.GB]! {
- if allowedUnits.contains(.useAll) || allowedUnits == .useDefault {
+ if allowedUnits.contains(.useAll) || allowedUnits == [] {
return divide(byte, by: byteSize, for: .MB)
}
return valueToUseFor(byteCount: byte, unit: allowedUnits)
} else if byte < byteSize[Unit.TB]! && byte > -byteSize[Unit.TB]! {
- if allowedUnits.contains(.useAll) || allowedUnits == .useDefault {
+ if allowedUnits.contains(.useAll) || allowedUnits == [] {
return divide(byte, by: byteSize, for: .GB)
}
return valueToUseFor(byteCount: byte, unit: allowedUnits)
} else if byte < byteSize[Unit.PB]! && byte > -byteSize[Unit.PB]! {
- if allowedUnits.contains(.useAll) || allowedUnits == .useDefault {
+ if allowedUnits.contains(.useAll) || allowedUnits == [] {
return divide(byte, by: byteSize, for: .TB)
}
return valueToUseFor(byteCount: byte, unit: allowedUnits)
} else if byte < byteSize[Unit.EB]! && byte > -byteSize[Unit.EB]! {
- if allowedUnits.contains(.useAll) || allowedUnits == .useDefault {
+ if allowedUnits.contains(.useAll) || allowedUnits == [] {
return divide(byte, by: byteSize, for: .PB)
}
return valueToUseFor(byteCount: byte, unit: allowedUnits)
} else {
- if allowedUnits.contains(.useAll) || allowedUnits == .useDefault {
+ if allowedUnits.contains(.useAll) || allowedUnits == [] {
return divide(byte, by: byteSize, for: .EB)
}
return valueToUseFor(byteCount: byte, unit: allowedUnits)
@@ -297,7 +295,7 @@
} else {
if lengthOfInt(number: Int(bytes)) == 3 {
numberFormatter.usesSignificantDigits = false
- numberFormatter.maximumFractionDigits = 1
+ numberFormatter.maximumFractionDigits = 0
} else {
numberFormatter.maximumSignificantDigits = 3
numberFormatter.minimumSignificantDigits = 3
@@ -376,7 +374,7 @@
} else if includesCount, includesUnit {
return "\(value) \(unit)"
} else if includesCount, !includesUnit {
- if value == "Zero", allowedUnits == .useDefault {
+ if value == "Zero", allowedUnits == [] {
return "0"
} else {
return value
diff --git a/Foundation/JSONEncoder.swift b/Foundation/JSONEncoder.swift
index 59a3844..ecafeed 100644
--- a/Foundation/JSONEncoder.swift
+++ b/Foundation/JSONEncoder.swift
@@ -65,7 +65,7 @@
/// The strategy to use for encoding `Data` values.
public enum DataEncodingStrategy {
/// Encoded the `Data` as a Base64-encoded string. This is the default strategy.
- case base64Encode
+ case base64
/// Encode the `Data` as a custom value encoded by the given closure.
///
@@ -88,8 +88,8 @@
/// The strategy to use in encoding dates. Defaults to `.deferredToDate`.
open var dateEncodingStrategy: DateEncodingStrategy = .deferredToDate
- /// The strategy to use in encoding binary data. Defaults to `.base64Encode`.
- open var dataEncodingStrategy: DataEncodingStrategy = .base64Encode
+ /// The strategy to use in encoding binary data. Defaults to `.base64`.
+ open var dataEncodingStrategy: DataEncodingStrategy = .base64
/// The strategy to use in encoding non-conforming numbers. Defaults to `.throw`.
open var nonConformingFloatEncodingStrategy: NonConformingFloatEncodingStrategy = .throw
@@ -672,7 +672,7 @@
fileprivate func box(_ data: Data) throws -> NSObject {
switch self.options.dataEncodingStrategy {
- case .base64Encode:
+ case .base64:
return NSString(string: data.base64EncodedString())
case .custom(let closure):
@@ -827,7 +827,7 @@
/// The strategy to use for decoding `Data` values.
public enum DataDecodingStrategy {
/// Decode the `Data` from a Base64-encoded string. This is the default strategy.
- case base64Decode
+ case base64
/// Decode the `Data` as a custom value decoded by the given closure.
case custom((_ decoder: Decoder) throws -> Data)
@@ -845,8 +845,8 @@
/// The strategy to use in decoding dates. Defaults to `.deferredToDate`.
open var dateDecodingStrategy: DateDecodingStrategy = .deferredToDate
- /// The strategy to use in decoding binary data. Defaults to `.base64Decode`.
- open var dataDecodingStrategy: DataDecodingStrategy = .base64Decode
+ /// The strategy to use in decoding binary data. Defaults to `.base64`.
+ open var dataDecodingStrategy: DataDecodingStrategy = .base64
/// The strategy to use in decoding non-conforming numbers. Defaults to `.throw`.
open var nonConformingFloatDecodingStrategy: NonConformingFloatDecodingStrategy = .throw
@@ -2042,7 +2042,7 @@
guard !(value is NSNull) else { return nil }
switch self.options.dataDecodingStrategy {
- case .base64Decode:
+ case .base64:
guard let string = value as? String else {
throw DecodingError._typeMismatch(at: self.codingPath, expectation: type, reality: value)
}
diff --git a/Foundation/NSKeyedUnarchiver.swift b/Foundation/NSKeyedUnarchiver.swift
index b977cc8..d75a664 100644
--- a/Foundation/NSKeyedUnarchiver.swift
+++ b/Foundation/NSKeyedUnarchiver.swift
@@ -86,7 +86,7 @@
return root
}
- public convenience init(forReadingWithData data: Data) {
+ public convenience init(forReadingWith data: Data) {
self.init(stream: Stream.data(data))
}
@@ -863,7 +863,7 @@
}
open class func unarchiveTopLevelObjectWithData(_ data: Data) throws -> Any? {
- let keyedUnarchiver = NSKeyedUnarchiver(forReadingWithData: data)
+ let keyedUnarchiver = NSKeyedUnarchiver(forReadingWith: data)
let root = try keyedUnarchiver.decodeTopLevelObject(forKey: NSKeyedArchiveRootObjectKey)
keyedUnarchiver.finishDecoding()
return root
diff --git a/Foundation/NSNumber.swift b/Foundation/NSNumber.swift
index 11e5cdc..7dc8cc8 100644
--- a/Foundation/NSNumber.swift
+++ b/Foundation/NSNumber.swift
@@ -32,158 +32,523 @@
internal let kCFNumberSInt128Type: CFNumberType = 17
#endif
+extension Int8 : _ObjectTypeBridgeable {
+ @available(swift, deprecated: 4, renamed: "init(truncating:)")
+ public init(_ number: NSNumber) {
+ self = number.int8Value
+ }
+
+ public init(truncating number: NSNumber) {
+ self = number.int8Value
+ }
+
+ public init?(exactly number: NSNumber) {
+ let value = number.int8Value
+ guard NSNumber(value: value) == number else { return nil }
+ self = value
+ }
+
+ public func _bridgeToObjectiveC() -> NSNumber {
+ return NSNumber(value: self)
+ }
+
+ public static func _forceBridgeFromObjectiveC(_ x: NSNumber, result: inout Int8?) {
+ result = _unconditionallyBridgeFromObjectiveC(x)
+ }
+
+ public static func _conditionallyBridgeFromObjectiveC(_ x: NSNumber, result: inout Int8?) -> Bool {
+ guard let value = Int8(exactly: x) else { return false }
+ result = value
+ return true
+ }
+
+ public static func _unconditionallyBridgeFromObjectiveC(_ source: NSNumber?) -> Int8 {
+ var result: Int8?
+ guard let src = source else { return Int8(0) }
+ guard _conditionallyBridgeFromObjectiveC(src, result: &result) else { return Int8(0) }
+ return result!
+ }
+}
+
+extension UInt8 : _ObjectTypeBridgeable {
+ @available(swift, deprecated: 4, renamed: "init(truncating:)")
+ public init(_ number: NSNumber) {
+ self = number.uint8Value
+ }
+
+ public init(truncating number: NSNumber) {
+ self = number.uint8Value
+ }
+
+ public init?(exactly number: NSNumber) {
+ let value = number.uint8Value
+ guard NSNumber(value: value) == number else { return nil }
+ self = value
+ }
+
+ public func _bridgeToObjectiveC() -> NSNumber {
+ return NSNumber(value: self)
+ }
+
+ public static func _forceBridgeFromObjectiveC(_ x: NSNumber, result: inout UInt8?) {
+ result = _unconditionallyBridgeFromObjectiveC(x)
+ }
+
+ public static func _conditionallyBridgeFromObjectiveC(_ x: NSNumber, result: inout UInt8?) -> Bool {
+ guard let value = UInt8(exactly: x) else { return false }
+ result = value
+ return true
+ }
+
+ public static func _unconditionallyBridgeFromObjectiveC(_ source: NSNumber?) -> UInt8 {
+ var result: UInt8?
+ guard let src = source else { return UInt8(0) }
+ guard _conditionallyBridgeFromObjectiveC(src, result: &result) else { return UInt8(0) }
+ return result!
+ }
+}
+
+extension Int16 : _ObjectTypeBridgeable {
+ @available(swift, deprecated: 4, renamed: "init(truncating:)")
+ public init(_ number: NSNumber) {
+ self = number.int16Value
+ }
+
+ public init(truncating number: NSNumber) {
+ self = number.int16Value
+ }
+
+ public init?(exactly number: NSNumber) {
+ let value = number.int16Value
+ guard NSNumber(value: value) == number else { return nil }
+ self = value
+ }
+
+ public func _bridgeToObjectiveC() -> NSNumber {
+ return NSNumber(value: self)
+ }
+
+ public static func _forceBridgeFromObjectiveC(_ x: NSNumber, result: inout Int16?) {
+ result = _unconditionallyBridgeFromObjectiveC(x)
+ }
+
+ public static func _conditionallyBridgeFromObjectiveC(_ x: NSNumber, result: inout Int16?) -> Bool {
+ guard let value = Int16(exactly: x) else { return false }
+ result = value
+ return true
+ }
+
+ public static func _unconditionallyBridgeFromObjectiveC(_ source: NSNumber?) -> Int16 {
+ var result: Int16?
+ guard let src = source else { return Int16(0) }
+ guard _conditionallyBridgeFromObjectiveC(src, result: &result) else { return Int16(0) }
+ return result!
+ }
+}
+
+extension UInt16 : _ObjectTypeBridgeable {
+ @available(swift, deprecated: 4, renamed: "init(truncating:)")
+ public init(_ number: NSNumber) {
+ self = number.uint16Value
+ }
+
+ public init(truncating number: NSNumber) {
+ self = number.uint16Value
+ }
+
+ public init?(exactly number: NSNumber) {
+ let value = number.uint16Value
+ guard NSNumber(value: value) == number else { return nil }
+ self = value
+ }
+
+ public func _bridgeToObjectiveC() -> NSNumber {
+ return NSNumber(value: self)
+ }
+
+ public static func _forceBridgeFromObjectiveC(_ x: NSNumber, result: inout UInt16?) {
+ result = _unconditionallyBridgeFromObjectiveC(x)
+ }
+
+ public static func _conditionallyBridgeFromObjectiveC(_ x: NSNumber, result: inout UInt16?) -> Bool {
+ guard let value = UInt16(exactly: x) else { return false }
+ result = value
+ return true
+ }
+
+ public static func _unconditionallyBridgeFromObjectiveC(_ source: NSNumber?) -> UInt16 {
+ var result: UInt16?
+ guard let src = source else { return UInt16(0) }
+ guard _conditionallyBridgeFromObjectiveC(src, result: &result) else { return UInt16(0) }
+ return result!
+ }
+}
+
+extension Int32 : _ObjectTypeBridgeable {
+ @available(swift, deprecated: 4, renamed: "init(truncating:)")
+ public init(_ number: NSNumber) {
+ self = number.int32Value
+ }
+
+ public init(truncating number: NSNumber) {
+ self = number.int32Value
+ }
+
+ public init?(exactly number: NSNumber) {
+ let value = number.int32Value
+ guard NSNumber(value: value) == number else { return nil }
+ self = value
+ }
+
+ public func _bridgeToObjectiveC() -> NSNumber {
+ return NSNumber(value: self)
+ }
+
+ public static func _forceBridgeFromObjectiveC(_ x: NSNumber, result: inout Int32?) {
+ result = _unconditionallyBridgeFromObjectiveC(x)
+ }
+
+ public static func _conditionallyBridgeFromObjectiveC(_ x: NSNumber, result: inout Int32?) -> Bool {
+ guard let value = Int32(exactly: x) else { return false }
+ result = value
+ return true
+ }
+
+ public static func _unconditionallyBridgeFromObjectiveC(_ source: NSNumber?) -> Int32 {
+ var result: Int32?
+ guard let src = source else { return Int32(0) }
+ guard _conditionallyBridgeFromObjectiveC(src, result: &result) else { return Int32(0) }
+ return result!
+ }
+}
+
+extension UInt32 : _ObjectTypeBridgeable {
+ @available(swift, deprecated: 4, renamed: "init(truncating:)")
+ public init(_ number: NSNumber) {
+ self = number.uint32Value
+ }
+
+ public init(truncating number: NSNumber) {
+ self = number.uint32Value
+ }
+
+ public init?(exactly number: NSNumber) {
+ let value = number.uint32Value
+ guard NSNumber(value: value) == number else { return nil }
+ self = value
+ }
+
+ public func _bridgeToObjectiveC() -> NSNumber {
+ return NSNumber(value: self)
+ }
+
+ public static func _forceBridgeFromObjectiveC(_ x: NSNumber, result: inout UInt32?) {
+ result = _unconditionallyBridgeFromObjectiveC(x)
+ }
+
+ public static func _conditionallyBridgeFromObjectiveC(_ x: NSNumber, result: inout UInt32?) -> Bool {
+ guard let value = UInt32(exactly: x) else { return false }
+ result = value
+ return true
+ }
+
+ public static func _unconditionallyBridgeFromObjectiveC(_ source: NSNumber?) -> UInt32 {
+ var result: UInt32?
+ guard let src = source else { return UInt32(0) }
+ guard _conditionallyBridgeFromObjectiveC(src, result: &result) else { return UInt32(0) }
+ return result!
+ }
+}
+
+extension Int64 : _ObjectTypeBridgeable {
+ @available(swift, deprecated: 4, renamed: "init(truncating:)")
+ public init(_ number: NSNumber) {
+ self = number.int64Value
+ }
+
+ public init(truncating number: NSNumber) {
+ self = number.int64Value
+ }
+
+ public init?(exactly number: NSNumber) {
+ let value = number.int64Value
+ guard NSNumber(value: value) == number else { return nil }
+ self = value
+ }
+
+ public func _bridgeToObjectiveC() -> NSNumber {
+ return NSNumber(value: self)
+ }
+
+ public static func _forceBridgeFromObjectiveC(_ x: NSNumber, result: inout Int64?) {
+ result = _unconditionallyBridgeFromObjectiveC(x)
+ }
+
+ public static func _conditionallyBridgeFromObjectiveC(_ x: NSNumber, result: inout Int64?) -> Bool {
+ guard let value = Int64(exactly: x) else { return false }
+ result = value
+ return true
+ }
+
+ public static func _unconditionallyBridgeFromObjectiveC(_ source: NSNumber?) -> Int64 {
+ var result: Int64?
+ guard let src = source else { return Int64(0) }
+ guard _conditionallyBridgeFromObjectiveC(src, result: &result) else { return Int64(0) }
+ return result!
+ }
+}
+
+extension UInt64 : _ObjectTypeBridgeable {
+ @available(swift, deprecated: 4, renamed: "init(truncating:)")
+ public init(_ number: NSNumber) {
+ self = number.uint64Value
+ }
+
+ public init(truncating number: NSNumber) {
+ self = number.uint64Value
+ }
+
+ public init?(exactly number: NSNumber) {
+ let value = number.uint64Value
+ guard NSNumber(value: value) == number else { return nil }
+ self = value
+ }
+
+ public func _bridgeToObjectiveC() -> NSNumber {
+ return NSNumber(value: self)
+ }
+
+ public static func _forceBridgeFromObjectiveC(_ x: NSNumber, result: inout UInt64?) {
+ result = _unconditionallyBridgeFromObjectiveC(x)
+ }
+
+ public static func _conditionallyBridgeFromObjectiveC(_ x: NSNumber, result: inout UInt64?) -> Bool {
+ guard let value = UInt64(exactly: x) else { return false }
+ result = value
+ return true
+ }
+
+ public static func _unconditionallyBridgeFromObjectiveC(_ source: NSNumber?) -> UInt64 {
+ var result: UInt64?
+ guard let src = source else { return UInt64(0) }
+ guard _conditionallyBridgeFromObjectiveC(src, result: &result) else { return UInt64(0) }
+ return result!
+ }
+}
+
extension Int : _ObjectTypeBridgeable {
+ @available(swift, deprecated: 4, renamed: "init(truncating:)")
public init(_ number: NSNumber) {
self = number.intValue
}
-
- public typealias _ObjectType = NSNumber
- public func _bridgeToObjectiveC() -> _ObjectType {
+
+ public init(truncating number: NSNumber) {
+ self = number.intValue
+ }
+
+ public init?(exactly number: NSNumber) {
+ let value = number.intValue
+ guard NSNumber(value: value) == number else { return nil }
+ self = value
+ }
+
+ public func _bridgeToObjectiveC() -> NSNumber {
return NSNumber(value: self)
}
- static public func _forceBridgeFromObjectiveC(_ source: _ObjectType, result: inout Int?) {
- result = _unconditionallyBridgeFromObjectiveC(source)
+ public static func _forceBridgeFromObjectiveC(_ x: NSNumber, result: inout Int?) {
+ result = _unconditionallyBridgeFromObjectiveC(x)
}
- @discardableResult
- static public func _conditionallyBridgeFromObjectiveC(_ source: _ObjectType, result: inout Int?) -> Bool {
- result = source.intValue
+ public static func _conditionallyBridgeFromObjectiveC(_ x: NSNumber, result: inout Int?) -> Bool {
+ guard let value = Int(exactly: x) else { return false }
+ result = value
return true
}
- static public func _unconditionallyBridgeFromObjectiveC(_ source: _ObjectType?) -> Int {
- if let object = source {
- var value: Int?
- _conditionallyBridgeFromObjectiveC(object, result: &value)
- return value!
- } else {
- return 0
- }
+ public static func _unconditionallyBridgeFromObjectiveC(_ source: NSNumber?) -> Int {
+ var result: Int?
+ guard let src = source else { return Int(0) }
+ guard _conditionallyBridgeFromObjectiveC(src, result: &result) else { return Int(0) }
+ return result!
}
}
extension UInt : _ObjectTypeBridgeable {
+ @available(swift, deprecated: 4, renamed: "init(truncating:)")
public init(_ number: NSNumber) {
self = number.uintValue
}
- public typealias _ObjectType = NSNumber
- public func _bridgeToObjectiveC() -> _ObjectType {
+ public init(truncating number: NSNumber) {
+ self = number.uintValue
+ }
+
+ public init?(exactly number: NSNumber) {
+ let value = number.uintValue
+ guard NSNumber(value: value) == number else { return nil }
+ self = value
+ }
+
+ public func _bridgeToObjectiveC() -> NSNumber {
return NSNumber(value: self)
}
- static public func _forceBridgeFromObjectiveC(_ source: _ObjectType, result: inout UInt?) {
- result = _unconditionallyBridgeFromObjectiveC(source)
+ public static func _forceBridgeFromObjectiveC(_ x: NSNumber, result: inout UInt?) {
+ result = _unconditionallyBridgeFromObjectiveC(x)
}
- @discardableResult
- static public func _conditionallyBridgeFromObjectiveC(_ source: _ObjectType, result: inout UInt?) -> Bool {
- result = source.uintValue
+ public static func _conditionallyBridgeFromObjectiveC(_ x: NSNumber, result: inout UInt?) -> Bool {
+ guard let value = UInt(exactly: x) else { return false }
+ result = value
return true
}
- static public func _unconditionallyBridgeFromObjectiveC(_ source: _ObjectType?) -> UInt {
- if let object = source {
- var value: UInt?
- _conditionallyBridgeFromObjectiveC(object, result: &value)
- return value!
- } else {
- return 0
- }
+ public static func _unconditionallyBridgeFromObjectiveC(_ source: NSNumber?) -> UInt {
+ var result: UInt?
+ guard let src = source else { return UInt(0) }
+ guard _conditionallyBridgeFromObjectiveC(src, result: &result) else { return UInt(0) }
+ return result!
}
}
extension Float : _ObjectTypeBridgeable {
+ @available(swift, deprecated: 4, renamed: "init(truncating:)")
public init(_ number: NSNumber) {
self = number.floatValue
}
-
- public typealias _ObjectType = NSNumber
- public func _bridgeToObjectiveC() -> _ObjectType {
+
+ public init(truncating number: NSNumber) {
+ self = number.floatValue
+ }
+
+ public init?(exactly number: NSNumber) {
+ guard let value = Double(exactly: number) else { return nil }
+ guard let result = Float(exactly: value) else { return nil }
+ self = result
+ }
+
+ public func _bridgeToObjectiveC() -> NSNumber {
return NSNumber(value: self)
}
- static public func _forceBridgeFromObjectiveC(_ source: _ObjectType, result: inout Float?) {
- result = _unconditionallyBridgeFromObjectiveC(source)
+ public static func _forceBridgeFromObjectiveC(_ x: NSNumber, result: inout Float?) {
+ result = _unconditionallyBridgeFromObjectiveC(x)
}
- @discardableResult
- static public func _conditionallyBridgeFromObjectiveC(_ source: _ObjectType, result: inout Float?) -> Bool {
- result = source.floatValue
+ public static func _conditionallyBridgeFromObjectiveC(_ x: NSNumber, result: inout Float?) -> Bool {
+ guard let value = Double(exactly: x) else { return false }
+ guard !value.isNaN else {
+ result = Float.nan
+ return true
+ }
+ guard !value.isInfinite else {
+ if value.sign == .minus {
+ result = -Float.infinity
+ } else {
+ result = Float.infinity
+ }
+ return true
+ }
+ guard Swift.abs(value) <= Double(Float.greatestFiniteMagnitude) else {
+ return false
+ }
+
+ result = Float(value)
return true
}
- static public func _unconditionallyBridgeFromObjectiveC(_ source: _ObjectType?) -> Float {
- if let object = source {
- var value: Float?
- _conditionallyBridgeFromObjectiveC(object, result: &value)
- return value!
- } else {
- return 0.0
- }
+ public static func _unconditionallyBridgeFromObjectiveC(_ source: NSNumber?) -> Float {
+ var result: Float?
+ guard let src = source else { return Float(0) }
+ guard _conditionallyBridgeFromObjectiveC(src, result: &result) else { return Float(0) }
+ return result!
}
}
extension Double : _ObjectTypeBridgeable {
+ @available(swift, deprecated: 4, renamed: "init(truncating:)")
public init(_ number: NSNumber) {
self = number.doubleValue
}
-
- public typealias _ObjectType = NSNumber
- public func _bridgeToObjectiveC() -> _ObjectType {
+
+ public init(truncating number: NSNumber) {
+ self = number.doubleValue
+ }
+
+ public init?(exactly number: NSNumber) {
+ let type = number.objCType.pointee
+ if type == 0x51 {
+ guard let result = Double(exactly: number.uint64Value) else { return nil }
+ self = result
+ } else if type == 0x71 {
+ guard let result = Double(exactly: number.int64Value) else { return nil }
+ self = result
+ } else {
+ self = number.doubleValue
+ }
+ }
+
+ public func _bridgeToObjectiveC() -> NSNumber {
return NSNumber(value: self)
}
- static public func _forceBridgeFromObjectiveC(_ source: _ObjectType, result: inout Double?) {
- result = _unconditionallyBridgeFromObjectiveC(source)
+ public static func _forceBridgeFromObjectiveC(_ x: NSNumber, result: inout Double?) {
+ result = _unconditionallyBridgeFromObjectiveC(x)
}
- @discardableResult
- static public func _conditionallyBridgeFromObjectiveC(_ source: _ObjectType, result: inout Double?) -> Bool {
- result = source.doubleValue
+ public static func _conditionallyBridgeFromObjectiveC(_ x: NSNumber, result: inout Double?) -> Bool {
+ guard let value = Double(exactly: x) else { return false }
+ result = value
return true
}
- static public func _unconditionallyBridgeFromObjectiveC(_ source: _ObjectType?) -> Double {
- if let object = source {
- var value: Double?
- _conditionallyBridgeFromObjectiveC(object, result: &value)
- return value!
- } else {
- return 0.0
- }
+ public static func _unconditionallyBridgeFromObjectiveC(_ source: NSNumber?) -> Double {
+ var result: Double?
+ guard let src = source else { return Double(0) }
+ guard _conditionallyBridgeFromObjectiveC(src, result: &result) else { return Double(0) }
+ return result!
}
}
extension Bool : _ObjectTypeBridgeable {
+ @available(swift, deprecated: 4, renamed: "init(truncating:)")
public init(_ number: NSNumber) {
self = number.boolValue
}
-
- public typealias _ObjectType = NSNumber
- public func _bridgeToObjectiveC() -> _ObjectType {
+
+ public init(truncating number: NSNumber) {
+ self = number.boolValue
+ }
+
+ public init?(exactly number: NSNumber) {
+ if number === kCFBooleanTrue || NSNumber(value: 1) == number {
+ self = true
+ } else if number === kCFBooleanFalse || NSNumber(value: 0) == number {
+ self = false
+ } else {
+ return nil
+ }
+ }
+
+ public func _bridgeToObjectiveC() -> NSNumber {
return unsafeBitCast(self ? kCFBooleanTrue : kCFBooleanFalse, to: NSNumber.self)
}
- static public func _forceBridgeFromObjectiveC(_ source: _ObjectType, result: inout Bool?) {
- result = _unconditionallyBridgeFromObjectiveC(source)
+ public static func _forceBridgeFromObjectiveC(_ x: NSNumber, result: inout Bool?) {
+ result = _unconditionallyBridgeFromObjectiveC(x)
}
- @discardableResult
- static public func _conditionallyBridgeFromObjectiveC(_ source: _ObjectType, result: inout Bool?) -> Bool {
- result = source.boolValue
+ public static func _conditionallyBridgeFromObjectiveC(_ x: NSNumber, result: inout Bool?) -> Bool {
+ result = x.boolValue
return true
}
- static public func _unconditionallyBridgeFromObjectiveC(_ source: _ObjectType?) -> Bool {
- if let object = source {
- var value: Bool?
- _conditionallyBridgeFromObjectiveC(object, result: &value)
- return value!
- } else {
- return false
- }
+ public static func _unconditionallyBridgeFromObjectiveC(_ source: NSNumber?) -> Bool {
+ var result: Bool?
+ guard let src = source else { return false }
+ guard _conditionallyBridgeFromObjectiveC(src, result: &result) else { return false }
+ return result!
}
}
diff --git a/Foundation/NSString.swift b/Foundation/NSString.swift
index 54fe91f..26c45b5 100644
--- a/Foundation/NSString.swift
+++ b/Foundation/NSString.swift
@@ -1221,18 +1221,6 @@
free(bytes)
}
}
-
- public convenience init?(CString nullTerminatedCString: UnsafePointer<Int8>, encoding: UInt) {
- guard let cf = CFStringCreateWithCString(kCFAllocatorSystemDefault, nullTerminatedCString, CFStringConvertNSStringEncodingToEncoding(encoding)) else {
- return nil
- }
- var str: String?
- if String._conditionallyBridgeFromObjectiveC(cf._nsObject, result: &str) {
- self.init(str!)
- } else {
- return nil
- }
- }
public convenience init(contentsOf url: URL, encoding enc: UInt) throws {
let readResult = try NSData(contentsOf: url, options: [])
diff --git a/Foundation/NSTextCheckingResult.swift b/Foundation/NSTextCheckingResult.swift
index caed9a8..74dd8c0 100644
--- a/Foundation/NSTextCheckingResult.swift
+++ b/Foundation/NSTextCheckingResult.swift
@@ -87,7 +87,7 @@
extension NSTextCheckingResult {
- public func resultByAdjustingRangesWithOffset(_ offset: Int) -> NSTextCheckingResult {
+ public func adjustingRanges(offset: Int) -> NSTextCheckingResult {
let count = self.numberOfRanges
var newRanges = [NSRange]()
for idx in 0..<count {
diff --git a/Foundation/Stream.swift b/Foundation/Stream.swift
index 84dc566..d34949d 100644
--- a/Foundation/Stream.swift
+++ b/Foundation/Stream.swift
@@ -119,7 +119,7 @@
// reads up to length bytes into the supplied buffer, which must be at least of size len. Returns the actual number of bytes read.
open func read(_ buffer: UnsafeMutablePointer<UInt8>, maxLength len: Int) -> Int {
- return CFReadStreamRead(_stream, buffer, CFIndex(len._bridgeToObjectiveC()))
+ return CFReadStreamRead(_stream, buffer, len)
}
// returns in O(1) a pointer to the buffer in 'buffer' and by reference in 'len' how many bytes are available. This buffer is only valid until the next stream operation. Subclassers may return NO for this if it is not appropriate for the stream type. This may return NO if the buffer is not available.
diff --git a/Foundation/URLSession/URLSession.swift b/Foundation/URLSession/URLSession.swift
index 7690cc4..8e707b3 100644
--- a/Foundation/URLSession/URLSession.swift
+++ b/Foundation/URLSession/URLSession.swift
@@ -137,11 +137,6 @@
/// - SeeAlso: https://curl.haxx.se/libcurl/c/threadsafe.html
/// - SeeAlso: URLSession+libcurl.swift
///
-/// The (publicly accessible) attributes of an `URLSessionTask` are made thread
-/// safe by using a concurrent libdispatch queue and only doing writes with a
-/// barrier while allowing concurrent reads. A single queue is shared for all
-/// tasks of a given session for this isolation. C.f. `taskAttributesIsolation`.
-///
/// ## HTTP and RFC 2616
///
/// Most of HTTP is defined in [RFC 2616](https://tools.ietf.org/html/rfc2616).
@@ -194,9 +189,6 @@
fileprivate let multiHandle: _MultiHandle
fileprivate var nextTaskIdentifier = 1
internal let workQueue: DispatchQueue
- /// This queue is used to make public attributes on `URLSessionTask` instances thread safe.
- /// - Note: It's a **concurrent** queue.
- internal let taskAttributesIsolation: DispatchQueue
internal let taskRegistry = URLSession._TaskRegistry()
fileprivate let identifier: Int32
fileprivate var invalidated = false
@@ -222,7 +214,6 @@
initializeLibcurl()
identifier = nextSessionIdentifier()
self.workQueue = DispatchQueue(label: "URLSession<\(identifier)>")
- self.taskAttributesIsolation = DispatchQueue(label: "URLSession<\(identifier)>.taskAttributes", attributes: DispatchQueue.Attributes.concurrent)
self.delegateQueue = OperationQueue()
self.delegateQueue.maxConcurrentOperationCount = 1
self.delegate = nil
@@ -245,7 +236,6 @@
initializeLibcurl()
identifier = nextSessionIdentifier()
self.workQueue = DispatchQueue(label: "URLSession<\(identifier)>")
- self.taskAttributesIsolation = DispatchQueue(label: "URLSession<\(identifier)>.taskAttributes", attributes: DispatchQueue.Attributes.concurrent)
if let _queue = queue {
self.delegateQueue = _queue
} else {
diff --git a/TestFoundation/HTTPServer.swift b/TestFoundation/HTTPServer.swift
index f52b771..ec2055f 100644
--- a/TestFoundation/HTTPServer.swift
+++ b/TestFoundation/HTTPServer.swift
@@ -16,15 +16,19 @@
#if DEPLOYMENT_RUNTIME_OBJC || os(Linux)
import Foundation
- import Glibc
import XCTest
#else
- import CoreFoundation
import SwiftFoundation
- import Darwin
import SwiftXCTest
#endif
+#if os(OSX) || os(iOS)
+ import Darwin
+#elseif os(Linux)
+ import Glibc
+#endif
+
+
public let globalDispatchQueue = DispatchQueue.global()
public let dispatchQueueMake: (String) -> DispatchQueue = { DispatchQueue.init(label: $0) }
public let dispatchGroupMake: () -> DispatchGroup = DispatchGroup.init
@@ -97,10 +101,11 @@
// Listen on the loopback address so that OSX doesnt pop up a dialog
// asking to accept incoming connections if the firewall is enabled.
let addr = UInt32(INADDR_LOOPBACK).bigEndian
+ let netPort = UInt16(bigEndian: port ?? 0)
#if os(Linux)
- return sockaddr_in(sin_family: sa_family_t(AF_INET), sin_port: htons(port ?? 0), sin_addr: in_addr(s_addr: addr), sin_zero: (0,0,0,0,0,0,0,0))
+ return sockaddr_in(sin_family: sa_family_t(AF_INET), sin_port: netPort, sin_addr: in_addr(s_addr: addr), sin_zero: (0,0,0,0,0,0,0,0))
#else
- return sockaddr_in(sin_len: 0, sin_family: sa_family_t(AF_INET), sin_port: CFSwapInt16HostToBig(port ?? 0), sin_addr: in_addr(s_addr: addr), sin_zero: (0,0,0,0,0,0,0,0))
+ return sockaddr_in(sin_len: 0, sin_family: sa_family_t(AF_INET), sin_port: netPort, sin_addr: in_addr(s_addr: addr), sin_zero: (0,0,0,0,0,0,0,0))
#endif
}
diff --git a/TestFoundation/TestByteCountFormatter.swift b/TestFoundation/TestByteCountFormatter.swift
index 8046a0f..c077266 100644
--- a/TestFoundation/TestByteCountFormatter.swift
+++ b/TestFoundation/TestByteCountFormatter.swift
@@ -49,7 +49,7 @@
func test_DefaultValues() {
let formatter = ByteCountFormatter()
- XCTAssertEqual(formatter.allowedUnits, ByteCountFormatter.Units.useDefault)
+ XCTAssertEqual(formatter.allowedUnits, [])
XCTAssertEqual(formatter.countStyle, ByteCountFormatter.CountStyle.file)
XCTAssertEqual(formatter.allowsNonnumericFormatting, true)
XCTAssertEqual(formatter.includesUnit, true)
@@ -68,7 +68,7 @@
formatter.allowedUnits = .useGB
XCTAssertEqual(formatter.string(fromByteCount: 0), "Zero KB")
- formatter.allowedUnits = .useDefault
+ formatter.allowedUnits = []
formatter.allowsNonnumericFormatting = false
XCTAssertEqual(formatter.string(fromByteCount: 0), "0 bytes")
@@ -91,7 +91,7 @@
formatter.allowedUnits = .useGB
XCTAssertEqual(formatter.string(fromByteCount: 1), "0 GB")
- formatter.allowedUnits = .useDefault
+ formatter.allowedUnits = []
formatter.isAdaptive = false
XCTAssertEqual(formatter.string(fromByteCount: 1), "1 byte")
@@ -365,7 +365,7 @@
XCTAssertEqual(formatter.string(fromByteCount: 11999), "12.0 KB")
XCTAssertEqual(formatter.string(fromByteCount: 900000), "900 KB")
XCTAssertEqual(formatter.string(fromByteCount: 12345678), "12.3 MB")
- XCTAssertEqual(formatter.string(fromByteCount: 123456789), "123.5 MB")
+ XCTAssertEqual(formatter.string(fromByteCount: 123456789), "123 MB")
XCTAssertEqual(formatter.string(fromByteCount: 1234567898), "1.23 GB")
XCTAssertEqual(formatter.string(fromByteCount: 12345678987), "12.3 GB")
}
diff --git a/TestFoundation/TestCalendar.swift b/TestFoundation/TestCalendar.swift
index 07198f2..0e90ace 100644
--- a/TestFoundation/TestCalendar.swift
+++ b/TestFoundation/TestCalendar.swift
@@ -14,7 +14,6 @@
import SwiftFoundation
import SwiftXCTest
#endif
-import CoreFoundation
class TestCalendar: XCTestCase {
diff --git a/TestFoundation/TestDecimal.swift b/TestFoundation/TestDecimal.swift
index 3839d53..f626e1e 100644
--- a/TestFoundation/TestDecimal.swift
+++ b/TestFoundation/TestDecimal.swift
@@ -404,7 +404,7 @@
XCTAssertNotEqual(.noError, NSDecimalMultiplyByPowerOf10(&result, &NaN, 5, .plain))
XCTAssertTrue(NSDecimalIsNotANumber(&result), "NaN e5")
- XCTAssertFalse(Double(NSDecimalNumber(decimal:Decimal(0))).isNaN)
+ XCTAssertFalse(Double(truncating: NSDecimalNumber(decimal: Decimal(0))).isNaN)
}
func test_NegativeAndZeroMultiplication() {
diff --git a/TestFoundation/TestJSONEncoder.swift b/TestFoundation/TestJSONEncoder.swift
index 842eb52..76dc81a 100644
--- a/TestFoundation/TestJSONEncoder.swift
+++ b/TestFoundation/TestJSONEncoder.swift
@@ -446,8 +446,8 @@
outputFormatting: JSONEncoder.OutputFormatting = [],
dateEncodingStrategy: JSONEncoder.DateEncodingStrategy = .deferredToDate,
dateDecodingStrategy: JSONDecoder.DateDecodingStrategy = .deferredToDate,
- dataEncodingStrategy: JSONEncoder.DataEncodingStrategy = .base64Encode,
- dataDecodingStrategy: JSONDecoder.DataDecodingStrategy = .base64Decode,
+ dataEncodingStrategy: JSONEncoder.DataEncodingStrategy = .base64,
+ dataDecodingStrategy: JSONDecoder.DataDecodingStrategy = .base64,
nonConformingFloatEncodingStrategy: JSONEncoder.NonConformingFloatEncodingStrategy = .throw,
nonConformingFloatDecodingStrategy: JSONDecoder.NonConformingFloatDecodingStrategy = .throw) where T : Codable, T : Equatable {
var payload: Data! = nil
diff --git a/TestFoundation/TestNSGeometry.swift b/TestFoundation/TestNSGeometry.swift
index 9367431..953bdd8 100644
--- a/TestFoundation/TestNSGeometry.swift
+++ b/TestFoundation/TestNSGeometry.swift
@@ -11,7 +11,6 @@
#if DEPLOYMENT_RUNTIME_OBJC || os(Linux)
import Foundation
import XCTest
- import CoreFoundation
#else
import SwiftFoundation
import SwiftXCTest
diff --git a/TestFoundation/TestNSKeyedArchiver.swift b/TestFoundation/TestNSKeyedArchiver.swift
index 32fd2b6..1a03419 100644
--- a/TestFoundation/TestNSKeyedArchiver.swift
+++ b/TestFoundation/TestNSKeyedArchiver.swift
@@ -118,7 +118,7 @@
XCTAssertTrue(encode(archiver))
archiver.finishEncoding()
- let unarchiver = NSKeyedUnarchiver(forReadingWithData: Data._unconditionallyBridgeFromObjectiveC(data))
+ let unarchiver = NSKeyedUnarchiver(forReadingWith: Data._unconditionallyBridgeFromObjectiveC(data))
XCTAssertTrue(decode(unarchiver))
// Archiving using the default initializer
@@ -127,10 +127,10 @@
XCTAssertTrue(encode(archiver1))
let archivedData = archiver1.encodedData
- let unarchiver1 = NSKeyedUnarchiver(forReadingWithData: archivedData)
+ let unarchiver1 = NSKeyedUnarchiver(forReadingWith: archivedData)
XCTAssertTrue(decode(unarchiver1))
}
-
+
private func test_archive(_ object: Any, classes: [AnyClass], allowsSecureCoding: Bool = true, outputFormat: PropertyListSerialization.PropertyListFormat) {
test_archive({ archiver -> Bool in
archiver.requiresSecureCoding = allowsSecureCoding
diff --git a/TestFoundation/TestNSNumberBridging.swift b/TestFoundation/TestNSNumberBridging.swift
new file mode 100644
index 0000000..3edcbaf
--- /dev/null
+++ b/TestFoundation/TestNSNumberBridging.swift
@@ -0,0 +1,866 @@
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See http://swift.org/LICENSE.txt for license information
+// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+
+
+#if DEPLOYMENT_RUNTIME_OBJC || os(Linux)
+import Foundation
+import XCTest
+#else
+import SwiftFoundation
+import SwiftXCTest
+#endif
+
+class TestNSNumberBridging : XCTestCase {
+ static var allTests: [(String, (TestNSNumberBridging) -> () throws -> Void)] {
+ return [
+ ("testNSNumberBridgeFromInt8", testNSNumberBridgeFromInt8),
+ ("testNSNumberBridgeFromUInt8", testNSNumberBridgeFromUInt8),
+ ("testNSNumberBridgeFromInt16", testNSNumberBridgeFromInt16),
+ ("testNSNumberBridgeFromUInt16", testNSNumberBridgeFromUInt16),
+ ("testNSNumberBridgeFromInt32", testNSNumberBridgeFromInt32),
+ ("testNSNumberBridgeFromUInt32", testNSNumberBridgeFromUInt32),
+ ("testNSNumberBridgeFromInt64", testNSNumberBridgeFromInt64),
+ ("testNSNumberBridgeFromUInt64", testNSNumberBridgeFromUInt64),
+ ("testNSNumberBridgeFromInt", testNSNumberBridgeFromInt),
+ ("testNSNumberBridgeFromUInt", testNSNumberBridgeFromUInt),
+ ("testNSNumberBridgeFromFloat", testNSNumberBridgeFromFloat),
+ ("testNSNumberBridgeFromDouble", testNSNumberBridgeFromDouble),
+ ("test_numericBitPatterns_to_floatingPointTypes", test_numericBitPatterns_to_floatingPointTypes),
+ ("testNSNumberBridgeAnyHashable", testNSNumberBridgeAnyHashable),
+ ]
+ }
+
+ func testFloat(_ lhs: Float?, _ rhs: Float?, file: String = #file, line: UInt = #line) {
+ let message = "\(file):\(line) \(String(describing: lhs)) != \(String(describing: rhs)) Float"
+ if let lhsValue = lhs {
+ if let rhsValue = rhs {
+ if lhsValue.isNaN != rhsValue.isNaN {
+ XCTFail(message)
+ } else if lhsValue != rhsValue && !lhsValue.isNaN {
+ XCTFail(message)
+ }
+ } else {
+ XCTFail(message)
+ }
+ } else {
+ if rhs != nil {
+ XCTFail(message)
+ }
+ }
+ }
+
+ func testDouble(_ lhs: Double?, _ rhs: Double?, file: String = #file, line: UInt = #line) {
+ let message = "\(file):\(line) \(String(describing: lhs)) != \(String(describing: rhs)) Double"
+ if let lhsValue = lhs {
+ if let rhsValue = rhs {
+ if lhsValue.isNaN != rhsValue.isNaN {
+ XCTFail(message)
+ } else if lhsValue != rhsValue && !lhsValue.isNaN {
+ XCTFail(message)
+ }
+ } else {
+ XCTFail(message)
+ }
+ } else {
+ if rhs != nil {
+ XCTFail(message)
+ }
+ }
+ }
+
+ func testNSNumberBridgeFromInt8() {
+ for interestingValue in Int8._interestingValues {
+ func testNumber(_ number: NSNumber?) {
+ XCTAssertNotNil(number)
+ let int8 = Int8(exactly: number!)
+ XCTAssertEqual(Int8(exactly: interestingValue), int8)
+ let uint8 = UInt8(exactly: number!)
+ XCTAssertEqual(UInt8(exactly: interestingValue), uint8)
+ let int16 = Int16(exactly: number!)
+ XCTAssertEqual(Int16(exactly: interestingValue), int16)
+ let uint16 = UInt16(exactly: number!)
+ XCTAssertEqual(UInt16(exactly: interestingValue), uint16)
+ let int32 = Int32(exactly: number!)
+ XCTAssertEqual(Int32(exactly: interestingValue), int32)
+ let uint32 = UInt32(exactly: number!)
+ XCTAssertEqual(UInt32(exactly: interestingValue), uint32)
+ let int64 = Int64(exactly: number!)
+ XCTAssertEqual(Int64(exactly: interestingValue), int64)
+ let uint64 = UInt64(exactly: number!)
+ XCTAssertEqual(UInt64(exactly: interestingValue), uint64)
+ let int = Int(exactly: number!)
+ XCTAssertEqual(Int(exactly: interestingValue), int)
+ let uint = UInt(exactly: number!)
+ XCTAssertEqual(UInt(exactly: interestingValue), uint)
+ let float = Float(exactly: number!)
+ XCTAssertEqual(Float(interestingValue), float)
+ let double = Double(exactly: number!)
+ XCTAssertEqual(Double(interestingValue), double)
+ }
+ let bridged = interestingValue._bridgeToObjectiveC()
+ testNumber(bridged)
+ let created = NSNumber(value: interestingValue)
+ testNumber(created)
+ }
+ }
+
+ func testNSNumberBridgeFromUInt8() {
+ for interestingValue in UInt8._interestingValues {
+ func testNumber(_ number: NSNumber?) {
+ XCTAssertNotNil(number)
+ let int8 = Int8(exactly: number!)
+ XCTAssertEqual(Int8(exactly: interestingValue), int8)
+ let uint8 = UInt8(exactly: number!)
+ XCTAssertEqual(UInt8(exactly: interestingValue), uint8)
+ let int16 = Int16(exactly: number!)
+ XCTAssertEqual(Int16(exactly: interestingValue), int16)
+ let uint16 = UInt16(exactly: number!)
+ XCTAssertEqual(UInt16(exactly: interestingValue), uint16)
+ let int32 = Int32(exactly: number!)
+ XCTAssertEqual(Int32(exactly: interestingValue), int32)
+ let uint32 = UInt32(exactly: number!)
+ XCTAssertEqual(UInt32(exactly: interestingValue), uint32)
+ let int64 = Int64(exactly: number!)
+ XCTAssertEqual(Int64(exactly: interestingValue), int64)
+ let uint64 = UInt64(exactly: number!)
+ XCTAssertEqual(UInt64(exactly: interestingValue), uint64)
+ let int = Int(exactly: number!)
+ XCTAssertEqual(Int(exactly: interestingValue), int)
+ let uint = UInt(exactly: number!)
+ XCTAssertEqual(UInt(exactly: interestingValue), uint)
+ let float = Float(exactly: number!)
+ XCTAssertEqual(Float(interestingValue), float)
+ let double = Double(exactly: number!)
+ XCTAssertEqual(Double(interestingValue), double)
+ }
+ let bridged = interestingValue._bridgeToObjectiveC()
+ testNumber(bridged)
+ let created = NSNumber(value: interestingValue)
+ testNumber(created)
+ }
+ }
+
+ func testNSNumberBridgeFromInt16() {
+ for interestingValue in Int16._interestingValues {
+ func testNumber(_ number: NSNumber?) {
+ XCTAssertNotNil(number)
+ let int8 = Int8(exactly: number!)
+ XCTAssertEqual(Int8(exactly: interestingValue), int8)
+ let uint8 = UInt8(exactly: number!)
+ XCTAssertEqual(UInt8(exactly: interestingValue), uint8)
+ let int16 = Int16(exactly: number!)
+ XCTAssertEqual(Int16(exactly: interestingValue), int16)
+ let uint16 = UInt16(exactly: number!)
+ XCTAssertEqual(UInt16(exactly: interestingValue), uint16)
+ let int32 = Int32(exactly: number!)
+ XCTAssertEqual(Int32(exactly: interestingValue), int32)
+ let uint32 = UInt32(exactly: number!)
+ XCTAssertEqual(UInt32(exactly: interestingValue), uint32)
+ let int64 = Int64(exactly: number!)
+ XCTAssertEqual(Int64(exactly: interestingValue), int64)
+ let uint64 = UInt64(exactly: number!)
+ XCTAssertEqual(UInt64(exactly: interestingValue), uint64)
+ let int = Int(exactly: number!)
+ XCTAssertEqual(Int(exactly: interestingValue), int)
+ let uint = UInt(exactly: number!)
+ XCTAssertEqual(UInt(exactly: interestingValue), uint)
+ let float = Float(exactly: number!)
+ XCTAssertEqual(Float(interestingValue), float)
+ let double = Double(exactly: number!)
+ XCTAssertEqual(Double(interestingValue), double)
+ }
+ let bridged = interestingValue._bridgeToObjectiveC()
+ testNumber(bridged)
+ let created = NSNumber(value: interestingValue)
+ testNumber(created)
+ }
+ }
+
+ func testNSNumberBridgeFromUInt16() {
+ for interestingValue in UInt8._interestingValues {
+ func testNumber(_ number: NSNumber?) {
+ XCTAssertNotNil(number)
+ let int8 = Int8(exactly: number!)
+ XCTAssertEqual(Int8(exactly: interestingValue), int8)
+ let uint8 = UInt8(exactly: number!)
+ XCTAssertEqual(UInt8(exactly: interestingValue), uint8)
+ let int16 = Int16(exactly: number!)
+ XCTAssertEqual(Int16(exactly: interestingValue), int16)
+ let uint16 = UInt16(exactly: number!)
+ XCTAssertEqual(UInt16(exactly: interestingValue), uint16)
+ let int32 = Int32(exactly: number!)
+ XCTAssertEqual(Int32(exactly: interestingValue), int32)
+ let uint32 = UInt32(exactly: number!)
+ XCTAssertEqual(UInt32(exactly: interestingValue), uint32)
+ let int64 = Int64(exactly: number!)
+ XCTAssertEqual(Int64(exactly: interestingValue), int64)
+ let uint64 = UInt64(exactly: number!)
+ XCTAssertEqual(UInt64(exactly: interestingValue), uint64)
+ let int = Int(exactly: number!)
+ XCTAssertEqual(Int(exactly: interestingValue), int)
+ let uint = UInt(exactly: number!)
+ XCTAssertEqual(UInt(exactly: interestingValue), uint)
+ let float = Float(exactly: number!)
+ XCTAssertEqual(Float(interestingValue), float)
+ let double = Double(exactly: number!)
+ XCTAssertEqual(Double(interestingValue), double)
+ }
+ let bridged = interestingValue._bridgeToObjectiveC()
+ testNumber(bridged)
+ let created = NSNumber(value: interestingValue)
+ testNumber(created)
+ }
+ }
+
+ func testNSNumberBridgeFromInt32() {
+ for interestingValue in Int32._interestingValues {
+ func testNumber(_ number: NSNumber?) {
+ XCTAssertNotNil(number)
+ let int8 = Int8(exactly: number!)
+ XCTAssertEqual(Int8(exactly: interestingValue), int8)
+ let uint8 = UInt8(exactly: number!)
+ XCTAssertEqual(UInt8(exactly: interestingValue), uint8)
+ let int16 = Int16(exactly: number!)
+ XCTAssertEqual(Int16(exactly: interestingValue), int16)
+ let uint16 = UInt16(exactly: number!)
+ XCTAssertEqual(UInt16(exactly: interestingValue), uint16)
+ let int32 = Int32(exactly: number!)
+ XCTAssertEqual(Int32(exactly: interestingValue), int32)
+ let uint32 = UInt32(exactly: number!)
+ XCTAssertEqual(UInt32(exactly: interestingValue), uint32)
+ let int64 = Int64(exactly: number!)
+ XCTAssertEqual(Int64(exactly: interestingValue), int64)
+ let uint64 = UInt64(exactly: number!)
+ XCTAssertEqual(UInt64(exactly: interestingValue), uint64)
+ let int = Int(exactly: number!)
+ XCTAssertEqual(Int(exactly: interestingValue), int)
+ let uint = UInt(exactly: number!)
+ XCTAssertEqual(UInt(exactly: interestingValue), uint)
+ let float = Float(exactly: number!)
+ 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: int32!)
+ testDouble(expectedDouble, double)
+ }
+ let bridged = interestingValue._bridgeToObjectiveC()
+ testNumber(bridged)
+ let created = NSNumber(value: interestingValue)
+ testNumber(created)
+ }
+ }
+
+ func testNSNumberBridgeFromUInt32() {
+ for interestingValue in UInt32._interestingValues {
+ func testNumber(_ number: NSNumber?) {
+ XCTAssertNotNil(number)
+ let int8 = Int8(exactly: number!)
+ XCTAssertEqual(Int8(exactly: interestingValue), int8)
+ let uint8 = UInt8(exactly: number!)
+ XCTAssertEqual(UInt8(exactly: interestingValue), uint8)
+ let int16 = Int16(exactly: number!)
+ XCTAssertEqual(Int16(exactly: interestingValue), int16)
+ let uint16 = UInt16(exactly: number!)
+ XCTAssertEqual(UInt16(exactly: interestingValue), uint16)
+ let int32 = Int32(exactly: number!)
+ XCTAssertEqual(Int32(exactly: interestingValue), int32)
+ let uint32 = UInt32(exactly: number!)
+ XCTAssertEqual(UInt32(exactly: interestingValue), uint32)
+ let int64 = Int64(exactly: number!)
+ XCTAssertEqual(Int64(exactly: interestingValue), int64)
+ let uint64 = UInt64(exactly: number!)
+ XCTAssertEqual(UInt64(exactly: interestingValue), uint64)
+ let int = Int(exactly: number!)
+ XCTAssertEqual(Int(exactly: interestingValue), int)
+ let uint = UInt(exactly: number!)
+ XCTAssertEqual(UInt(exactly: interestingValue), uint)
+ let float = Float(exactly: number!)
+ 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: uint32!)
+ testDouble(expectedDouble, double)
+ }
+ let bridged = interestingValue._bridgeToObjectiveC()
+ testNumber(bridged)
+ let created = NSNumber(value: interestingValue)
+ testNumber(created)
+ }
+ }
+
+ func testNSNumberBridgeFromInt64() {
+ for interestingValue in Int64._interestingValues {
+ func testNumber(_ number: NSNumber?) {
+ XCTAssertNotNil(number)
+ let int8 = Int8(exactly: number!)
+ XCTAssertEqual(Int8(exactly: interestingValue), int8)
+ let uint8 = UInt8(exactly: number!)
+ XCTAssertEqual(UInt8(exactly: interestingValue), uint8)
+ let int16 = Int16(exactly: number!)
+ XCTAssertEqual(Int16(exactly: interestingValue), int16)
+ let uint16 = UInt16(exactly: number!)
+ XCTAssertEqual(UInt16(exactly: interestingValue), uint16)
+ let int32 = Int32(exactly: number!)
+ XCTAssertEqual(Int32(exactly: interestingValue), int32)
+ let uint32 = UInt32(exactly: number!)
+ XCTAssertEqual(UInt32(exactly: interestingValue), uint32)
+ let int64 = Int64(exactly: number!)
+ XCTAssertEqual(Int64(exactly: interestingValue), int64)
+ let uint64 = UInt64(exactly: number!)
+ XCTAssertEqual(UInt64(exactly: interestingValue), uint64)
+ let int = Int(exactly: number!)
+ XCTAssertEqual(Int(exactly: interestingValue), int)
+ let uint = UInt(exactly: number!)
+ XCTAssertEqual(UInt(exactly: interestingValue), uint)
+ let float = Float(exactly: number!)
+ XCTAssertEqual(Float(interestingValue), float)
+ let double = Double(exactly: number!)
+ XCTAssertEqual(Double(interestingValue), double)
+ }
+ let bridged = interestingValue._bridgeToObjectiveC()
+ testNumber(bridged)
+ let created = NSNumber(value: interestingValue)
+ testNumber(created)
+ }
+ }
+
+ func testNSNumberBridgeFromUInt64() {
+ for interestingValue in UInt64._interestingValues {
+ func testNumber(_ number: NSNumber?) {
+ XCTAssertNotNil(number)
+ let int8 = Int8(exactly: number!)
+ XCTAssertEqual(Int8(exactly: interestingValue), int8)
+ let uint8 = UInt8(exactly: number!)
+ XCTAssertEqual(UInt8(exactly: interestingValue), uint8)
+ let int16 = Int16(exactly: number!)
+ XCTAssertEqual(Int16(exactly: interestingValue), int16)
+ let uint16 = UInt16(exactly: number!)
+ XCTAssertEqual(UInt16(exactly: interestingValue), uint16)
+ let int32 = Int32(exactly: number!)
+ XCTAssertEqual(Int32(exactly: interestingValue), int32)
+ let uint32 = UInt32(exactly: number!)
+ XCTAssertEqual(UInt32(exactly: interestingValue), uint32)
+ let int64 = Int64(exactly: number!)
+ XCTAssertEqual(Int64(exactly: interestingValue), int64)
+ let uint64 = UInt64(exactly: number!)
+ XCTAssertEqual(UInt64(exactly: interestingValue), uint64)
+ let int = Int(exactly: number!)
+ XCTAssertEqual(Int(exactly: interestingValue), int)
+ let uint = UInt(exactly: number!)
+ XCTAssertEqual(UInt(exactly: interestingValue), uint)
+ let float = Float(exactly: number!)
+ XCTAssertEqual(Float(interestingValue), float)
+ let double = Double(exactly: number!)
+ XCTAssertEqual(Double(interestingValue), double)
+ }
+ let bridged = interestingValue._bridgeToObjectiveC()
+ testNumber(bridged)
+ let created = NSNumber(value: interestingValue)
+ testNumber(created)
+ }
+ }
+
+ func testNSNumberBridgeFromInt() {
+ for interestingValue in Int._interestingValues {
+ func testNumber(_ number: NSNumber?) {
+ XCTAssertNotNil(number)
+ let int8 = Int8(exactly: number!)
+ XCTAssertEqual(Int8(exactly: interestingValue), int8)
+ let uint8 = UInt8(exactly: number!)
+ XCTAssertEqual(UInt8(exactly: interestingValue), uint8)
+ let int16 = Int16(exactly: number!)
+ XCTAssertEqual(Int16(exactly: interestingValue), int16)
+ let uint16 = UInt16(exactly: number!)
+ XCTAssertEqual(UInt16(exactly: interestingValue), uint16)
+ let int32 = Int32(exactly: number!)
+ XCTAssertEqual(Int32(exactly: interestingValue), int32)
+ let uint32 = UInt32(exactly: number!)
+ XCTAssertEqual(UInt32(exactly: interestingValue), uint32)
+ let int64 = Int64(exactly: number!)
+ XCTAssertEqual(Int64(exactly: interestingValue), int64)
+ let uint64 = UInt64(exactly: number!)
+ XCTAssertEqual(UInt64(exactly: interestingValue), uint64)
+ let int = Int(exactly: number!)
+ XCTAssertEqual(Int(exactly: interestingValue), int)
+ let uint = UInt(exactly: number!)
+ XCTAssertEqual(UInt(exactly: interestingValue), uint)
+ let float = Float(exactly: number!)
+ XCTAssertEqual(Float(interestingValue), float)
+ let double = Double(exactly: number!)
+ XCTAssertEqual(Double(interestingValue), double)
+ }
+ let bridged = interestingValue._bridgeToObjectiveC()
+ testNumber(bridged)
+ let created = NSNumber(value: interestingValue)
+ testNumber(created)
+ }
+ }
+
+ func testNSNumberBridgeFromUInt() {
+ for interestingValue in UInt._interestingValues {
+ func testNumber(_ number: NSNumber?) {
+ XCTAssertNotNil(number)
+ let int8 = Int8(exactly: number!)
+ XCTAssertEqual(Int8(exactly: interestingValue), int8)
+ let uint8 = UInt8(exactly: number!)
+ XCTAssertEqual(UInt8(exactly: interestingValue), uint8)
+ let int16 = Int16(exactly: number!)
+ XCTAssertEqual(Int16(exactly: interestingValue), int16)
+ let uint16 = UInt16(exactly: number!)
+ XCTAssertEqual(UInt16(exactly: interestingValue), uint16)
+ let int32 = Int32(exactly: number!)
+ XCTAssertEqual(Int32(exactly: interestingValue), int32)
+ let uint32 = UInt32(exactly: number!)
+ XCTAssertEqual(UInt32(exactly: interestingValue), uint32)
+ let int64 = Int64(exactly: number!)
+ XCTAssertEqual(Int64(exactly: interestingValue), int64)
+ let uint64 = UInt64(exactly: number!)
+ XCTAssertEqual(UInt64(exactly: interestingValue), uint64)
+ let int = Int(exactly: number!)
+ XCTAssertEqual(Int(exactly: interestingValue), int)
+ let uint = UInt(exactly: number!)
+ XCTAssertEqual(UInt(exactly: interestingValue), uint)
+ let float = Float(exactly: number!)
+ XCTAssertEqual(Float(interestingValue), float)
+ let double = Double(exactly: number!)
+ XCTAssertEqual(Double(interestingValue), double)
+ }
+ let bridged = interestingValue._bridgeToObjectiveC()
+ testNumber(bridged)
+ let created = NSNumber(value: interestingValue)
+ testNumber(created)
+ }
+ }
+
+ func testNSNumberBridgeFromFloat() {
+ for interestingValue in Float._interestingValues {
+ func testNumber(_ number: NSNumber?) {
+ XCTAssertNotNil(number)
+ let int8 = Int8(exactly: number!)
+ XCTAssertEqual(Int8(exactly: interestingValue), int8)
+ let uint8 = UInt8(exactly: number!)
+ XCTAssertEqual(UInt8(exactly: interestingValue), uint8)
+ let int16 = Int16(exactly: number!)
+ XCTAssertEqual(Int16(exactly: interestingValue), int16)
+ let uint16 = UInt16(exactly: number!)
+ XCTAssertEqual(UInt16(exactly: interestingValue), uint16)
+ let int32 = Int32(exactly: number!)
+ XCTAssertEqual(Int32(exactly: interestingValue), int32)
+ let uint32 = UInt32(exactly: number!)
+ XCTAssertEqual(UInt32(exactly: interestingValue), uint32)
+ let int64 = Int64(exactly: number!)
+ XCTAssertEqual(Int64(exactly: interestingValue), int64)
+ let uint64 = UInt64(exactly: number!)
+ XCTAssertEqual(UInt64(exactly: interestingValue), uint64)
+ let int = Int(exactly: number!)
+ XCTAssertEqual(Int(exactly: interestingValue), int)
+ let uint = UInt(exactly: number!)
+ XCTAssertEqual(UInt(exactly: interestingValue), uint)
+
+ let float = Float(truncating: number!)
+ let expectedFloat = interestingValue
+ testFloat(expectedFloat, float)
+
+ let double = Double(truncating: number!)
+ let expectedDouble = Double(reasonably: interestingValue)
+ testDouble(expectedDouble, double)
+ }
+ let bridged = interestingValue._bridgeToObjectiveC()
+ testNumber(bridged)
+ let created = NSNumber(value: interestingValue)
+ testNumber(created)
+ }
+ }
+
+ func testNSNumberBridgeFromDouble() {
+ for interestingValue in Double._interestingValues {
+ func testNumber(_ number: NSNumber?) {
+ XCTAssertNotNil(number)
+ let int8 = Int8(exactly: number!)
+ XCTAssertEqual(Int8(exactly: interestingValue), int8)
+ let uint8 = UInt8(exactly: number!)
+ XCTAssertEqual(UInt8(exactly: interestingValue), uint8)
+ let int16 = Int16(exactly: number!)
+ XCTAssertEqual(Int16(exactly: interestingValue), int16)
+ let uint16 = UInt16(exactly: number!)
+ XCTAssertEqual(UInt16(exactly: interestingValue), uint16)
+ let int32 = Int32(exactly: number!)
+ XCTAssertEqual(Int32(exactly: interestingValue), int32)
+ let uint32 = UInt32(exactly: number!)
+ XCTAssertEqual(UInt32(exactly: interestingValue), uint32)
+ let int64 = Int64(exactly: number!)
+ XCTAssertEqual(Int64(exactly: interestingValue), int64)
+ let uint64 = UInt64(exactly: number!)
+ XCTAssertEqual(UInt64(exactly: interestingValue), uint64)
+ let int = Int(exactly: number!)
+ XCTAssertEqual(Int(exactly: interestingValue), int)
+ let uint = UInt(exactly: number!)
+ XCTAssertEqual(UInt(exactly: interestingValue), uint)
+
+ let float = Float(truncating: number!)
+ let expectedFloat = Float(reasonably: interestingValue)
+ testFloat(expectedFloat, float)
+
+ let double = Double(exactly: number!)
+ let expectedDouble = interestingValue
+ testDouble(expectedDouble, double)
+ }
+ let bridged = interestingValue._bridgeToObjectiveC()
+ testNumber(bridged)
+ let created = NSNumber(value: interestingValue)
+ testNumber(created)
+ }
+ }
+
+ func test_numericBitPatterns_to_floatingPointTypes() {
+ let signed_numbers: [NSNumber] = [
+ NSNumber(value: Int64(6)),
+ NSNumber(value: Int64(bitPattern: 1 << 56)),
+ NSNumber(value: Int64(bitPattern: 1 << 53)),
+ NSNumber(value: Int64(bitPattern: 1 << 52)),
+ NSNumber(value: Int64(bitPattern: 1 << 25)),
+ NSNumber(value: Int64(bitPattern: 1 << 24)),
+ NSNumber(value: Int64(bitPattern: 1 << 23)),
+ NSNumber(value: -Int64(bitPattern: 1 << 53)),
+ NSNumber(value: -Int64(bitPattern: 1 << 52)),
+ NSNumber(value: -Int64(6)),
+ NSNumber(value: -Int64(bitPattern: 1 << 56)),
+ NSNumber(value: -Int64(bitPattern: 1 << 25)),
+ NSNumber(value: -Int64(bitPattern: 1 << 24)),
+ NSNumber(value: -Int64(bitPattern: 1 << 23)),
+ ]
+
+ let signed_values: [Int64] = [
+ Int64(6),
+ Int64(bitPattern: 1 << 56),
+ Int64(bitPattern: 1 << 53),
+ Int64(bitPattern: 1 << 52),
+ Int64(bitPattern: 1 << 25),
+ Int64(bitPattern: 1 << 24),
+ Int64(bitPattern: 1 << 23),
+ -Int64(bitPattern: 1 << 53),
+ -Int64(bitPattern: 1 << 52),
+ -Int64(6),
+ -Int64(bitPattern: 1 << 56),
+ -Int64(bitPattern: 1 << 25),
+ -Int64(bitPattern: 1 << 24),
+ -Int64(bitPattern: 1 << 23),
+ ]
+
+ let unsigned_numbers: [NSNumber] = [
+ NSNumber(value: UInt64(bitPattern: 6)),
+ NSNumber(value: UInt64(bitPattern: 1 << 56)),
+ NSNumber(value: UInt64(bitPattern: 1 << 63)),
+ NSNumber(value: UInt64(bitPattern: 1 << 53)),
+ NSNumber(value: UInt64(bitPattern: 1 << 52)),
+ NSNumber(value: UInt64(bitPattern: 1 << 25)),
+ NSNumber(value: UInt64(bitPattern: 1 << 24)),
+ NSNumber(value: UInt64(bitPattern: 1 << 23)),
+ ]
+
+ let unsigned_values: [UInt64] = [
+ UInt64(bitPattern: 6),
+ UInt64(bitPattern: 1 << 56),
+ UInt64(bitPattern: 1 << 63),
+ UInt64(bitPattern: 1 << 53),
+ UInt64(bitPattern: 1 << 52),
+ UInt64(bitPattern: 1 << 25),
+ UInt64(bitPattern: 1 << 24),
+ UInt64(bitPattern: 1 << 23)
+ ]
+
+ for (number, value) in zip(signed_numbers, signed_values) {
+ let numberCast = Double(exactly: number)
+ let valueCast = Double(exactly: value)
+ XCTAssertEqual(numberCast, valueCast)
+ }
+
+ for (number, value) in zip(unsigned_numbers, unsigned_values) {
+ let numberCast = Double(exactly: number)
+ let valueCast = Double(exactly: value)
+ XCTAssertEqual(numberCast, valueCast)
+ }
+
+ for (number, value) in zip(signed_numbers, signed_values) {
+ let numberCast = Float(exactly: number)
+ let valueCast = Float(exactly: value)
+ XCTAssertEqual(numberCast, valueCast)
+ }
+
+ for (number, value) in zip(unsigned_numbers, unsigned_values) {
+ let numberCast = Float(exactly: number)
+ let valueCast = Float(exactly: value)
+ XCTAssertEqual(numberCast, valueCast)
+ }
+ }
+
+ func testNSNumberBridgeAnyHashable() {
+ var dict = [AnyHashable : Any]()
+ for i in -Int(UInt8.min) ... Int(UInt8.max) {
+ dict[i] = "\(i)"
+ }
+
+ // When bridging a dictionary to NSDictionary, we should be able to access
+ // the keys through either an Int (the original type boxed in AnyHashable)
+ // or NSNumber (the type Int bridged to).
+ let ns_dict = dict._bridgeToObjectiveC()
+ for i in -Int(UInt8.min) ... Int(UInt8.max) {
+ guard let value = ns_dict[i] as? String else {
+ XCTFail("Unable to look up value by Int key.")
+ continue
+ }
+
+ guard let ns_value = ns_dict[NSNumber(value: i)] as? String else {
+ XCTFail("Unable to look up value by NSNumber key.")
+ continue
+ }
+
+ XCTAssertEqual(value, ns_value)
+ }
+ }
+}
+
+extension Float {
+ init?(reasonably value: Float) {
+ self = value
+ }
+
+ init?(reasonably value: Double) {
+ guard !value.isNaN else {
+ self = Float.nan
+ return
+ }
+
+ guard !value.isInfinite else {
+ if value.sign == .minus {
+ self = -Float.infinity
+ } else {
+ self = Float.infinity
+ }
+ return
+ }
+
+ guard abs(value) <= Double(Float.greatestFiniteMagnitude) else {
+ return nil
+ }
+
+ self = Float(value)
+ }
+}
+
+extension Double {
+ init?(reasonably value: Float) {
+ guard !value.isNaN else {
+ self = Double.nan
+ return
+ }
+
+ guard !value.isInfinite else {
+ if value.sign == .minus {
+ self = -Double.infinity
+ } else {
+ self = Double.infinity
+ }
+ return
+ }
+
+ self = Double(value)
+ }
+
+ init?(reasonably value: Double) {
+ self = value
+ }
+}
+
+extension Int8 {
+ static var _interestingValues: [Int8] {
+ return [
+ Int8.min,
+ Int8.min + 1,
+ Int8.max,
+ Int8.max - 1,
+ 0,
+ -1,
+ 1,
+ -42,
+ 42,
+ ]
+ }
+}
+
+extension UInt8 {
+ static var _interestingValues: [UInt8] {
+ return [
+ UInt8.min,
+ UInt8.min + 1,
+ UInt8.max,
+ UInt8.max - 1,
+ 42,
+ ]
+ }
+}
+
+extension Int16 {
+ static var _interestingValues: [Int16] {
+ return [
+ Int16.min,
+ Int16.min + 1,
+ Int16.max,
+ Int16.max - 1,
+ 0,
+ -1,
+ 1,
+ -42,
+ 42,
+ ]
+ }
+}
+
+extension UInt16 {
+ static var _interestingValues: [UInt16] {
+ return [
+ UInt16.min,
+ UInt16.min + 1,
+ UInt16.max,
+ UInt16.max - 1,
+ 42,
+ ]
+ }
+}
+
+extension Int32 {
+ static var _interestingValues: [Int32] {
+ return [
+ Int32.min,
+ Int32.min + 1,
+ Int32.max,
+ Int32.max - 1,
+ 0,
+ -1,
+ 1,
+ -42,
+ 42,
+ ]
+ }
+}
+
+extension UInt32 {
+ static var _interestingValues: [UInt32] {
+ return [
+ UInt32.min,
+ UInt32.min + 1,
+ UInt32.max,
+ UInt32.max - 1,
+ 42,
+ ]
+ }
+}
+
+extension Int64 {
+ static var _interestingValues: [Int64] {
+ return [
+ Int64.min,
+ Int64.min + 1,
+ Int64.max,
+ Int64.max - 1,
+ 0,
+ -1,
+ 1,
+ -42,
+ 42,
+ ]
+ }
+}
+
+extension UInt64 {
+ static var _interestingValues: [UInt64] {
+ return [
+ UInt64.min,
+ UInt64.min + 1,
+ UInt64.max,
+ UInt64.max - 1,
+ 42,
+ ]
+ }
+}
+
+extension Int {
+ static var _interestingValues: [Int] {
+ return [
+ Int.min,
+ Int.min + 1,
+ Int.max,
+ Int.max - 1,
+ 0,
+ -1,
+ 1,
+ -42,
+ 42,
+ ]
+ }
+}
+
+extension UInt {
+ static var _interestingValues: [UInt] {
+ return [
+ UInt.min,
+ UInt.min + 1,
+ UInt.max,
+ UInt.max - 1,
+ 42,
+ ]
+ }
+}
+
+extension Float {
+ static var _interestingValues: [Float] {
+ return [
+ -Float.infinity,
+ -Float.greatestFiniteMagnitude,
+ -1.0,
+ -Float.ulpOfOne,
+ -Float.leastNormalMagnitude,
+ -0.0,
+ 0.0,
+ Float.leastNormalMagnitude,
+ Float.ulpOfOne,
+ 1.0,
+ Float.greatestFiniteMagnitude,
+ Float.infinity,
+ Float.nan,
+ ]
+ }
+}
+
+extension Double {
+ static var _interestingValues: [Double] {
+ return [
+ -Double.infinity,
+ //-Double.greatestFiniteMagnitude,
+ -1.0,
+ -Double.ulpOfOne,
+ -Double.leastNormalMagnitude,
+ -0.0,
+ 0.0,
+ Double.leastNormalMagnitude,
+ Double.ulpOfOne,
+ 1.0,
+ //Double.greatestFiniteMagnitude,
+ Double.infinity,
+ Double.nan,
+ ]
+ }
+}
diff --git a/TestFoundation/TestNSString.swift b/TestFoundation/TestNSString.swift
index 33177ca..70e9398 100644
--- a/TestFoundation/TestNSString.swift
+++ b/TestFoundation/TestNSString.swift
@@ -265,21 +265,21 @@
func test_FromNullTerminatedCStringInASCII() {
let bytes = mockASCIIStringBytes + [0x00]
- let string = NSString(CString: bytes.map { Int8(bitPattern: $0) }, encoding: String.Encoding.ascii.rawValue)
+ let string = NSString(cString: bytes.map { Int8(bitPattern: $0) }, encoding: String.Encoding.ascii.rawValue)
XCTAssertNotNil(string)
XCTAssertTrue(string?.isEqual(to: mockASCIIString) ?? false)
}
func test_FromNullTerminatedCStringInUTF8() {
let bytes = mockUTF8StringBytes + [0x00]
- let string = NSString(CString: bytes.map { Int8(bitPattern: $0) }, encoding: String.Encoding.utf8.rawValue)
+ let string = NSString(cString: bytes.map { Int8(bitPattern: $0) }, encoding: String.Encoding.utf8.rawValue)
XCTAssertNotNil(string)
XCTAssertTrue(string?.isEqual(to: mockUTF8String) ?? false)
}
func test_FromMalformedNullTerminatedCStringInUTF8() {
let bytes = mockMalformedUTF8StringBytes + [0x00]
- let string = NSString(CString: bytes.map { Int8(bitPattern: $0) }, encoding: String.Encoding.utf8.rawValue)
+ let string = NSString(cString: bytes.map { Int8(bitPattern: $0) }, encoding: String.Encoding.utf8.rawValue)
XCTAssertNil(string)
}
diff --git a/TestFoundation/TestNSTextCheckingResult.swift b/TestFoundation/TestNSTextCheckingResult.swift
index f008fc2..181898f 100644
--- a/TestFoundation/TestNSTextCheckingResult.swift
+++ b/TestFoundation/TestNSTextCheckingResult.swift
@@ -34,17 +34,17 @@
let searchRange = NSMakeRange(0,7)
let match: NSTextCheckingResult = regex.firstMatch(in: searchString, options: searchOptions, range: searchRange)!
//Positive offset
- var result = match.resultByAdjustingRangesWithOffset(1)
+ var result = match.adjustingRanges(offset: 1)
XCTAssertEqual(result.range(at: 0).location, 6)
XCTAssertEqual(result.range(at: 1).location, NSNotFound)
XCTAssertEqual(result.range(at: 2).location, 6)
//Negative offset
- result = match.resultByAdjustingRangesWithOffset(-2)
+ result = match.adjustingRanges(offset: -2)
XCTAssertEqual(result.range(at: 0).location, 3)
XCTAssertEqual(result.range(at: 1).location, NSNotFound)
XCTAssertEqual(result.range(at: 2).location, 3)
//ZeroOffset
- result = match.resultByAdjustingRangesWithOffset(0)
+ result = match.adjustingRanges(offset: 0)
XCTAssertEqual(result.range(at: 0).location, 5)
XCTAssertEqual(result.range(at: 1).location, NSNotFound)
XCTAssertEqual(result.range(at: 2).location, 5)
diff --git a/TestFoundation/TestNumberFormatter.swift b/TestFoundation/TestNumberFormatter.swift
index 6cf2be6..02914ad 100644
--- a/TestFoundation/TestNumberFormatter.swift
+++ b/TestFoundation/TestNumberFormatter.swift
@@ -14,7 +14,6 @@
import SwiftFoundation
import SwiftXCTest
#endif
-import CoreFoundation
class TestNumberFormatter: XCTestCase {
diff --git a/TestFoundation/TestProcess.swift b/TestFoundation/TestProcess.swift
index 922c607..54775b5 100644
--- a/TestFoundation/TestProcess.swift
+++ b/TestFoundation/TestProcess.swift
@@ -14,7 +14,6 @@
import SwiftFoundation
import SwiftXCTest
#endif
-import CoreFoundation
class TestProcess : XCTestCase {
static var allTests: [(String, (TestProcess) -> () throws -> Void)] {
diff --git a/TestFoundation/TestXMLDocument.swift b/TestFoundation/TestXMLDocument.swift
index d02ef9f..00bbbf4 100644
--- a/TestFoundation/TestXMLDocument.swift
+++ b/TestFoundation/TestXMLDocument.swift
@@ -17,7 +17,6 @@
import SwiftXCTest
#endif
-import CoreFoundation
class TestXMLDocument : XCTestCase {
diff --git a/TestFoundation/main.swift b/TestFoundation/main.swift
index 9ae6d0f..a1f6bf9 100644
--- a/TestFoundation/main.swift
+++ b/TestFoundation/main.swift
@@ -10,13 +10,18 @@
#if DEPLOYMENT_RUNTIME_OBJC || os(Linux)
import Foundation
import XCTest
-import Glibc
#else
import SwiftFoundation
import SwiftXCTest
-import Darwin
#endif
+#if os(OSX) || os(iOS)
+ import Darwin
+#elseif os(Linux)
+ import Glibc
+#endif
+
+
internal func testBundle() -> Bundle {
return Bundle.main
}
@@ -58,6 +63,7 @@
testCase(TestNotificationQueue.allTests),
testCase(TestNSNull.allTests),
testCase(TestNSNumber.allTests),
+ testCase(TestNSNumberBridging.allTests),
testCase(TestNumberFormatter.allTests),
testCase(TestOperationQueue.allTests),
testCase(TestNSOrderedSet.allTests),
