fix testSwitchesToPeriodicReconnectionAfterMaxImmediateAttempts

reown-com · Sep 19, 2024 · d45d0bd · d45d0bd
1 parent 79bbe71
commit d45d0bd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/Sources/WalletConnectRelay/SocketConnectionHandler/WebSocket.swift b/Sources/WalletConnectRelay/SocketConnectionHandler/WebSocket.swift
@@ -24,8 +24,12 @@ class WebSocketMock: WebSocketConnecting {
     var onDisconnect: ((Error?) -> Void)?
     var sendCallCount: Int = 0
     var isConnected: Bool = false
+    var blockConnection = false
 
     func connect() {
+        guard !blockConnection else {
+            return
+        }
         isConnected = true
         onConnect?()
     }

diff --git a/Tests/RelayerTests/AutomaticSocketConnectionHandlerTests.swift b/Tests/RelayerTests/AutomaticSocketConnectionHandlerTests.swift
@@ -16,9 +16,7 @@ final class AutomaticSocketConnectionHandlerTests: XCTestCase {
         networkMonitor = NetworkMonitoringMock()
         appStateObserver = AppStateObserverMock()
 
-        let defaults = RuntimeKeyValueStorage()
         let logger = ConsoleLogger(prefix: "", loggingLevel: .debug)
-        let keychainStorageMock = DispatcherKeychainStorageMock()
 
         backgroundTaskRegistrar = BackgroundTaskRegistrarMock()
         subscriptionsTracker = SubscriptionsTrackerMock()
@@ -118,7 +116,7 @@ final class AutomaticSocketConnectionHandlerTests: XCTestCase {
 
         await sut.handleDisconnection()
 
-        await fulfillment(of: [expectation], timeout: 5.0)
+        await fulfillment(of: [expectation], timeout: 15.0)
     }
 
     func testNotReconnectOnDisconnectForegroundWhenNoSubscriptions() async {
@@ -201,20 +199,21 @@ final class AutomaticSocketConnectionHandlerTests: XCTestCase {
         // Simulate entering foreground
         appStateObserver.onWillEnterForeground?()
 
-        await fulfillment(of: [expectation], timeout: 5.0)
-
-        XCTAssertTrue(webSocketSession.isConnected)
+        await fulfillment(of: [expectation], timeout: 15.0)
     }
 
     func testSwitchesToPeriodicReconnectionAfterMaxImmediateAttempts() async {
         subscriptionsTracker.isSubscribedReturnValue = true // Ensure subscriptions exist to allow reconnection
         sut.periodicReconnectionInterval = 3 // Set shorter interval for testing
+        webSocketSession.blockConnection = true
         sut.connect() // Start connection process
 
         // Simulate immediate reconnection attempts
         for _ in 0..<sut.maxImmediateAttempts {
             print("Simulating disconnection")
             socketStatusProviderMock.simulateConnectionStatus(.disconnected)
+            webSocketSession.isConnected = false
+
             // Wait to allow the handler to process each disconnection
             try? await Task.sleep(nanoseconds: 500_000_000) // 200ms
         }