Updated POSIXError

PureSwift · Apr 19, 2019 · 126fa2c · 126fa2c
1 parent 09467b6
commit 126fa2c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/Sources/BluetoothLinux/POSIXError.swift b/Sources/BluetoothLinux/POSIXError.swift
@@ -22,7 +22,11 @@ internal extension POSIXError {
         guard let code = POSIXErrorCode(rawValue: errno)
             else { return nil }
 
-        return POSIXError(_nsError: NSPOSIXError(code))
+        return POSIXError(code)
+    }
+
+    init(_ code: POSIXErrorCode) {
+        self.init(_nsError: NSPOSIXError(code))
     }
 }
 
@@ -42,6 +46,14 @@ extension POSIXError: CustomStringConvertible {
     }
 }
 
+#if os(macOS)
+extension POSIXErrorCode {
+    public var description: String {
+        return rawValue.description
+    }
+}
+#endif
+
 // MARK: - LocalizedError
 
 extension POSIXError: LocalizedError {
@@ -82,7 +94,7 @@ internal final class NSPOSIXError: NSError {
     }
 
     override var description: String {
-        return "Error Domain=\(domain) Code=\(code) \"\(posixError.errorMessage)\""
+        return "\(posixError.errorMessage) (\(posixError))"
     }
 }
 

diff --git a/Tests/BluetoothLinuxTests/BluetoothLinuxTests.swift b/Tests/BluetoothLinuxTests/BluetoothLinuxTests.swift
@@ -31,7 +31,7 @@ final class BluetoothLinuxTests: XCTestCase {
 
         for (errorCode, string) in errors {
 
-            let error = POSIXError(_nsError: NSPOSIXError(errorCode))
+            let error = POSIXError(errorCode)
 
             #if os(macOS) || swift(>=5.1)
             // https://github.com/apple/swift-corelibs-foundation/pull/2113
@@ -48,8 +48,7 @@ final class BluetoothLinuxTests: XCTestCase {
                 #if os(macOS)
                 XCTAssertEqual(error.localizedDescription, string)
                 #endif
-                let errorDescription = "Error Domain=\(NSPOSIXErrorDomain) Code=\(errorCode.rawValue) \"\(string)\""
-                XCTAssertEqual("\(error)", errorDescription)
+                XCTAssert("\(error)".contains(string))
             }
         }
     }