Skip to content

Commit a09f23e

Browse files
Hongyan JiangGitHub Enterprise
authored andcommitted
mock Monitors object for sharedInstana object in InstanaTestCase (#94)
1 parent 9b7716e commit a09f23e

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

Tests/InstanaAgentTests/Mocks/HTTPMocks.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ extension URL {
1212
}
1313
}
1414

15-
class MockHTTPURLResponse: HTTPURLResponse {
15+
class MockHTTPURLResponse: HTTPURLResponse, @unchecked Sendable {
1616
var stubbedAllHeaderFields: [AnyHashable: Any] = ["":""]
1717
var stubbedStatusCode: Int = 200
1818
override var allHeaderFields: [AnyHashable : Any] { stubbedAllHeaderFields }
@@ -22,12 +22,12 @@ class MockHTTPURLResponse: HTTPURLResponse {
2222
}
2323
}
2424

25-
class MockURLSessionTask: URLSessionTask {
25+
class MockURLSessionTask: URLSessionTask, @unchecked Sendable {
2626
var stubbedResponse: URLResponse?
2727
override var response: URLResponse? { stubbedResponse }
2828
}
2929

30-
class MockURLSessionTaskMetrics: URLSessionTaskMetrics {
30+
class MockURLSessionTaskMetrics: URLSessionTaskMetrics, @unchecked Sendable {
3131
var stubbedTransactionMetrics = [URLSessionTaskTransactionMetrics]()
3232
override var transactionMetrics: [URLSessionTaskTransactionMetrics] { stubbedTransactionMetrics }
3333
static var random: MockURLSessionTaskMetrics {
@@ -39,7 +39,7 @@ class MockURLSessionTaskMetrics: URLSessionTaskMetrics {
3939
}
4040
}
4141

42-
class MockURLSessionTaskTransactionMetrics: URLSessionTaskTransactionMetrics {
42+
class MockURLSessionTaskTransactionMetrics: URLSessionTaskTransactionMetrics, @unchecked Sendable {
4343
var stubbedCountOfResponseHeaderBytesReceived: Int64 = 0
4444
var stubbedCountOfResponseBodyBytesReceived: Int64 = 0
4545
var stubbedCountOfResponseBodyBytesAfterDecoding: Int64 = 0

Tests/InstanaAgentTests/Monitors/HTTP/InstanaURLProtocolTests.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,8 +386,7 @@ class InstanaURLProtocolTests: InstanaTestCase {
386386
wait(for: [waitFor], timeout: 3.0)
387387
AssertEqualAndNotNil(urlProtocol.marker?.backendTracingID, backendTracingID)
388388
AssertTrue(delegate.calledFinalized)
389-
let responseCode = 400
390-
if case let .failed(responseCode, error) = urlProtocol.marker?.state {
389+
if case let .failed(_, error) = urlProtocol.marker?.state {
391390
resultError = error as NSError
392391
} else {
393392
XCTFail("Wrong state for marker")

Tests/InstanaAgentTests/Test helpers/InstanaTestCase.swift

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ class InstanaTestCase: XCTestCase {
1313
var config = InstanaConfiguration.mock(key: "KEY", reportingURL: .random, httpCaptureConfig: .automatic)
1414
config.gzipReport = false
1515
let session = InstanaSession.mock(configuration: config)
16-
let instana = Instana(session: session)
16+
17+
let mockReporter = MockReporter()
18+
let mockMonitors = Monitors(session, reporter: mockReporter)
19+
20+
let instana = Instana(session: session, monitors: mockMonitors)
1721
Instana.current = instana
1822
return instana
1923
}()

0 commit comments

Comments
 (0)