starred/CoreStore
1
0
Fork 0
mirror of https://github.com/JohnEstropia/CoreStore.git synced 2026-04-20 16:01:20 +02:00
Code Issues 95 Packages Projects Releases 10 Wiki Activity

fixed internal errors getting thrown as .Unknown instead of .InternalError (fixes #84)

Browse Source
This commit is contained in:
John Estropia
2016-07-21 11:51:49 +09:00
parent 7fc3ad2890
commit e4b6c06401
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CoreStoreTests/ErrorTests.swift
View File

@@ -147,7 +147,7 @@ final class ErrorTests: XCTestCase {
"key3": NSDate() "key3": NSDate()
] ]
) )
let error = CoreStoreError.InternalError(NSError: internalError) let error = CoreStoreError(internalError)
XCTAssertEqual((error as NSError).domain, CoreStoreErrorDomain) XCTAssertEqual((error as NSError).domain, CoreStoreErrorDomain)
XCTAssertEqual((error as NSError).code, CoreStoreErrorCode.InternalError.rawValue) XCTAssertEqual((error as NSError).code, CoreStoreErrorCode.InternalError.rawValue)

25
Sources/ObjectiveC/CSError.swift
View File

@@ -248,9 +248,17 @@ internal extension ErrorType {
switch self { switch self {
case let error as CoreStoreError: return error case let error as CoreStoreError:
case let error as CSError: return error.bridgeToSwift return error
default: return .Unknown
case let error as CSError:
return error.bridgeToSwift
case let error as NSError where self.dynamicType is NSError.Type:
return .InternalError(NSError: error)
default:
return .Unknown
} }
} }
@@ -258,9 +266,14 @@ internal extension ErrorType {
switch self { switch self {
case let error as CoreStoreError: return error.bridgeToObjectiveC case let error as CoreStoreError:
case let error as CSError: return error return error.bridgeToObjectiveC
default: return self as NSError
case let error as CSError:
return error
default:
return self as NSError
} }
} }
} }