Merge pull request #3893 from Crebs/@W-18992574

[DO NOT MERGE] @W-18992574 Updating unit test on web sockets to clean up after each test more

Author: Crebs

libs/SalesforceSDKCore/SalesforceSDKCoreTests/WebSocketClientTests.swift

@@ -98,43 +98,52 @@ class MockUserAccountManager: UserAccountManaging {
 }
 
 final class WebSocketClientTests: XCTestCase {
+    var client: WebSocketClient?
+    var mockTask: MockWebSocket?
+    
+    override func tearDown() {
+        client?.cancel()
+        client = nil
+        mockTask = nil
+        super.tearDown()
+    }
 
     func testSendMessageSuccess() async {
         // Given
-        let mockTask = MockWebSocket()
-        let client = WebSocketClient(task: mockTask)
+        mockTask = MockWebSocket()
+        client = WebSocketClient(task: mockTask!)
         let message = URLSessionWebSocketTask.Message.string("test")
 
         // When
         do {
-            try await client.send(message)
-            XCTAssertEqual(mockTask.sentMessages.count, 1)
+            try await client?.send(message)
+            XCTAssertEqual(mockTask?.sentMessages.count, 1)
         } catch {
             XCTFail("Shouldn't send message: \(error)")
         }
     }
 
     func testCancelTask() {
         // Given
-        let mockTask = MockWebSocket()
-        let client = WebSocketClient(task: mockTask)
+        mockTask = MockWebSocket()
+        client = WebSocketClient(task: mockTask!)
 
         // When
-        client.cancel()
+        client?.cancel()
 
         // Then
-        XCTAssertTrue(mockTask.didCancel)
+        XCTAssertTrue(mockTask?.didCancel ?? false)
     }
 
     func testListenReceivesSuccessMessage() {
 
         // Given
-        let mockTask = MockWebSocket()
-        let client = WebSocketClient(task: mockTask)
+        mockTask = MockWebSocket()
+        client = WebSocketClient(task: mockTask!)
         let expectation = self.expectation(description: "Message received")
 
         // When
-        client.listen { result in
+        client?.listen { result in
             switch result {
             case .success(_):
                 // Then
@@ -148,20 +157,20 @@ final class WebSocketClientTests: XCTestCase {
 
     func testListenReceivesFailureAndPerformRetryToSuccess() {
         // Given
-        let mockTask = MockWebSocket()
-        mockTask.shouldError.toggle()
-        mockTask.originalRequest = URLRequest(url: URL(string: "ws://mock.com")!)
+        mockTask = MockWebSocket()
+        mockTask?.shouldError.toggle()
+        mockTask?.originalRequest = URLRequest(url: URL(string: "ws://mock.com")!)
         let mockNetwork = MockNetwork()
         mockNetwork.mockWebSocket = mockTask
         let mockAccountManager = MockUserAccountManager()
-        let client = WebSocketClient(task: mockTask,
-                                     network: mockNetwork,
-                                     accountManager: mockAccountManager)
+        client = WebSocketClient(task: mockTask!,
+                                 network: mockNetwork,
+                                 accountManager: mockAccountManager)
         let expectation = self.expectation(description: "Success received")
 
         // When
-        client.listen { result in
-            mockTask.keepReceivingMessages.toggle()
+        client?.listen { result in
+            self.mockTask?.keepReceivingMessages.toggle()
             switch result {
             case .success(let message):
                 // Then
@@ -175,25 +184,29 @@ final class WebSocketClientTests: XCTestCase {
 
     func testListenReceivesFailureAndPerformRetryToFailure() {
         // Given
-        let mockTask = MockWebSocket()
-        mockTask.shouldError.toggle()
-        mockTask.originalRequest = URLRequest(url: URL(string: "ws://mock.com")!)
+        mockTask = MockWebSocket()
+        mockTask?.shouldError.toggle()
+        mockTask?.originalRequest = URLRequest(url: URL(string: "ws://mock.com")!)
         let mockAccountManager = MockUserAccountManager()
         mockAccountManager.shouldError.toggle()
         let mockNetwork = MockNetwork()
         mockNetwork.shouldError.toggle()
-        let client = WebSocketClient(task: mockTask,
-                                     network: mockNetwork,
-                                     accountManager: mockAccountManager)
+        client = WebSocketClient(task: mockTask!,
+                                 network: mockNetwork,
+                                 accountManager: mockAccountManager)
         let expectation = self.expectation(description: "Error received")
+        var fulfilled = false
 
         // When
-        client.listen { result in
+        client?.listen { result in
             switch result {
             case .failure(let error):
                 // Then
                 XCTAssertNotNil(error)
-                expectation.fulfill()
+                if !fulfilled {
+                    fulfilled = true
+                    expectation.fulfill()
+                }
             default:
                 XCTFail("Expected Failure")
             }