Skip to content

Commit bacef42

Browse files
maxepmaxep
committed
[chain-pr 8/10] DatadogRUM: typed-bus migration and TelemetryInterceptor merge
1 parent 185b00a commit bacef42

22 files changed

Lines changed: 376 additions & 402 deletions

‎DatadogCore/Tests/Datadog/InternalProxyTests.swift‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ class InternalProxyTests: XCTestCase {
1717

1818
override func setUp() {
1919
super.setUp()
20-
core = PassthroughCoreMock(messageReceiver: telemetry)
20+
core = PassthroughCoreMock()
21+
core.subscribe(receiver: telemetry)
2122
}
2223

2324
override func tearDown() {

‎DatadogCore/Tests/Datadog/Mocks/RUM/RUMFeatureMocks.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@ extension RUM.Configuration {
3333
}
3434

3535
extension WebViewEventReceiver: AnyMockable {
36-
public static func mockAny() -> Self {
37-
.mockWith()
36+
public static func mockAny() -> WebViewEventReceiver {
37+
mockWith()
3838
}
3939

4040
static func mockWith(
4141
featureScope: FeatureScope = NOPFeatureScope(),
4242
dateProvider: DateProvider = SystemDateProvider(),
4343
commandSubscriber: RUMCommandSubscriber = RUMCommandSubscriberMock(),
4444
viewCache: ViewCache = ViewCache(dateProvider: SystemDateProvider())
45-
) -> Self {
45+
) -> WebViewEventReceiver {
4646
.init(
4747
featureScope: featureScope,
4848
dateProvider: dateProvider,

‎DatadogCore/Tests/Datadog/RUM/Integrations/CrashReportReceiverTests.swift‎

Lines changed: 78 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,13 @@ class CrashReportReceiverTests: XCTestCase {
1818
let receiver: CrashReportReceiver = .mockWith(featureScope: featureScope)
1919

2020
// When
21-
let message: FeatureMessage = .payload(
22-
Crash(
23-
report: DDCrashReport.mockAny(),
24-
context: CrashContext.mockWith(lastRUMViewEvent: nil)
25-
)
21+
let message = Crash(
22+
report: DDCrashReport.mockAny(),
23+
context: CrashContext.mockWith(lastRUMViewEvent: nil)
2624
)
27-
let result = receiver.receive(message: message, from: NOPDatadogCore())
25+
receiver.receive(message: message, from: NOPDatadogCore())
2826

2927
// Then
30-
XCTAssertTrue(result, "It must accept the message")
3128
XCTAssertEqual(featureScope.eventsWritten(ofType: RUMErrorEvent.self).count, 1, "It should send error event")
3229
}
3330

@@ -37,18 +34,15 @@ class CrashReportReceiverTests: XCTestCase {
3734
let lastRUMViewEvent: RUMViewEvent = .mockRandom()
3835

3936
// When
40-
let message: FeatureMessage = .payload(
41-
Crash(
42-
report: DDCrashReport.mockWith(date: Date()),
43-
context: CrashContext.mockWith(
44-
lastRUMViewEvent: lastRUMViewEvent
45-
)
37+
let message = Crash(
38+
report: DDCrashReport.mockWith(date: Date()),
39+
context: CrashContext.mockWith(
40+
lastRUMViewEvent: lastRUMViewEvent
4641
)
4742
)
48-
let result = receiver.receive(message: message, from: NOPDatadogCore())
43+
receiver.receive(message: message, from: NOPDatadogCore())
4944

5045
// Then
51-
XCTAssertTrue(result, "It must accept the message")
5246
XCTAssertEqual(featureScope.eventsWritten(ofType: RUMErrorEvent.self).count, 1, "It should send error event")
5347
XCTAssertEqual(featureScope.eventsWritten(ofType: RUMViewEvent.self).count, 1, "It should send view event")
5448
}
@@ -77,10 +71,9 @@ class CrashReportReceiverTests: XCTestCase {
7771
)
7872

7973
// When
80-
XCTAssertTrue(
81-
receiver.receive(message: .payload(
82-
Crash(report: crashReport, context: crashContext)
83-
), from: NOPDatadogCore())
74+
receiver.receive(
75+
message: Crash(report: crashReport, context: crashContext),
76+
from: NOPDatadogCore()
8477
)
8578

8679
// Then
@@ -111,10 +104,9 @@ class CrashReportReceiverTests: XCTestCase {
111104
)
112105

113106
// When
114-
XCTAssertFalse(
115-
receiver.receive(message: .payload(
116-
Crash(report: crashReport, context: crashContext)
117-
), from: NOPDatadogCore())
107+
receiver.receive(
108+
message: Crash(report: crashReport, context: crashContext),
109+
from: NOPDatadogCore()
118110
)
119111

120112
// Then
@@ -143,10 +135,9 @@ class CrashReportReceiverTests: XCTestCase {
143135
)
144136

145137
// When
146-
XCTAssertTrue(
147-
receiver.receive(message: .payload(
148-
Crash(report: crashReport, context: crashContext)
149-
), from: NOPDatadogCore())
138+
receiver.receive(
139+
message: Crash(report: crashReport, context: crashContext),
140+
from: NOPDatadogCore()
150141
)
151142

152143
// Then
@@ -182,10 +173,9 @@ class CrashReportReceiverTests: XCTestCase {
182173
)
183174

184175
// When
185-
XCTAssertTrue(
186-
receiver.receive(message: .payload(
187-
Crash(report: crashReport, context: crashContext)
188-
), from: NOPDatadogCore())
176+
receiver.receive(
177+
message: Crash(report: crashReport, context: crashContext),
178+
from: NOPDatadogCore()
189179
)
190180

191181
// Then
@@ -220,10 +210,9 @@ class CrashReportReceiverTests: XCTestCase {
220210
)
221211

222212
// When
223-
XCTAssertTrue(
224-
receiver.receive(message: .payload(
225-
Crash(report: crashReport, context: crashContext)
226-
), from: NOPDatadogCore())
213+
receiver.receive(
214+
message: Crash(report: crashReport, context: crashContext),
215+
from: NOPDatadogCore()
227216
)
228217

229218
// Then
@@ -252,10 +241,9 @@ class CrashReportReceiverTests: XCTestCase {
252241
)
253242

254243
// When
255-
XCTAssertFalse(
256-
receiver.receive(message: .payload(
257-
Crash(report: crashReport, context: crashContext)
258-
), from: NOPDatadogCore())
244+
receiver.receive(
245+
message: Crash(report: crashReport, context: crashContext),
246+
from: NOPDatadogCore()
259247
)
260248

261249
// Then
@@ -282,10 +270,9 @@ class CrashReportReceiverTests: XCTestCase {
282270
)
283271

284272
// When
285-
XCTAssertTrue(
286-
receiver.receive(message: .payload(
287-
Crash(report: crashReport, context: crashContext)
288-
), from: NOPDatadogCore())
273+
receiver.receive(
274+
message: Crash(report: crashReport, context: crashContext),
275+
from: NOPDatadogCore()
289276
)
290277

291278
// Then
@@ -318,10 +305,9 @@ class CrashReportReceiverTests: XCTestCase {
318305
)
319306

320307
// When
321-
XCTAssertTrue(
322-
receiver.receive(message: .payload(
323-
Crash(report: crashReport, context: crashContext)
324-
), from: NOPDatadogCore())
308+
receiver.receive(
309+
message: Crash(report: crashReport, context: crashContext),
310+
from: NOPDatadogCore()
325311
)
326312

327313
// Then
@@ -351,10 +337,9 @@ class CrashReportReceiverTests: XCTestCase {
351337
)
352338

353339
// When
354-
XCTAssertTrue(
355-
receiver.receive(message: .payload(
356-
Crash(report: crashReport, context: crashContext)
357-
), from: NOPDatadogCore())
340+
receiver.receive(
341+
message: Crash(report: crashReport, context: crashContext),
342+
from: NOPDatadogCore()
358343
)
359344

360345
// Then
@@ -452,10 +437,9 @@ class CrashReportReceiverTests: XCTestCase {
452437
)
453438

454439
// When
455-
XCTAssertTrue(
456-
receiver.receive(message: .payload(
457-
Crash(report: crashReport, context: crashContext)
458-
), from: NOPDatadogCore())
440+
receiver.receive(
441+
message: Crash(report: crashReport, context: crashContext),
442+
from: NOPDatadogCore()
459443
)
460444

461445
// Then
@@ -534,10 +518,9 @@ class CrashReportReceiverTests: XCTestCase {
534518
)
535519

536520
// When
537-
XCTAssertTrue(
538-
receiver.receive(message: .payload(
539-
Crash(report: crashReport, context: crashContext)
540-
), from: NOPDatadogCore())
521+
receiver.receive(
522+
message: Crash(report: crashReport, context: crashContext),
523+
from: NOPDatadogCore()
541524
)
542525

543526
// Then
@@ -579,10 +562,9 @@ class CrashReportReceiverTests: XCTestCase {
579562
)
580563

581564
// When
582-
XCTAssertTrue(
583-
receiver.receive(message: .payload(
584-
Crash(report: crashReport, context: crashContext)
585-
), from: NOPDatadogCore())
565+
receiver.receive(
566+
message: Crash(report: crashReport, context: crashContext),
567+
from: NOPDatadogCore()
586568
)
587569

588570
// Then
@@ -652,10 +634,9 @@ class CrashReportReceiverTests: XCTestCase {
652634
)
653635

654636
// When
655-
XCTAssertTrue(
656-
receiver.receive(message: .payload(
657-
Crash(report: crashReport, context: crashContext)
658-
), from: NOPDatadogCore())
637+
receiver.receive(
638+
message: Crash(report: crashReport, context: crashContext),
639+
from: NOPDatadogCore()
659640
)
660641

661642
// Then
@@ -733,10 +714,9 @@ class CrashReportReceiverTests: XCTestCase {
733714
)
734715

735716
// When
736-
XCTAssertTrue(
737-
receiver.receive(message: .payload(
738-
Crash(report: crashReport, context: crashContext)
739-
), from: NOPDatadogCore())
717+
receiver.receive(
718+
message: Crash(report: crashReport, context: crashContext),
719+
from: NOPDatadogCore()
740720
)
741721

742722
// Then
@@ -766,10 +746,9 @@ class CrashReportReceiverTests: XCTestCase {
766746
)
767747

768748
// When
769-
XCTAssertTrue(
770-
receiver.receive(message: .payload(
771-
Crash(report: crashReport, context: crashContext)
772-
), from: NOPDatadogCore())
749+
receiver.receive(
750+
message: Crash(report: crashReport, context: crashContext),
751+
from: NOPDatadogCore()
773752
)
774753

775754
// Then
@@ -842,10 +821,9 @@ class CrashReportReceiverTests: XCTestCase {
842821
)
843822

844823
// When
845-
XCTAssertTrue(
846-
receiver.receive(message: .payload(
847-
Crash(report: crashReport, context: crashContext)
848-
), from: NOPDatadogCore())
824+
receiver.receive(
825+
message: Crash(report: crashReport, context: crashContext),
826+
from: NOPDatadogCore()
849827
)
850828

851829
// Then
@@ -978,10 +956,9 @@ class CrashReportReceiverTests: XCTestCase {
978956
)
979957

980958
// When
981-
XCTAssertTrue(
982-
receiver.receive(message: .payload(
983-
Crash(report: crashReport, context: crashContext)
984-
), from: NOPDatadogCore())
959+
receiver.receive(
960+
message: Crash(report: crashReport, context: crashContext),
961+
from: NOPDatadogCore()
985962
)
986963

987964
// Then
@@ -1055,10 +1032,9 @@ class CrashReportReceiverTests: XCTestCase {
10551032
)
10561033

10571034
// When
1058-
XCTAssertTrue(
1059-
receiver.receive(message: .payload(
1060-
Crash(report: crashReport, context: crashContext)
1061-
), from: NOPDatadogCore())
1035+
receiver.receive(
1036+
message: Crash(report: crashReport, context: crashContext),
1037+
from: NOPDatadogCore()
10621038
)
10631039

10641040
// Then
@@ -1123,10 +1099,9 @@ class CrashReportReceiverTests: XCTestCase {
11231099
)
11241100

11251101
// When
1126-
XCTAssertTrue(
1127-
receiver.receive(message: .payload(
1128-
Crash(report: crashReport, context: crashContext)
1129-
), from: NOPDatadogCore())
1102+
receiver.receive(
1103+
message: Crash(report: crashReport, context: crashContext),
1104+
from: NOPDatadogCore()
11301105
)
11311106

11321107
// Then
@@ -1194,10 +1169,9 @@ class CrashReportReceiverTests: XCTestCase {
11941169
)
11951170

11961171
// When
1197-
XCTAssertTrue(
1198-
receiver.receive(message: .payload(
1199-
Crash(report: crashReport, context: crashContext)
1200-
), from: NOPDatadogCore())
1172+
receiver.receive(
1173+
message: Crash(report: crashReport, context: crashContext),
1174+
from: NOPDatadogCore()
12011175
)
12021176

12031177
// Then
@@ -1317,10 +1291,9 @@ class CrashReportReceiverTests: XCTestCase {
13171291
)
13181292

13191293
// When
1320-
XCTAssertTrue(
1321-
receiver.receive(message: .payload(
1322-
Crash(report: crashReport, context: crashContext)
1323-
), from: NOPDatadogCore())
1294+
receiver.receive(
1295+
message: Crash(report: crashReport, context: crashContext),
1296+
from: NOPDatadogCore()
13241297
)
13251298

13261299
// Then
@@ -1394,10 +1367,9 @@ class CrashReportReceiverTests: XCTestCase {
13941367
)
13951368

13961369
// When
1397-
XCTAssertTrue(
1398-
receiver.receive(message: .payload(
1399-
Crash(report: crashReport, context: crashContext)
1400-
), from: NOPDatadogCore())
1370+
receiver.receive(
1371+
message: Crash(report: crashReport, context: crashContext),
1372+
from: NOPDatadogCore()
14011373
)
14021374

14031375
// Then
@@ -1477,10 +1449,9 @@ class CrashReportReceiverTests: XCTestCase {
14771449
)
14781450

14791451
// When
1480-
XCTAssertTrue(
1481-
receiver.receive(message: .payload(
1482-
Crash(report: crashReport, context: crashContext)
1483-
), from: NOPDatadogCore())
1452+
receiver.receive(
1453+
message: Crash(report: crashReport, context: crashContext),
1454+
from: NOPDatadogCore()
14841455
)
14851456

14861457
// Then

0 commit comments

Comments
 (0)