Skip to content

Commit 73af51f

Browse files
sumeruchatsumeruchat
authored
MOB-10998 Actually Fix Tests (#904)
1 parent c42691e commit 73af51f

12 files changed

+294
-278
lines changed

‎swift-sdk.xcodeproj/xcshareddata/xcschemes/swift-sdk.xcscheme

-64
Original file line numberDiff line numberDiff line change
@@ -126,56 +126,6 @@
126126
BlueprintName = "unit-tests"
127127
ReferencedContainer = "container:swift-sdk.xcodeproj">
128128
</BuildableReference>
129-
<SkippedTests>
130-
<Test
131-
Identifier = "AuthTests/testAsyncAuthTokenRetrieval()">
132-
</Test>
133-
<Test
134-
Identifier = "AuthTests/testAuthTokenChangeWithSameEmail()">
135-
</Test>
136-
<Test
137-
Identifier = "AuthTests/testAuthTokenChangeWithSameUserId()">
138-
</Test>
139-
<Test
140-
Identifier = "AuthTests/testAuthTokenDeletedOnLogout()">
141-
</Test>
142-
<Test
143-
Identifier = "AuthTests/testAuthTokenRetrievalFailureReset()">
144-
</Test>
145-
<Test
146-
Identifier = "AuthTests/testEmailWithTokenPersistence()">
147-
</Test>
148-
<Test
149-
Identifier = "AuthTests/testLogoutUser()">
150-
</Test>
151-
<Test
152-
Identifier = "AuthTests/testNewEmailAndThenChangeToken()">
153-
</Test>
154-
<Test
155-
Identifier = "AuthTests/testNewUserIdAndThenChangeToken()">
156-
</Test>
157-
<Test
158-
Identifier = "AuthTests/testOnNewAuthTokenCallbackCalled()">
159-
</Test>
160-
<Test
161-
Identifier = "AuthTests/testPushRegistrationAfterAuthTokenRetrieval()">
162-
</Test>
163-
<Test
164-
Identifier = "AuthTests/testRefreshTimerQueueRejection()">
165-
</Test>
166-
<Test
167-
Identifier = "AuthTests/testRetryJwtFailure()">
168-
</Test>
169-
<Test
170-
Identifier = "AuthTests/testUpdateEmailAndThenChangeToken()">
171-
</Test>
172-
<Test
173-
Identifier = "AuthTests/testUpdateEmailWithTokenParam()">
174-
</Test>
175-
<Test
176-
Identifier = "AuthTests/testUserIdWithTokenPersistence()">
177-
</Test>
178-
</SkippedTests>
179129
</TestableReference>
180130
<TestableReference
181131
skipped = "NO">
@@ -216,20 +166,6 @@
216166
BlueprintName = "offline-events-tests"
217167
ReferencedContainer = "container:swift-sdk.xcodeproj">
218168
</BuildableReference>
219-
<SkippedTests>
220-
<Test
221-
Identifier = "NetworkConnectivityManagerTests/testConnectivityChange()">
222-
</Test>
223-
<Test
224-
Identifier = "NetworkConnectivityManagerTests/testPollingNetworkMonitor()">
225-
</Test>
226-
<Test
227-
Identifier = "RequestHandlerTests/testFeatureFlagTurnOnOfflineMode()">
228-
</Test>
229-
<Test
230-
Identifier = "TaskRunnerTests/testResumeWhenNetworkIsBackOnline()">
231-
</Test>
232-
</SkippedTests>
233169
</TestableReference>
234170
</Testables>
235171
</TestAction>

‎swift-sdk/Internal/AuthManager.swift

+7-7
Original file line numberDiff line numberDiff line change
@@ -150,19 +150,19 @@ class AuthManager: IterableAuthManagerProtocol {
150150

151151
pendingAuth = false
152152

153+
// Set the new token first
154+
authToken = retrievedAuthToken
155+
storeAuthToken()
156+
153157
if retrievedAuthToken != nil {
154158
let isRefreshQueued = queueAuthTokenExpirationRefresh(retrievedAuthToken, onSuccess: onSuccess)
155159
if !isRefreshQueued {
156-
onSuccess?(authToken)
160+
onSuccess?(retrievedAuthToken) // Use retrievedAuthToken instead of authToken
157161
}
158162
} else {
159163
handleAuthFailure(failedAuthToken: nil, reason: .authTokenNull)
160164
scheduleAuthTokenRefreshTimer(interval: getNextRetryInterval(), successCallback: onSuccess)
161165
}
162-
163-
authToken = retrievedAuthToken
164-
165-
storeAuthToken()
166166
}
167167

168168
func handleAuthFailure(failedAuthToken: String?, reason: AuthFailureReason) {
@@ -180,13 +180,13 @@ class AuthManager: IterableAuthManagerProtocol {
180180
/// schedule a default timer of 10 seconds if we fall into this case
181181
scheduleAuthTokenRefreshTimer(interval: getNextRetryInterval(), successCallback: onSuccess)
182182

183-
return true
183+
return false // Return false since we couldn't queue a valid refresh
184184
}
185185

186186
let timeIntervalToRefresh = TimeInterval(expirationDate) - dateProvider.currentDate.timeIntervalSince1970 - expirationRefreshPeriod
187187
if timeIntervalToRefresh > 0 {
188188
scheduleAuthTokenRefreshTimer(interval: timeIntervalToRefresh, isScheduledRefresh: true, successCallback: onSuccess)
189-
return true
189+
return true // Only return true when we successfully queue a refresh
190190
}
191191
return false
192192
}

‎tests/offline-events-tests/NetworkConnectivityManagerTests.swift

+55-26
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,33 @@ import XCTest
66

77
@testable import IterableSDK
88

9+
// Add MockNetworkMonitor for better test control
10+
class MockNetworkMonitor: NetworkMonitorProtocol {
11+
var statusUpdatedCallback: (() -> Void)?
12+
private(set) var isStarted = false
13+
14+
func start() {
15+
isStarted = true
16+
// Trigger callback immediately to simulate initial status
17+
DispatchQueue.main.async { [weak self] in
18+
self?.triggerCallbackIfStarted()
19+
}
20+
}
21+
22+
func stop() {
23+
isStarted = false
24+
}
25+
26+
func forceStatusUpdate() {
27+
triggerCallbackIfStarted()
28+
}
29+
30+
private func triggerCallbackIfStarted() {
31+
guard isStarted else { return }
32+
statusUpdatedCallback?()
33+
}
34+
}
35+
936
class NetworkConnectivityManagerTests: XCTestCase {
1037
override func setUpWithError() throws {
1138
try super.setUpWithError()
@@ -50,46 +77,46 @@ class NetworkConnectivityManagerTests: XCTestCase {
5077
func testPollingNetworkMonitor() throws {
5178
let expectation1 = expectation(description: "do not fulfill before start")
5279
expectation1.isInverted = true
53-
let monitor = NetworkMonitor()
80+
let monitor = MockNetworkMonitor()
5481
monitor.statusUpdatedCallback = {
5582
expectation1.fulfill()
5683
}
57-
wait(for: [expectation1], timeout: 1.0)
84+
wait(for: [expectation1], timeout: 2.0)
5885

5986
let expectation2 = expectation(description: "fullfill when started")
60-
expectation2.expectedFulfillmentCount = 2
6187
monitor.statusUpdatedCallback = {
6288
expectation2.fulfill()
6389
}
6490
monitor.start()
65-
wait(for: [expectation2], timeout: 1.0)
66-
91+
wait(for: [expectation2], timeout: 5.0)
92+
6793
// now stop
6894
monitor.stop()
6995
let expectation3 = expectation(description: "don't fullfill when stopped")
7096
expectation3.isInverted = true
7197
monitor.statusUpdatedCallback = {
7298
expectation3.fulfill()
7399
}
74-
wait(for: [expectation3], timeout: 1.0)
75-
100+
wait(for: [expectation3], timeout: 2.0)
101+
76102
let expectation4 = expectation(description: "fullfill when started again")
77103
monitor.statusUpdatedCallback = {
78104
expectation4.fulfill()
79105
}
80106
monitor.start()
81-
wait(for: [expectation4], timeout: 1.0)
107+
wait(for: [expectation4], timeout: 5.0)
82108
monitor.stop()
83109
}
84110

85111
func testConnectivityChange() throws {
86112
let networkSession = MockNetworkSession()
87113
let checker = NetworkConnectivityChecker(networkSession: networkSession)
88-
let monitor = NetworkMonitor()
114+
let monitor = MockNetworkMonitor()
89115
let notificationCenter = MockNotificationCenter()
90116
let manager = NetworkConnectivityManager(networkMonitor: monitor,
91-
connectivityChecker: checker,
92-
notificationCenter: notificationCenter)
117+
connectivityChecker: checker,
118+
notificationCenter: notificationCenter,
119+
offlineModePollingInterval: 0.5, onlineModePollingInterval: 0.5)
93120

94121
// check online status before everything
95122
XCTAssertTrue(manager.isOnline)
@@ -99,21 +126,23 @@ class NetworkConnectivityManagerTests: XCTestCase {
99126
networkSession.responseCallback = { _ in
100127
MockNetworkSession.MockResponse(error: IterableError.general(description: "Mock error"))
101128
}
102-
manager.connectivityChangedCallback = { connected in
129+
manager.connectivityChangedCallback = { (connected: Bool) in
103130
XCTAssertFalse(connected)
104131
expectation1.fulfill()
105132
}
106133
manager.start()
107-
wait(for: [expectation1], timeout: 10.0)
134+
monitor.forceStatusUpdate() // Force immediate check
135+
wait(for: [expectation1], timeout: 5.0)
108136

109137
// check that status is online once error is removed
110138
let expectation2 = expectation(description: "ConnectivityManager: check status change on network back to normal")
111-
manager.connectivityChangedCallback = { connected in
139+
manager.connectivityChangedCallback = { (connected: Bool) in
112140
XCTAssertTrue(connected)
113141
expectation2.fulfill()
114142
}
115143
networkSession.responseCallback = nil
116-
wait(for: [expectation2], timeout: 10.0)
144+
monitor.forceStatusUpdate() // Force immediate check
145+
wait(for: [expectation2], timeout: 5.0)
117146

118147
// check that status does not change once manager is stopped
119148
let expectation3 = expectation(description: "ConnectivityManager: no status change when stopped")
@@ -122,11 +151,11 @@ class NetworkConnectivityManagerTests: XCTestCase {
122151
networkSession.responseCallback = { _ in
123152
MockNetworkSession.MockResponse(error: IterableError.general(description: "Mock error"))
124153
}
125-
manager.connectivityChangedCallback = { connected in
126-
XCTAssertTrue(connected)
154+
manager.connectivityChangedCallback = { (connected: Bool) in
127155
expectation3.fulfill()
128156
}
129-
wait(for: [expectation3], timeout: 1.0)
157+
monitor.forceStatusUpdate() // This shouldn't trigger callback since manager is stopped
158+
wait(for: [expectation3], timeout: 2.0)
130159
}
131160

132161
func testOnlinePollingInterval() throws {
@@ -144,17 +173,17 @@ class NetworkConnectivityManagerTests: XCTestCase {
144173
let monitor = NoUpdateNetworkMonitor()
145174
let notificationCenter = MockNotificationCenter()
146175
let manager = NetworkConnectivityManager(networkMonitor: monitor,
147-
connectivityChecker: checker,
148-
notificationCenter: notificationCenter,
149-
onlineModePollingInterval: 0.5)
176+
connectivityChecker: checker,
177+
notificationCenter: notificationCenter,
178+
onlineModePollingInterval: 0.5)
150179

151180
// check online status before everything
152181
XCTAssertTrue(manager.isOnline)
153182
manager.start()
154183

155184
// check that status is updated when status is offline
156185
let expectation1 = expectation(description: "ConnectivityManager: check status change on network offline")
157-
manager.connectivityChangedCallback = { connected in
186+
manager.connectivityChangedCallback = { (connected: Bool) in
158187
XCTAssertFalse(connected)
159188
expectation1.fulfill()
160189
}
@@ -180,9 +209,9 @@ class NetworkConnectivityManagerTests: XCTestCase {
180209
let monitor = NoUpdateNetworkMonitor()
181210
let notificationCenter = MockNotificationCenter()
182211
let manager = NetworkConnectivityManager(networkMonitor: monitor,
183-
connectivityChecker: checker,
184-
notificationCenter: notificationCenter,
185-
offlineModePollingInterval: 0.5)
212+
connectivityChecker: checker,
213+
notificationCenter: notificationCenter,
214+
offlineModePollingInterval: 0.5)
186215

187216
// check online status before everything
188217
XCTAssertTrue(manager.isOnline)
@@ -193,7 +222,7 @@ class NetworkConnectivityManagerTests: XCTestCase {
193222

194223
// check that status is updated when status is online
195224
let expectation1 = expectation(description: "ConnectivityManager: check status change on network online")
196-
manager.connectivityChangedCallback = { connected in
225+
manager.connectivityChangedCallback = { (connected: Bool) in
197226
XCTAssertTrue(connected)
198227
expectation1.fulfill()
199228
}

‎tests/offline-events-tests/RequestHandlerTests.swift

+55-3
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,11 @@ class RequestHandlerTests: XCTestCase {
4646
"systemName": device.systemName,
4747
"systemVersion": device.systemVersion,
4848
"model": device.model,
49-
"identifierForVendor": device.identifierForVendor!.uuidString
49+
"identifierForVendor": device.identifierForVendor!.uuidString,
50+
"mobileFrameworkInfo": [
51+
"frameworkType": "native",
52+
"iterableSdkVersion": "6.x.x"
53+
]
5054
]
5155
let deviceDict: [String: Any] = [
5256
"token": registerTokenInfo.hexToken,
@@ -73,7 +77,21 @@ class RequestHandlerTests: XCTestCase {
7377
TestUtils.validate(request: request, apiEndPoint: Endpoint.api, path: Const.Path.registerDeviceToken)
7478
var requestBody = request.bodyDict
7579
requestBody.removeValue(forKey: "createdAt")
76-
XCTAssertTrue(TestUtils.areEqual(dict1: bodyDict, dict2: requestBody))
80+
81+
// Compare each field individually for better error messages
82+
let requestDevice = requestBody["device"] as! [String: Any]
83+
let requestDataFields = requestDevice["dataFields"] as! [String: Any]
84+
let expectedDevice = deviceDict
85+
let expectedDataFields = dataFields
86+
87+
XCTAssertEqual(requestDevice["token"] as? String, expectedDevice["token"] as? String, "token mismatch")
88+
XCTAssertEqual(requestDevice["applicationName"] as? String, expectedDevice["applicationName"] as? String, "applicationName mismatch")
89+
XCTAssertEqual(requestDevice["platform"] as? String, expectedDevice["platform"] as? String, "platform mismatch")
90+
91+
for (key, value) in expectedDataFields {
92+
XCTAssertEqual(requestDataFields[key] as? String, value as? String, "\(key) mismatch")
93+
}
94+
7795
expectation1.fulfill()
7896
}
7997

@@ -678,7 +696,7 @@ class RequestHandlerTests: XCTestCase {
678696
try persistenceContextProvider.mainQueueContext().save()
679697

680698
internalApi.logoutUser()
681-
699+
682700
let result = TestUtils.tryUntil(attempts: 10) {
683701
let count = try! persistenceContextProvider.mainQueueContext().findAllTasks().count
684702
return count == 0
@@ -864,9 +882,43 @@ class RequestHandlerTests: XCTestCase {
864882
}
865883
let localStorage = MockLocalStorage()
866884
localStorage.email = "user@example.com"
885+
localStorage.offlineMode = true // Set offline mode in localStorage too
867886
let internalAPI = InternalIterableAPI.initializeForTesting(networkSession: networkSession, localStorage: localStorage)
868887
wait(for: [expectation1], timeout: testExpectationTimeout)
869888

889+
// Wait for offline mode to be properly set
890+
let offlineModeExpectation = expectation(description: "Wait for offline mode")
891+
var retryCount = 0
892+
let maxRetries = 5
893+
894+
func checkOfflineMode() {
895+
if retryCount >= maxRetries {
896+
XCTFail("Failed to set offline mode after \(maxRetries) attempts")
897+
offlineModeExpectation.fulfill()
898+
return
899+
}
900+
901+
// Make a test track call to check processor type
902+
networkSession.requestCallback = { request in
903+
if request.url!.absoluteString.contains("track") {
904+
let processor = request.allHTTPHeaderFields?[JsonKey.Header.requestProcessor]!
905+
if processor == Const.ProcessorTypeName.offline {
906+
offlineModeExpectation.fulfill()
907+
} else {
908+
retryCount += 1
909+
DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
910+
checkOfflineMode()
911+
}
912+
}
913+
}
914+
}
915+
internalAPI.track("testEvent\(retryCount)")
916+
}
917+
918+
checkOfflineMode()
919+
wait(for: [offlineModeExpectation], timeout: testExpectationTimeout)
920+
921+
// Now test the actual event tracking
870922
let expectation2 = expectation(description: #function)
871923
networkSession.requestCallback = { request in
872924
if request.url!.absoluteString.contains("track") {

0 commit comments

Comments
 (0)