Skip to content

Commit 052dbcd

Browse files
cbaker6cbaker6
committed
Fix failing tests
1 parent 950499e commit 052dbcd

File tree

2 files changed

+23
-48
lines changed

2 files changed

+23
-48
lines changed

‎Tests/ParseSwiftTests/ParseUserCombineTests.swift

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -904,7 +904,7 @@ class ParseUserCombineTests: XCTestCase { // swiftlint:disable:this type_body_le
904904
expectation1.fulfill()
905905
return
906906
}
907-
907+
user.createdAt = nil
908908
user.updatedAt = user.updatedAt?.addingTimeInterval(+300)
909909
user.customKey = "newValue"
910910
let userOnServer = [BatchResponseItem<User>(success: user, error: nil)]
@@ -938,22 +938,17 @@ class ParseUserCombineTests: XCTestCase { // swiftlint:disable:this type_body_le
938938
switch $0 {
939939
case .success(let saved):
940940
XCTAssert(saved.hasSameObjectId(as: user))
941-
guard let savedCreatedAt = saved.createdAt,
942-
let savedUpdatedAt = saved.updatedAt else {
941+
guard let savedUpdatedAt = saved.updatedAt else {
943942
XCTFail("Should unwrap dates")
944943
expectation1.fulfill()
945944
return
946945
}
947-
guard let originalCreatedAt = user.createdAt,
948-
let originalUpdatedAt = user.updatedAt,
949-
let serverUpdatedAt = user.updatedAt else {
946+
guard let originalUpdatedAt = user.updatedAt else {
950947
XCTFail("Should unwrap dates")
951948
expectation1.fulfill()
952949
return
953950
}
954-
XCTAssertEqual(savedCreatedAt, originalCreatedAt)
955951
XCTAssertEqual(savedUpdatedAt, originalUpdatedAt)
956-
XCTAssertEqual(savedUpdatedAt, serverUpdatedAt)
957952
XCTAssertEqual(User.current?.customKey, user.customKey)
958953

959954
//Should be updated in memory
@@ -962,7 +957,7 @@ class ParseUserCombineTests: XCTestCase { // swiftlint:disable:this type_body_le
962957
expectation1.fulfill()
963958
return
964959
}
965-
XCTAssertEqual(updatedCurrentDate, serverUpdatedAt)
960+
XCTAssertEqual(updatedCurrentDate, originalUpdatedAt)
966961

967962
#if !os(Linux) && !os(Android) && !os(Windows)
968963
//Should be updated in Keychain
@@ -973,7 +968,7 @@ class ParseUserCombineTests: XCTestCase { // swiftlint:disable:this type_body_le
973968
expectation1.fulfill()
974969
return
975970
}
976-
XCTAssertEqual(keychainUpdatedCurrentDate, serverUpdatedAt)
971+
XCTAssertEqual(keychainUpdatedCurrentDate, originalUpdatedAt)
977972
#endif
978973
case .failure(let error):
979974
XCTFail("Should have fetched: \(error.localizedDescription)")

‎Tests/ParseSwiftTests/ParseUserTests.swift

Lines changed: 18 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -2084,7 +2084,7 @@ class ParseUserTests: XCTestCase { // swiftlint:disable:this type_body_length
20842084
XCTFail("Should unwrap dates")
20852085
return
20862086
}
2087-
2087+
user.createdAt = nil
20882088
var user2 = user
20892089
user2.customKey = "oldValue"
20902090
user.updatedAt = user.updatedAt?.addingTimeInterval(+300)
@@ -2112,28 +2112,23 @@ class ParseUserTests: XCTestCase { // swiftlint:disable:this type_body_length
21122112
switch $0 {
21132113
case .success(let saved):
21142114
XCTAssert(saved.hasSameObjectId(as: user))
2115-
guard let savedCreatedAt = saved.createdAt,
2116-
let savedUpdatedAt = saved.updatedAt else {
2115+
guard let savedUpdatedAt = saved.updatedAt else {
21172116
XCTFail("Should unwrap dates")
21182117
return
21192118
}
2120-
guard let originalCreatedAt = user.createdAt,
2121-
let originalUpdatedAt = user.updatedAt,
2122-
let serverUpdatedAt = user.updatedAt else {
2119+
guard let originalUpdatedAt = user.updatedAt else {
21232120
XCTFail("Should unwrap dates")
21242121
return
21252122
}
2126-
XCTAssertEqual(savedCreatedAt, originalCreatedAt)
21272123
XCTAssertEqual(savedUpdatedAt, originalUpdatedAt)
2128-
XCTAssertEqual(savedUpdatedAt, serverUpdatedAt)
21292124
XCTAssertEqual(User.current?.customKey, user.customKey)
21302125

21312126
//Should be updated in memory
21322127
guard let updatedCurrentDate = User.current?.updatedAt else {
21332128
XCTFail("Should unwrap current date")
21342129
return
21352130
}
2136-
XCTAssertEqual(updatedCurrentDate, serverUpdatedAt)
2131+
XCTAssertEqual(updatedCurrentDate, originalUpdatedAt)
21372132

21382133
#if !os(Linux) && !os(Android) && !os(Windows)
21392134
//Should be updated in Keychain
@@ -2143,7 +2138,7 @@ class ParseUserTests: XCTestCase { // swiftlint:disable:this type_body_length
21432138
XCTFail("Should get object from Keychain")
21442139
return
21452140
}
2146-
XCTAssertEqual(keychainUpdatedCurrentDate, serverUpdatedAt)
2141+
XCTAssertEqual(keychainUpdatedCurrentDate, originalUpdatedAt)
21472142
#endif
21482143
case .failure(let error):
21492144
XCTFail("Should have fetched: \(error.localizedDescription)")
@@ -2159,28 +2154,23 @@ class ParseUserTests: XCTestCase { // swiftlint:disable:this type_body_length
21592154
switch $0 {
21602155
case .success(let saved):
21612156
XCTAssert(saved.hasSameObjectId(as: user))
2162-
guard let savedCreatedAt = saved.createdAt,
2163-
let savedUpdatedAt = saved.updatedAt else {
2157+
guard let savedUpdatedAt = saved.updatedAt else {
21642158
XCTFail("Should unwrap dates")
21652159
return
21662160
}
2167-
guard let originalCreatedAt = user.createdAt,
2168-
let originalUpdatedAt = user.updatedAt,
2169-
let serverUpdatedAt = user.updatedAt else {
2161+
guard let originalUpdatedAt = user.updatedAt else {
21702162
XCTFail("Should unwrap dates")
21712163
return
21722164
}
2173-
XCTAssertEqual(savedCreatedAt, originalCreatedAt)
21742165
XCTAssertEqual(savedUpdatedAt, originalUpdatedAt)
2175-
XCTAssertEqual(savedUpdatedAt, serverUpdatedAt)
21762166
XCTAssertEqual(User.current?.customKey, user.customKey)
21772167

21782168
//Should be updated in memory
21792169
guard let updatedCurrentDate = User.current?.updatedAt else {
21802170
XCTFail("Should unwrap current date")
21812171
return
21822172
}
2183-
XCTAssertEqual(updatedCurrentDate, serverUpdatedAt)
2173+
XCTAssertEqual(updatedCurrentDate, originalUpdatedAt)
21842174

21852175
#if !os(Linux) && !os(Android) && !os(Windows)
21862176
//Should be updated in Keychain
@@ -2190,7 +2180,7 @@ class ParseUserTests: XCTestCase { // swiftlint:disable:this type_body_length
21902180
XCTFail("Should get object from Keychain")
21912181
return
21922182
}
2193-
XCTAssertEqual(keychainUpdatedCurrentDate, serverUpdatedAt)
2183+
XCTAssertEqual(keychainUpdatedCurrentDate, originalUpdatedAt)
21942184
#endif
21952185
case .failure(let error):
21962186
XCTFail("Should have fetched: \(error.localizedDescription)")
@@ -2215,7 +2205,7 @@ class ParseUserTests: XCTestCase { // swiftlint:disable:this type_body_length
22152205
expectation2.fulfill()
22162206
return
22172207
}
2218-
2208+
user.createdAt = nil
22192209
var user2 = user
22202210
user2.customKey = "oldValue"
22212211
user.updatedAt = user.updatedAt?.addingTimeInterval(+300)
@@ -2247,22 +2237,17 @@ class ParseUserTests: XCTestCase { // swiftlint:disable:this type_body_length
22472237
switch $0 {
22482238
case .success(let saved):
22492239
XCTAssert(saved.hasSameObjectId(as: user))
2250-
guard let savedCreatedAt = saved.createdAt,
2251-
let savedUpdatedAt = saved.updatedAt else {
2240+
guard let savedUpdatedAt = saved.updatedAt else {
22522241
XCTFail("Should unwrap dates")
22532242
expectation1.fulfill()
22542243
return
22552244
}
2256-
guard let originalCreatedAt = user.createdAt,
2257-
let originalUpdatedAt = user.updatedAt,
2258-
let serverUpdatedAt = user.updatedAt else {
2245+
guard let originalUpdatedAt = user.updatedAt else {
22592246
XCTFail("Should unwrap dates")
22602247
expectation1.fulfill()
22612248
return
22622249
}
2263-
XCTAssertEqual(savedCreatedAt, originalCreatedAt)
22642250
XCTAssertEqual(savedUpdatedAt, originalUpdatedAt)
2265-
XCTAssertEqual(savedUpdatedAt, serverUpdatedAt)
22662251
XCTAssertEqual(User.current?.customKey, user.customKey)
22672252

22682253
//Should be updated in memory
@@ -2271,7 +2256,7 @@ class ParseUserTests: XCTestCase { // swiftlint:disable:this type_body_length
22712256
expectation1.fulfill()
22722257
return
22732258
}
2274-
XCTAssertEqual(updatedCurrentDate, serverUpdatedAt)
2259+
XCTAssertEqual(updatedCurrentDate, originalUpdatedAt)
22752260

22762261
#if !os(Linux) && !os(Android) && !os(Windows)
22772262
//Should be updated in Keychain
@@ -2282,7 +2267,7 @@ class ParseUserTests: XCTestCase { // swiftlint:disable:this type_body_length
22822267
expectation1.fulfill()
22832268
return
22842269
}
2285-
XCTAssertEqual(keychainUpdatedCurrentDate, serverUpdatedAt)
2270+
XCTAssertEqual(keychainUpdatedCurrentDate, originalUpdatedAt)
22862271
#endif
22872272
case .failure(let error):
22882273
XCTFail("Should have fetched: \(error.localizedDescription)")
@@ -2302,22 +2287,17 @@ class ParseUserTests: XCTestCase { // swiftlint:disable:this type_body_length
23022287
switch $0 {
23032288
case .success(let saved):
23042289
XCTAssert(saved.hasSameObjectId(as: user))
2305-
guard let savedCreatedAt = saved.createdAt,
2306-
let savedUpdatedAt = saved.updatedAt else {
2290+
guard let savedUpdatedAt = saved.updatedAt else {
23072291
XCTFail("Should unwrap dates")
23082292
expectation2.fulfill()
23092293
return
23102294
}
2311-
guard let originalCreatedAt = user.createdAt,
2312-
let originalUpdatedAt = user.updatedAt,
2313-
let serverUpdatedAt = user.updatedAt else {
2295+
guard let originalUpdatedAt = user.updatedAt else {
23142296
XCTFail("Should unwrap dates")
23152297
expectation2.fulfill()
23162298
return
23172299
}
2318-
XCTAssertEqual(savedCreatedAt, originalCreatedAt)
23192300
XCTAssertEqual(savedUpdatedAt, originalUpdatedAt)
2320-
XCTAssertEqual(savedUpdatedAt, serverUpdatedAt)
23212301
XCTAssertEqual(User.current?.customKey, user.customKey)
23222302

23232303
//Should be updated in memory
@@ -2326,7 +2306,7 @@ class ParseUserTests: XCTestCase { // swiftlint:disable:this type_body_length
23262306
expectation2.fulfill()
23272307
return
23282308
}
2329-
XCTAssertEqual(updatedCurrentDate, serverUpdatedAt)
2309+
XCTAssertEqual(updatedCurrentDate, originalUpdatedAt)
23302310

23312311
#if !os(Linux) && !os(Android) && !os(Windows)
23322312
//Should be updated in Keychain
@@ -2337,7 +2317,7 @@ class ParseUserTests: XCTestCase { // swiftlint:disable:this type_body_length
23372317
expectation2.fulfill()
23382318
return
23392319
}
2340-
XCTAssertEqual(keychainUpdatedCurrentDate, serverUpdatedAt)
2320+
XCTAssertEqual(keychainUpdatedCurrentDate, originalUpdatedAt)
23412321
#endif
23422322
case .failure(let error):
23432323
XCTFail("Should have fetched: \(error.localizedDescription)")

0 commit comments

Comments
 (0)