Merge pull request #1134 from zayass/patch-4

Author: swift-ci

Foundation/NSError.swift

@@ -274,6 +274,37 @@ public protocol CustomNSError : Error {
     var errorUserInfo: [String : Any] { get }
 }
 
+public extension CustomNSError {
+    /// Default domain of the error.
+    static var errorDomain: String {
+        return String(reflecting: self)
+    }
+
+    /// The error code within the given domain.
+    var errorCode: Int {
+        return _swift_getDefaultErrorCode(self)
+    }
+
+    /// The default user-info dictionary.
+    var errorUserInfo: [String : Any] {
+        return [:]
+    }
+}
+
+extension CustomNSError where Self: RawRepresentable, Self.RawValue: SignedInteger {
+    // The error code of Error with integral raw values is the raw value.
+    public var errorCode: Int {
+        return numericCast(self.rawValue)
+    }
+}
+
+extension CustomNSError where Self: RawRepresentable, Self.RawValue: UnsignedInteger {
+    // The error code of Error with integral raw values is the raw value.
+    public var errorCode: Int {
+        return numericCast(self.rawValue)
+    }
+}
+
 public extension Error where Self : CustomNSError {
     /// Default implementation for customized NSErrors.
     var _domain: String { return Self.errorDomain }
@@ -282,6 +313,16 @@ public extension Error where Self : CustomNSError {
     var _code: Int { return self.errorCode }
 }
 
+public extension Error where Self: CustomNSError, Self: RawRepresentable, Self.RawValue: SignedInteger {
+    /// Default implementation for customized NSErrors.
+    var _code: Int { return self.errorCode }
+}
+
+public extension Error where Self: CustomNSError, Self: RawRepresentable, Self.RawValue: UnsignedInteger {
+    /// Default implementation for customized NSErrors.
+    var _code: Int { return self.errorCode }
+}
+
 public extension Error {
     /// Retrieve the localized description for this error.
     var localizedDescription: String {

TestFoundation/TestNSError.swift

@@ -16,13 +16,20 @@
     import SwiftXCTest
 #endif
 
+struct SwiftCustomNSError: Error, CustomNSError {
+}
 
 class TestNSError : XCTestCase {
 
     static var allTests: [(String, (TestNSError) -> () throws -> Void)] {
         return [
             ("test_LocalizedError_errorDescription", test_LocalizedError_errorDescription),
             ("test_NSErrorAsError_localizedDescription", test_NSErrorAsError_localizedDescription),
+            ("test_CustomNSError_domain", test_CustomNSError_domain),
+            ("test_CustomNSError_userInfo", test_CustomNSError_userInfo),
+            ("test_CustomNSError_errorCode", test_CustomNSError_errorCode),
+            ("test_CustomNSError_errorCodeRawInt", test_CustomNSError_errorCodeRawInt),
+            ("test_CustomNSError_errorCodeRawUInt", test_CustomNSError_errorCodeRawUInt),
         ]
     }
 
@@ -40,4 +47,45 @@ class TestNSError : XCTestCase {
         let error = nsError as Error
         XCTAssertEqual(error.localizedDescription, "Localized!")
     }
+
+    func test_CustomNSError_domain() {
+        XCTAssertEqual(SwiftCustomNSError.errorDomain, "TestFoundation.SwiftCustomNSError")
+    }
+
+    func test_CustomNSError_userInfo() {
+        let userInfo = SwiftCustomNSError().errorUserInfo
+        XCTAssertTrue(userInfo.isEmpty)
+    }
+
+    func test_CustomNSError_errorCode() {
+        enum SwiftError : Error, CustomNSError {
+            case zero
+            case one
+            case two
+        }
+
+        XCTAssertEqual(SwiftCustomNSError().errorCode, 1)
+
+        XCTAssertEqual(SwiftError.zero.errorCode, 0)
+        XCTAssertEqual(SwiftError.one.errorCode,  1)
+        XCTAssertEqual(SwiftError.two.errorCode,  2)
+    }
+
+    func test_CustomNSError_errorCodeRawInt() {
+        enum SwiftError : Int, Error, CustomNSError {
+            case minusOne  = -1
+            case fortyTwo = 42
+        }
+
+        XCTAssertEqual(SwiftError.minusOne.errorCode,  -1)
+        XCTAssertEqual(SwiftError.fortyTwo.errorCode, 42)
+    }
+
+    func test_CustomNSError_errorCodeRawUInt() {
+        enum SwiftError : UInt, Error, CustomNSError {
+            case fortyTwo = 42
+        }
+
+        XCTAssertEqual(SwiftError.fortyTwo.errorCode, 42)
+    }
 }