Skip to content

Commit 21f73a8

Browse files
committed
[ObjectMapperTests] Reuse mapper instance
1 parent e2bb0f6 commit 21f73a8

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

ObjectMapperTests/ObjectMapperTests.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ import XCTest
1111
import ObjectMapper
1212

1313
class ObjectMapperTests: XCTestCase {
14+
15+
let userMapper = Mapper<User>()
1416

1517
override func setUp() {
1618
super.setUp()
@@ -44,7 +46,7 @@ class ObjectMapperTests: XCTestCase {
4446

4547
let userJSONString = "{\"username\":\"\(username)\",\"identifier\":\"\(identifier)\",\"photoCount\":\(photoCount),\"age\":\(age),\"drinker\":\(drinker),\"smoker\":\(smoker), \"arr\":[ \"bla\", true, 42 ], \"dict\":{ \"key1\" : \"value1\", \"key2\" : false, \"key3\" : 142 }, \"arrOpt\":[ \"bla\", true, 42 ], \"dictOpt\":{ \"key1\" : \"value1\", \"key2\" : false, \"key3\" : 142 }, \"birthday\": 1398956159, \"birthdayOpt\": 1398956159, \"y2k\" : \"2000-01-01T00:00:00Z\", \"y2kOpt\" : \"2000-01-01T00:00:00Z\", \"weight\": \(weight), \"float\": \(float), \"friend\": \(subUserJSON), \"friendDictionary\":{ \"bestFriend\": \(subUserJSON)}}"
4648

47-
let user = Mapper<User>().map(string: userJSONString)
49+
let user = userMapper.map(string: userJSONString)
4850

4951
XCTAssertEqual(username, user.username, "Username should be the same")
5052
XCTAssertEqual(identifier, user.identifier!, "Identifier should be the same")
@@ -138,15 +140,15 @@ class ObjectMapperTests: XCTestCase {
138140

139141
let userJSONString = "{\"username\":\"bob\", \"height\": {\"value\": \(heightInCM), \"text\": \"6 feet tall\"} }"
140142

141-
let user = Mapper<User>().map(string: userJSONString)
143+
let user = userMapper.map(string: userJSONString)
142144

143145
XCTAssertEqual(user.heightInCM!, heightInCM, "Username should be the same")
144146
}
145147

146148
func testNullObject() {
147149
let userJSONString = "{\"username\":\"bob\"}"
148150

149-
let user = Mapper<User>().map(string: userJSONString)
151+
let user = userMapper.map(string: userJSONString)
150152

151153
XCTAssert(user.heightInCM == nil, "Username should be the same")
152154
}
@@ -168,7 +170,7 @@ class ObjectMapperTests: XCTestCase {
168170

169171
let jsonString = Mapper().toJSONString(user, prettyPrint: true)
170172
println(jsonString)
171-
var parsedUser = Mapper<User>().map(string: jsonString)
173+
var parsedUser = userMapper.map(string: jsonString)
172174

173175

174176
XCTAssertEqual(user.identifier!, parsedUser.identifier!, "Identifier should be the same")
@@ -185,15 +187,15 @@ class ObjectMapperTests: XCTestCase {
185187

186188
func testUnknownPropertiesIgnored() {
187189
let userJSONString = "{\"username\":\"bob\",\"identifier\":\"bob1987\", \"foo\" : \"bar\", \"fooArr\" : [ 1, 2, 3], \"fooObj\" : { \"baz\" : \"qux\" } }"
188-
let user = Mapper<User>().map(string: userJSONString)
190+
let user = userMapper.map(string: userJSONString)
189191

190192
XCTAssert(user != nil, "User should not be nil")
191193
}
192194

193195
func testInvalidJsonResultsInNilObject() {
194196
let userJSONString = "{\"username\":\"bob\",\"identifier\":\"bob1987\"" // missing ending brace
195197

196-
let user = Mapper<User>().map(string: userJSONString)
198+
let user = userMapper.map(string: userJSONString)
197199

198200
XCTAssert(user == nil, "User should be nil due to invalid JSON")
199201
}
@@ -301,16 +303,14 @@ class ObjectMapperTests: XCTestCase {
301303
}
302304

303305
func testISO8601DateTransformWithInvalidInput() {
304-
let mapper = Mapper<User>()
305-
306306
var JSON: [String: AnyObject] = ["y2kOpt": ""]
307-
let user1 = mapper.map(JSON)
307+
let user1 = userMapper.map(JSON)
308308

309309
XCTAssert(user1 != nil, "ISO8601DateTransform must not crash for empty string")
310310
XCTAssert(user1.y2kOpt == nil, "ISO8601DateTransform should return nil for empty string")
311311

312312
JSON["y2kOpt"] = "incorrect format"
313-
let user2 = mapper.map(JSON)
313+
let user2 = userMapper.map(JSON)
314314

315315
XCTAssert(user2 != nil, "ISO8601DateTransform must not crash for incorrect format")
316316
XCTAssert(user2.y2kOpt == nil, "ISO8601DateTransform should return nil for incorrect format")

0 commit comments

Comments
 (0)