Skip to content
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.

Sign up for GitHub

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

Add support for malformed image and data in result #196

Merged
merged 1 commit into from
Feb 3, 2017
Merged

Add support for malformed image and data in result #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Demo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,9 @@
44B5D3A51D19B9E5004378B9 /* pig.png in Resources */ = {isa = PBXBuildFile; fileRef = 14B0CEE31CF1D0D700049AD6 /* pig.png */; };
44B5D3A61D19B9E5004378B9 /* døgnvillburgere.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 14B0CEDE1CF1D0D700049AD6 /* døgnvillburgere.jpg */; };
44B5D3A71D19B9E5004378B9 /* sample.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 14B0CEE41CF1D0D700049AD6 /* sample.jpg */; };
44BC3A851E44569C004A948D /* ResulTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44BC3A841E44569C004A948D /* ResulTests.swift */; };
44BC3A861E44569C004A948D /* ResulTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44BC3A841E44569C004A948D /* ResulTests.swift */; };
44BC3A871E44569C004A948D /* ResulTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44BC3A841E44569C004A948D /* ResulTests.swift */; };
44DFD3901D9A2D5A0014E9F2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44DFD38F1D9A2D5A0014E9F2 /* AppDelegate.swift */; };
44DFD3921D9A2D5A0014E9F2 /* OptionsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44DFD3911D9A2D5A0014E9F2 /* OptionsController.swift */; };
44DFD3971D9A2D5A0014E9F2 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 44DFD3961D9A2D5A0014E9F2 /* Assets.xcassets */; };
Expand Down Expand Up @@ -215,6 +218,7 @@
44A6D5471E4122DE00405A7E /* Networking+Private.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Networking+Private.swift"; sourceTree = "<group>"; };
44A6D5591E4143F400405A7E /* JSONTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JSONTests.swift; sourceTree = "<group>"; };
44B5D3AB1D19B9E5004378B9 /* tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = tvOSTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
44BC3A841E44569C004A948D /* ResulTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ResulTests.swift; sourceTree = "<group>"; };
44DFD38D1D9A2D5A0014E9F2 /* iOSDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iOSDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
44DFD38F1D9A2D5A0014E9F2 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
44DFD3911D9A2D5A0014E9F2 /* OptionsController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OptionsController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -303,6 +307,7 @@
1488E23C1CF138D700C6FBA3 /* SHA1.h */,
4496E8E51DAFB27A0092254E /* String+UTF8Tests.swift */,
44A6D5591E4143F400405A7E /* JSONTests.swift */,
44BC3A841E44569C004A948D /* ResulTests.swift */,
);
path = Tests;
sourceTree = "<group>";
Expand Down Expand Up @@ -767,6 +772,7 @@
1413F4781CE7969100482096 /* NetworkActivityIndicator.swift in Sources */,
1413F4731CE7963700482096 /* NetworkingTests.swift in Sources */,
E6ED61331E27CD630058ACE9 /* UnauthorizedCallbackTests.swift in Sources */,
44BC3A871E44569C004A948D /* ResulTests.swift in Sources */,
146EF9161CEBCEA50059DDB1 /* POSTTests.swift in Sources */,
1413F4671CE7963700482096 /* Dictionary+FormURLEncodedTests.swift in Sources */,
147B32F81CF9B1C500D5BAED /* Networking+HTTPRequests.swift in Sources */,
Expand Down Expand Up @@ -869,6 +875,7 @@
1474C1C41CA2988900E15D84 /* JSON.swift in Sources */,
E6ED61311E27CD630058ACE9 /* UnauthorizedCallbackTests.swift in Sources */,
146EF9151CEBCEA50059DDB1 /* POSTTests.swift in Sources */,
44BC3A851E44569C004A948D /* ResulTests.swift in Sources */,
147B32F71CF9B1C500D5BAED /* Networking+HTTPRequests.swift in Sources */,
1474C1C51CA2988900E15D84 /* NetworkActivityIndicator.swift in Sources */,
146EF9171CEBCEA50059DDB1 /* PUTTests.swift in Sources */,
Expand Down Expand Up @@ -899,6 +906,7 @@
44B5D38F1D19B9E5004378B9 /* JSON.swift in Sources */,
E6ED61321E27CD630058ACE9 /* UnauthorizedCallbackTests.swift in Sources */,
44B5D3911D19B9E5004378B9 /* POSTTests.swift in Sources */,
44BC3A861E44569C004A948D /* ResulTests.swift in Sources */,
44B5D3931D19B9E5004378B9 /* Networking+HTTPRequests.swift in Sources */,
44B5D3941D19B9E5004378B9 /* NetworkActivityIndicator.swift in Sources */,
44B5D3951D19B9E5004378B9 /* PUTTests.swift in Sources */,
Expand Down
6 changes: 4 additions & 2 deletions Sources/Result.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ public enum ImageResult {
} else if let image = image {
self = .success(SuccessImageResponse(image: image, response: response))
} else {
fatalError("No error, no image")
let error = NSError(domain: Networking.domain, code: URLError.cannotParseResponse.rawValue, userInfo: [NSLocalizedDescriptionKey: "Malformed image"])
self = .failure(FailureResponse(response: response, error: error))
}
}
}
Expand All @@ -53,7 +54,8 @@ public enum DataResult {
} else if let data = data {
self = .success(SuccessDataResponse(data: data, response: response))
} else {
fatalError("No data, no error")
let error = NSError(domain: Networking.domain, code: URLError.cannotParseResponse.rawValue, userInfo: [NSLocalizedDescriptionKey: "Malformed data"])
self = .failure(FailureResponse(response: response, error: error))
}
}
}
32 changes: 32 additions & 0 deletions Tests/ResulTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import Foundation
import XCTest

class ResultTests: XCTestCase {
func testImageResultWithMalformedImage() {
let url = URL(string: "http://www.google.com")!
let urlResponse = HTTPURLResponse(url: url, statusCode: 200)
let malformedImage = "Malformed image"
let result = ImageResult(body: malformedImage, response: urlResponse, error: nil)

switch result {
case .success:
XCTFail()
case .failure(let result):
XCTAssertEqual(result.error.code, URLError.cannotParseResponse.rawValue)
}
}

func testDataResultWithMalformedData() {
let url = URL(string: "http://www.google.com")!
let urlResponse = HTTPURLResponse(url: url, statusCode: 200)
let malformedData = "Malformed data"
let result = DataResult(body: malformedData, response: urlResponse, error: nil)

switch result {
case .success:
XCTFail()
case .failure(let result):
XCTAssertEqual(result.error.code, URLError.cannotParseResponse.rawValue)
}
}
}