fix ut

Author: sojingle

Tests/AmplitudeTests/AutocaptureRemoteConfigTests.swift

@@ -662,6 +662,8 @@ class RemoteConfigUrlProtocol: URLProtocol {
     // Configs keyed by API key for test isolation
     static var configsByApiKey: [String: [RemoteConfigClient.RemoteConfig]] = [:]
 
+    private static let responseQueue = DispatchQueue(label: "RemoteConfigUrlProtocol.responseQueue")
+
     static func setConfig(_ config: RemoteConfigClient.RemoteConfig, forApiKey apiKey: String) {
         configsByApiKey[apiKey, default: []].append(config)
     }
@@ -710,7 +712,7 @@ class RemoteConfigUrlProtocol: URLProtocol {
                                        headerFields: ["Content-Type": "application/json"])!
         let data = try? JSONSerialization.data(withJSONObject: ["configs": config])
 
-        DispatchQueue.global().asyncAfter(deadline: .now() + DispatchTimeInterval.milliseconds(200)) { [self] in
+        Self.responseQueue.asyncAfter(deadline: .now() + DispatchTimeInterval.milliseconds(100)) { [self] in
             client?.urlProtocol(self, didReceive: response, cacheStoragePolicy: .notAllowed)
             if let data {
                 client?.urlProtocol(self, didLoad: data)

Tests/AmplitudeTests/Supports/FakeURLProtocol.swift

@@ -10,6 +10,8 @@ import Foundation
 class FakeURLProtocol: URLProtocol {
     static var mockResponses: [MockResponse] = []
 
+    private static let responseQueue = DispatchQueue(label: "FakeURLProtocol.responseQueue")
+
     struct MockResponse {
         let statusCode: Int
         let data: Data?
@@ -65,7 +67,7 @@ class FakeURLProtocol: URLProtocol {
 
         let delay = mockResponse.delay
 
-        DispatchQueue.global().asyncAfter(deadline: .now() + delay) { [weak self] in
+        Self.responseQueue.asyncAfter(deadline: .now() + delay) { [weak self] in
             guard let self = self else { return }
 
             self.client?.urlProtocol(self, didReceive: response, cacheStoragePolicy: .notAllowed)

Tests/AmplitudeTests/Supports/TestUtilities.swift

@@ -137,6 +137,8 @@ class FakeHttpClient: HttpClient {
     var uploadExpectations: [XCTestExpectation] = []
     var uploadResults: [Result<Int, Error>] = []
 
+    let completionQueue = DispatchQueue(label: "FakeHttpClient.completionQueue")
+
     override func upload(events: String, completion: @escaping (_ result: Result<Int, Error>) -> Void)
         -> URLSessionDataTask?
     {
@@ -150,7 +152,7 @@ class FakeHttpClient: HttpClient {
             result = uploadResults.removeFirst()
         }
 
-        DispatchQueue.global().async { [weak self] in
+        completionQueue.async { [weak self] in
             completion(result)
 
             if let self, !self.uploadExpectations.isEmpty {

Tests/AmplitudeTests/Utilities/EventPipelineTests.swift

@@ -204,12 +204,14 @@ final class EventPipelineTests: XCTestCase {
         ]
 
         pipeline.flush()
-        wait(for: [uploadExpectations[0], uploadExpectations[1]], timeout: 2)
+        // Expected: upload 0 (instant) + upload 1 (1s retry delay)
+        wait(for: [uploadExpectations[0], uploadExpectations[1]], timeout: 5)
 
         XCTAssertEqual(httpClient.uploadCount, 2)
         XCTAssertEqual(pipeline.configuration.offline, false)
 
-        wait(for: [uploadExpectations[2]], timeout: 3)
+        // Expected: upload 2 (2s retry delay)
+        wait(for: [uploadExpectations[2]], timeout: 5)
 
         XCTAssertEqual(httpClient.uploadCount, 3)
         XCTAssertEqual(pipeline.configuration.offline, true)
@@ -219,7 +221,7 @@ final class EventPipelineTests: XCTestCase {
         pipeline.flush {
             flushExpectation.fulfill()
         }
-        wait(for: [uploadExpectations[3], flushExpectation], timeout: 1)
+        wait(for: [uploadExpectations[3], flushExpectation], timeout: 2)
 
         XCTAssertEqual(httpClient.uploadCount, 4)
     }
@@ -256,6 +258,7 @@ final class EventPipelineTests: XCTestCase {
         }
 
         wait(for: uploadExpectations + [flushExpectation], timeout: 1)
+
         XCTAssertEqual(httpClient.uploadCount, 3)
         XCTAssertEqual(pipeline.configuration.offline, false)
     }