Skip to content

Commit f2b502e

Browse files
ikesyoikesyo
committed
Merge pull request #85 from ishkawa/feature/reorganize-tests
Refactor unit tests
2 parents bbac3af + 5d5e083 commit f2b502e

7 files changed

+489
-671
lines changed

‎APIKit.xcodeproj/project.pbxproj

+6-12
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
19C16B541B83327A001D77CC /* RequestTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19C16B531B83327A001D77CC /* RequestTests.swift */; };
11-
19C16B551B83327A001D77CC /* RequestTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19C16B531B83327A001D77CC /* RequestTests.swift */; };
10+
19C16B541B83327A001D77CC /* RequestTypeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19C16B531B83327A001D77CC /* RequestTypeTests.swift */; };
11+
19C16B551B83327A001D77CC /* RequestTypeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19C16B531B83327A001D77CC /* RequestTypeTests.swift */; };
1212
7F08699A1A978790001AD3E1 /* APIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F45FCFE1A94D04D006863BB /* APIKit.framework */; };
1313
7F0869A01A9787AF001AD3E1 /* RequestBodyBuilderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F30A8551A975BD600A8C136 /* RequestBodyBuilderTests.swift */; };
1414
7F0869A11A9787AF001AD3E1 /* ResponseBodyParserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7FEC5A181A96FE2600B1D3C0 /* ResponseBodyParserTests.swift */; };
@@ -31,8 +31,6 @@
3131
7FEC5A191A96FE2600B1D3C0 /* ResponseBodyParserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7FEC5A181A96FE2600B1D3C0 /* ResponseBodyParserTests.swift */; };
3232
7FEC5A1A1A96FE2600B1D3C0 /* APIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F45FCDD1A94D02C006863BB /* APIKit.framework */; };
3333
84B5C6BC1B42CD430032068D /* APIError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F5FA6B41B3C58210090B0AF /* APIError.swift */; };
34-
C52CE4F81B984C9B00B7AB59 /* RequestCreateTaskInURLSessionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C52CE4F71B984C9B00B7AB59 /* RequestCreateTaskInURLSessionTests.swift */; settings = {ASSET_TAGS = (); }; };
35-
C52CE4F91B984C9B00B7AB59 /* RequestCreateTaskInURLSessionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C52CE4F71B984C9B00B7AB59 /* RequestCreateTaskInURLSessionTests.swift */; settings = {ASSET_TAGS = (); }; };
3634
CD5115251B1FFBA900514240 /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD5115241B1FFBA900514240 /* Result.framework */; };
3735
CD5115261B1FFBA900514240 /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD5115241B1FFBA900514240 /* Result.framework */; };
3836
CD5115271B1FFBA900514240 /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD5115241B1FFBA900514240 /* Result.framework */; };
@@ -87,7 +85,7 @@
8785
/* End PBXCopyFilesBuildPhase section */
8886

8987
/* Begin PBXFileReference section */
90-
19C16B531B83327A001D77CC /* RequestTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RequestTests.swift; sourceTree = "<group>"; };
88+
19C16B531B83327A001D77CC /* RequestTypeTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RequestTypeTests.swift; sourceTree = "<group>"; };
9189
7F0869941A978790001AD3E1 /* APIKitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = APIKitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
9290
7F0869A51A978BCA001AD3E1 /* URLEncodedSerialization.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = URLEncodedSerialization.swift; sourceTree = "<group>"; };
9391
7F1B190A1AA2CA1300C7AFCF /* APITests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = APITests.swift; sourceTree = "<group>"; };
@@ -106,7 +104,6 @@
106104
7FEC5A141A96FE2600B1D3C0 /* APIKitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = APIKitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
107105
7FEC5A171A96FE2600B1D3C0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
108106
7FEC5A181A96FE2600B1D3C0 /* ResponseBodyParserTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResponseBodyParserTests.swift; sourceTree = "<group>"; };
109-
C52CE4F71B984C9B00B7AB59 /* RequestCreateTaskInURLSessionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RequestCreateTaskInURLSessionTests.swift; sourceTree = "<group>"; };
110107
CD5115241B1FFBA900514240 /* Result.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Result.framework; sourceTree = BUILT_PRODUCTS_DIR; };
111108
CD51152D1B1FFCC700514240 /* OHHTTPStubs.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = OHHTTPStubs.framework; sourceTree = BUILT_PRODUCTS_DIR; };
112109
/* End PBXFileReference section */
@@ -201,8 +198,7 @@
201198
isa = PBXGroup;
202199
children = (
203200
7F1B190A1AA2CA1300C7AFCF /* APITests.swift */,
204-
19C16B531B83327A001D77CC /* RequestTests.swift */,
205-
C52CE4F71B984C9B00B7AB59 /* RequestCreateTaskInURLSessionTests.swift */,
201+
19C16B531B83327A001D77CC /* RequestTypeTests.swift */,
206202
7F30A8551A975BD600A8C136 /* RequestBodyBuilderTests.swift */,
207203
7FEC5A181A96FE2600B1D3C0 /* ResponseBodyParserTests.swift */,
208204
7FEC5A161A96FE2600B1D3C0 /* Supporting Files */,
@@ -395,8 +391,7 @@
395391
buildActionMask = 2147483647;
396392
files = (
397393
7F1B190C1AA2CA1300C7AFCF /* APITests.swift in Sources */,
398-
19C16B551B83327A001D77CC /* RequestTests.swift in Sources */,
399-
C52CE4F91B984C9B00B7AB59 /* RequestCreateTaskInURLSessionTests.swift in Sources */,
394+
19C16B551B83327A001D77CC /* RequestTypeTests.swift in Sources */,
400395
7F0869A01A9787AF001AD3E1 /* RequestBodyBuilderTests.swift in Sources */,
401396
7F0869A11A9787AF001AD3E1 /* ResponseBodyParserTests.swift in Sources */,
402397
);
@@ -435,8 +430,7 @@
435430
buildActionMask = 2147483647;
436431
files = (
437432
7F1B190B1AA2CA1300C7AFCF /* APITests.swift in Sources */,
438-
19C16B541B83327A001D77CC /* RequestTests.swift in Sources */,
439-
C52CE4F81B984C9B00B7AB59 /* RequestCreateTaskInURLSessionTests.swift in Sources */,
433+
19C16B541B83327A001D77CC /* RequestTypeTests.swift in Sources */,
440434
7FEC5A191A96FE2600B1D3C0 /* ResponseBodyParserTests.swift in Sources */,
441435
7F30A8561A975BD600A8C136 /* RequestBodyBuilderTests.swift in Sources */,
442436
);

‎APIKitTests/APITests.swift

+8-8
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class APITests: XCTestCase {
5757
MockAPI.sendRequest(request) { response in
5858
switch response {
5959
case .Success(let dictionary):
60-
XCTAssert(dictionary["key"] as? String == "value")
60+
XCTAssertEqual(dictionary["key"] as? String, "value")
6161

6262
case .Failure:
6363
XCTFail()
@@ -89,7 +89,7 @@ class APITests: XCTestCase {
8989
case .Failure(let error):
9090
switch error {
9191
case .ConnectionError(let error):
92-
XCTAssert(error.domain == NSURLErrorDomain)
92+
XCTAssertEqual(error.domain, NSURLErrorDomain)
9393

9494
default:
9595
XCTFail()
@@ -122,8 +122,8 @@ class APITests: XCTestCase {
122122
case .Failure(let error):
123123
switch error {
124124
case .UnacceptableStatusCode(let statusCode, let error as NSError):
125-
XCTAssert(statusCode == 400)
126-
XCTAssert(error.domain == "APIKitErrorDomain")
125+
XCTAssertEqual(statusCode, 400)
126+
XCTAssertEqual(error.domain, "APIKitErrorDomain")
127127
XCTAssertNotNil(error.userInfo)
128128
default:
129129
XCTFail()
@@ -156,8 +156,8 @@ class APITests: XCTestCase {
156156
case .Failure(let error):
157157
switch error {
158158
case .ResponseBodyDeserializationError(let error as NSError):
159-
XCTAssert(error.domain == NSCocoaErrorDomain)
160-
XCTAssert(error.code == 3840)
159+
XCTAssertEqual(error.domain, NSCocoaErrorDomain)
160+
XCTAssertEqual(error.code, 3840)
161161

162162
default:
163163
XCTFail()
@@ -192,8 +192,8 @@ class APITests: XCTestCase {
192192
case .Failure(let error):
193193
switch error {
194194
case .ConnectionError(let error):
195-
XCTAssert(error.domain == NSURLErrorDomain)
196-
XCTAssert(error.code == NSURLErrorCancelled)
195+
XCTAssertEqual(error.domain, NSURLErrorDomain)
196+
XCTAssertEqual(error.code, NSURLErrorCancelled)
197197

198198
default:
199199
XCTFail()

‎APIKitTests/RequestBodyBuilderTests.swift

+13-13
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import XCTest
66
class RequestBodyBuilderTests: XCTestCase {
77
func testJSONHeader() {
88
let builder = RequestBodyBuilder.JSON(writingOptions: [])
9-
XCTAssert(builder.contentTypeHeader == "application/json")
9+
XCTAssertEqual(builder.contentTypeHeader, "application/json")
1010
}
1111

1212
func testJSONSuccess() {
@@ -16,9 +16,9 @@ class RequestBodyBuilderTests: XCTestCase {
1616
do {
1717
let data = try builder.buildBodyFromObject(object)
1818
let dictionary = try NSJSONSerialization.JSONObjectWithData(data, options: [])
19-
XCTAssert(dictionary["foo"] == 1)
20-
XCTAssert(dictionary["bar"] == 2)
21-
XCTAssert(dictionary["baz"] == 3)
19+
XCTAssertEqual(dictionary["foo"], 1)
20+
XCTAssertEqual(dictionary["bar"], 2)
21+
XCTAssertEqual(dictionary["baz"], 3)
2222
} catch {
2323
XCTFail()
2424
}
@@ -33,14 +33,14 @@ class RequestBodyBuilderTests: XCTestCase {
3333
XCTFail()
3434
} catch {
3535
let nserror = error as NSError
36-
XCTAssert(nserror.domain == NSCocoaErrorDomain)
37-
XCTAssert(nserror.code == 3840)
36+
XCTAssertEqual(nserror.domain, NSCocoaErrorDomain)
37+
XCTAssertEqual(nserror.code, 3840)
3838
}
3939
}
4040

4141
func testURLHeader() {
4242
let builder = RequestBodyBuilder.URL(encoding: NSUTF8StringEncoding)
43-
XCTAssert(builder.contentTypeHeader == "application/x-www-form-urlencoded")
43+
XCTAssertEqual(builder.contentTypeHeader, "application/x-www-form-urlencoded")
4444
}
4545

4646
func testURLSuccess() {
@@ -50,9 +50,9 @@ class RequestBodyBuilderTests: XCTestCase {
5050
do {
5151
let data = try builder.buildBodyFromObject(object)
5252
let dictionary = try URLEncodedSerialization.objectFromData(data, encoding: NSUTF8StringEncoding)
53-
XCTAssert(dictionary["foo"] == "1")
54-
XCTAssert(dictionary["bar"] == "2")
55-
XCTAssert(dictionary["baz"] == "3")
53+
XCTAssertEqual(dictionary["foo"], "1")
54+
XCTAssertEqual(dictionary["bar"], "2")
55+
XCTAssertEqual(dictionary["baz"], "3")
5656
} catch {
5757
XCTFail()
5858
}
@@ -62,7 +62,7 @@ class RequestBodyBuilderTests: XCTestCase {
6262
let builder = RequestBodyBuilder.Custom(contentTypeHeader: "foo") { object in
6363
NSData()
6464
}
65-
XCTAssert(builder.contentTypeHeader == "foo")
65+
XCTAssertEqual(builder.contentTypeHeader, "foo")
6666
}
6767

6868
func testCustomSuccess() {
@@ -74,7 +74,7 @@ class RequestBodyBuilderTests: XCTestCase {
7474

7575
do {
7676
let data = try builder.buildBodyFromObject(string)
77-
XCTAssert(data == expectedData)
77+
XCTAssertEqual(data, expectedData)
7878
} catch {
7979
XCTFail()
8080
}
@@ -91,7 +91,7 @@ class RequestBodyBuilderTests: XCTestCase {
9191
try builder.buildBodyFromObject(string)
9292
XCTFail()
9393
} catch {
94-
XCTAssert((error as NSError) == expectedError)
94+
XCTAssertEqual((error as NSError), expectedError)
9595
}
9696
}
9797
}

0 commit comments

Comments
 (0)