-
Notifications
You must be signed in to change notification settings - Fork 17
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Tweaks to DecodingFailureInitializable
#71
Merged
Merged
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
08361d4
Add decoding type information to DecodingFailureInitializable
wmcginty 1fb2996
Add a decoding failure test
wmcginty bbf928b
Fix a test issue
wmcginty 63a798c
Merge branch 'master' into feature/errors
wmcginty a8ff184
Some cleanup, removal of redundant code paths
wmcginty 9cbf43f
Tweaks to folder structure, cleanup
wmcginty f6e722b
Extract loadJSONData() into an extension
wmcginty f85792c
Fix a Codebeat issue with transformers
wmcginty f519208
Add a changelog entry
wmcginty deb18c9
Merge branch 'master' into feature/errors
wmcginty fe99e42
Add line spacing in changelog
wmcginty File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| // | ||
| // AnyError+Request.swift | ||
| // Hyperspace-iOS | ||
| // | ||
| // Created by Will McGinty on 9/21/18. | ||
| // Copyright © 2018 Bottle Rocket Studios. All rights reserved. | ||
| // | ||
|
|
||
| import Foundation | ||
| import Result | ||
|
|
||
| // MARK: - AnyError Conformance to NetworkServiceInitializable | ||
|
|
||
| extension AnyError: NetworkServiceFailureInitializable { | ||
|
|
||
| public init(networkServiceFailure: NetworkServiceFailure) { | ||
| self.init(networkServiceFailure.error) | ||
| } | ||
|
|
||
| public var networkServiceError: NetworkServiceError { | ||
| return (error as? NetworkServiceError) ?? .unknownError | ||
| } | ||
|
|
||
| public var failureResponse: HTTP.Response? { | ||
| return nil | ||
| } | ||
| } | ||
|
|
||
| // MARK: - AnyError Conformance to DecodingFailureInitializable | ||
|
|
||
| extension AnyError: DecodingFailureInitializable { | ||
| public init(error: DecodingError, decoding: Decodable.Type, data: Data) { | ||
| self.init(error) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| // | ||
| // DecodingFailureTests.swift | ||
| // Hyperspace-iOS | ||
| // | ||
| // Created by Will McGinty on 8/27/18. | ||
| // Copyright © 2018 Bottle Rocket Studios. All rights reserved. | ||
| // | ||
|
|
||
| import XCTest | ||
| @testable import Hyperspace | ||
| import Result | ||
|
|
||
| class DecodingFailureTests: XCTestCase { | ||
|
|
||
| private struct MockDecodeError: DecodingFailureInitializable { | ||
|
|
||
| let error: DecodingError | ||
| let type: Decodable.Type | ||
| let data: Data | ||
|
|
||
| init(error: DecodingError, decoding: Decodable.Type, data: Data) { | ||
| self.error = error | ||
| self.type = decoding | ||
| self.data = data | ||
| } | ||
| } | ||
|
|
||
| func test_DecodingFailure_CatchesFailedTypeInformation() { | ||
| let objectJSON = loadedJSONData(fromFileNamed: "DateObject") | ||
|
|
||
| let transformer: (Data) -> Result<MockDecodableContainer, MockDecodeError> = RequestDefaults.dataTransformer(for: JSONDecoder()) | ||
| let result = transformer(objectJSON) | ||
|
|
||
| guard let error = result.error else { XCTFail("The decode should fail."); return } | ||
| XCTAssertEqual(String(describing: error.type), String(describing: MockDecodableContainer.self)) | ||
| XCTAssertEqual(error.data, objectJSON) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| // | ||
| // XCTestCase+JSON.swift | ||
| // Hyperspace-iOS | ||
| // | ||
| // Created by Will McGinty on 9/24/18. | ||
| // Copyright © 2018 Bottle Rocket Studios. All rights reserved. | ||
| // | ||
|
|
||
| import XCTest | ||
|
|
||
| extension XCTestCase { | ||
|
|
||
| func loadedJSONData(fromFileNamed name: String) -> Data { | ||
| let bundle = Bundle(for: DecodingTests.self) | ||
| let url = bundle.url(forResource: name, withExtension: "json")! | ||
| return try! Data(contentsOf: url) | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Minor, but can we get a newline before this entry?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed. Stupid merge.