Skip to content

Commit 9d6946a

Browse files
0xnm0xnm
committed
Cleanup SdkCoreTest file
1 parent 8262824 commit 9d6946a

File tree

1 file changed

+33
-30
lines changed
  • reliability/core-it/src/androidTest/kotlin/com/datadog/android/core/integration/tests

1 file changed

+33
-30
lines changed

‎reliability/core-it/src/androidTest/kotlin/com/datadog/android/core/integration/tests/SdkCoreTest.kt

Lines changed: 33 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@ import java.util.concurrent.TimeUnit
4141
class SdkCoreTest : MockServerTest() {
4242

4343
@get:Rule
44-
var forge = ForgeRule().useJvmFactories().useToolsFactories().withFactory(ConfigurationCoreForgeryFactory())
44+
var forge = ForgeRule()
45+
.useJvmFactories()
46+
.useToolsFactories()
47+
.withFactory(ConfigurationCoreForgeryFactory())
4548

4649
@StringForgery(type = StringForgeryType.ALPHABETICAL)
4750
lateinit var fakeUserId: String
@@ -126,7 +129,7 @@ class SdkCoreTest : MockServerTest() {
126129
@Test
127130
fun must_addAccountInformationIntoEvents_when_setAccountInformation() {
128131
// When
129-
testedSdkCore?.setAccountInfo(
132+
testedSdkCore.setAccountInfo(
130133
fakeAccountId,
131134
fakeAccountName,
132135
fakeAccountExtraInfo
@@ -135,7 +138,7 @@ class SdkCoreTest : MockServerTest() {
135138
// Then
136139
val countDownLatch = CountDownLatch(1)
137140
var readAccountInfo: AccountInfo? = null
138-
featureSdkCore?.getFeature(stubFeature.name)?.withWriteContext { datadogContext, _ ->
141+
featureSdkCore.getFeature(stubFeature.name)?.withWriteContext { datadogContext, _ ->
139142
readAccountInfo = datadogContext.accountInfo
140143
countDownLatch.countDown()
141144
}
@@ -145,9 +148,9 @@ class SdkCoreTest : MockServerTest() {
145148
assertThat(readAccountInfo?.extraInfo)
146149
.containsExactlyInAnyOrderEntriesOf(fakeAccountExtraInfo)
147150

148-
testedSdkCore?.clearAccountInfo()
151+
testedSdkCore.clearAccountInfo()
149152
val countDownLatch2 = CountDownLatch(1)
150-
featureSdkCore?.getFeature(stubFeature.name)?.withWriteContext { datadogContext, _ ->
153+
featureSdkCore.getFeature(stubFeature.name)?.withWriteContext { datadogContext, _ ->
151154
readAccountInfo = datadogContext.accountInfo
152155
countDownLatch2.countDown()
153156
}
@@ -408,20 +411,20 @@ class SdkCoreTest : MockServerTest() {
408411
@Test
409412
fun must_addAccountExtraInfo_when_addAccountInfo() {
410413
// Given
411-
testedSdkCore?.setAccountInfo(
414+
testedSdkCore.setAccountInfo(
412415
fakeAccountId,
413416
fakeAccountName,
414417
fakeAccountExtraInfo
415418
)
416419
val expectedAccountExtraProperties = forge.exhaustiveAttributes()
417420

418421
// When
419-
testedSdkCore?.addAccountExtraInfo(expectedAccountExtraProperties)
422+
testedSdkCore.addAccountExtraInfo(expectedAccountExtraProperties)
420423

421424
// Then
422425
val countDownLatch = CountDownLatch(1)
423426
var readAccountInfo: AccountInfo? = null
424-
featureSdkCore?.getFeature(stubFeature.name)?.withWriteContext { datadogContext, _ ->
427+
featureSdkCore.getFeature(stubFeature.name)?.withWriteContext { datadogContext, _ ->
425428
readAccountInfo = datadogContext.accountInfo
426429
countDownLatch.countDown()
427430
}
@@ -437,7 +440,7 @@ class SdkCoreTest : MockServerTest() {
437440
// Given
438441
val fakeMutableProperties = forge.exhaustiveAttributes()
439442
val expectedMutableProperties = fakeMutableProperties.toMap()
440-
testedSdkCore?.setAccountInfo(fakeAccountId, fakeAccountName, fakeMutableProperties)
443+
testedSdkCore.setAccountInfo(fakeAccountId, fakeAccountName, fakeMutableProperties)
441444

442445
// When
443446
fakeMutableProperties.keys.forEach { key ->
@@ -447,7 +450,7 @@ class SdkCoreTest : MockServerTest() {
447450
// Then
448451
val countDownLatch = CountDownLatch(1)
449452
var readAccountInfo: AccountInfo? = null
450-
featureSdkCore?.getFeature(stubFeature.name)?.withWriteContext { datadogContext, _ ->
453+
featureSdkCore.getFeature(stubFeature.name)?.withWriteContext { datadogContext, _ ->
451454
readAccountInfo = datadogContext.accountInfo
452455
countDownLatch.countDown()
453456
}
@@ -463,7 +466,7 @@ class SdkCoreTest : MockServerTest() {
463466
// Given
464467
val fakeMutableProperties = forge.exhaustiveAttributes()
465468
val expectedMutableProperties = fakeMutableProperties.toMap()
466-
testedSdkCore?.setAccountInfo(fakeAccountId, fakeAccountName, fakeMutableProperties)
469+
testedSdkCore.setAccountInfo(fakeAccountId, fakeAccountName, fakeMutableProperties)
467470

468471
// When
469472
repeat(forge.anInt(1, fakeMutableProperties.size / 2)) {
@@ -473,7 +476,7 @@ class SdkCoreTest : MockServerTest() {
473476
// Then
474477
val countDownLatch = CountDownLatch(1)
475478
var readAccountInfo: AccountInfo? = null
476-
featureSdkCore?.getFeature(stubFeature.name)?.withWriteContext { datadogContext, _ ->
479+
featureSdkCore.getFeature(stubFeature.name)?.withWriteContext { datadogContext, _ ->
477480
readAccountInfo = datadogContext.accountInfo
478481
countDownLatch.countDown()
479482
}
@@ -489,7 +492,7 @@ class SdkCoreTest : MockServerTest() {
489492
// Given
490493
val fakeMutableProperties = forge.exhaustiveAttributes()
491494
val expectedMutableProperties = fakeMutableProperties.toMap()
492-
testedSdkCore?.setAccountInfo(fakeAccountId, fakeAccountName, fakeMutableProperties)
495+
testedSdkCore.setAccountInfo(fakeAccountId, fakeAccountName, fakeMutableProperties)
493496

494497
// When
495498
repeat(forge.anInt(1, 10)) {
@@ -499,7 +502,7 @@ class SdkCoreTest : MockServerTest() {
499502
// Then
500503
val countDownLatch = CountDownLatch(1)
501504
var readAccountInfo: AccountInfo? = null
502-
featureSdkCore?.getFeature(stubFeature.name)?.withWriteContext { datadogContext, _ ->
505+
featureSdkCore.getFeature(stubFeature.name)?.withWriteContext { datadogContext, _ ->
503506
readAccountInfo = datadogContext.accountInfo
504507
countDownLatch.countDown()
505508
}
@@ -515,8 +518,8 @@ class SdkCoreTest : MockServerTest() {
515518
// Given
516519
val fakeExtraProperties = forge.exhaustiveAttributes()
517520
val expectedExtraProperties = fakeExtraProperties.toMap()
518-
testedSdkCore?.setAccountInfo(fakeAccountId, fakeAccountName, fakeAccountExtraInfo)
519-
testedSdkCore?.addAccountExtraInfo(fakeExtraProperties)
521+
testedSdkCore.setAccountInfo(fakeAccountId, fakeAccountName, fakeAccountExtraInfo)
522+
testedSdkCore.addAccountExtraInfo(fakeExtraProperties)
520523

521524
// When
522525
fakeExtraProperties.keys.forEach { key ->
@@ -526,7 +529,7 @@ class SdkCoreTest : MockServerTest() {
526529
// Then
527530
val countDownLatch = CountDownLatch(1)
528531
var readAccountInfo: AccountInfo? = null
529-
featureSdkCore?.getFeature(stubFeature.name)?.withWriteContext { datadogContext, _ ->
532+
featureSdkCore.getFeature(stubFeature.name)?.withWriteContext { datadogContext, _ ->
530533
readAccountInfo = datadogContext.accountInfo
531534
countDownLatch.countDown()
532535
}
@@ -542,8 +545,8 @@ class SdkCoreTest : MockServerTest() {
542545
// Given
543546
val fakeExtraProperties = forge.exhaustiveAttributes()
544547
val expectedExtraProperties = fakeExtraProperties.toMap()
545-
testedSdkCore?.setAccountInfo(fakeAccountId, fakeAccountName, fakeAccountExtraInfo)
546-
testedSdkCore?.addAccountExtraInfo(fakeExtraProperties)
548+
testedSdkCore.setAccountInfo(fakeAccountId, fakeAccountName, fakeAccountExtraInfo)
549+
testedSdkCore.addAccountExtraInfo(fakeExtraProperties)
547550

548551
// When
549552
repeat(forge.anInt(1, fakeExtraProperties.size / 2)) {
@@ -553,7 +556,7 @@ class SdkCoreTest : MockServerTest() {
553556
// Then
554557
val countDownLatch = CountDownLatch(1)
555558
var readAccountInfo: AccountInfo? = null
556-
featureSdkCore?.getFeature(stubFeature.name)?.withWriteContext { datadogContext, _ ->
559+
featureSdkCore.getFeature(stubFeature.name)?.withWriteContext { datadogContext, _ ->
557560
readAccountInfo = datadogContext.accountInfo
558561
countDownLatch.countDown()
559562
}
@@ -569,8 +572,8 @@ class SdkCoreTest : MockServerTest() {
569572
// Given
570573
val fakeExtraProperties = forge.exhaustiveAttributes()
571574
val expectedExtraProperties = fakeExtraProperties.toMap()
572-
testedSdkCore?.setAccountInfo(fakeAccountId, fakeAccountName, fakeAccountExtraInfo)
573-
testedSdkCore?.addAccountExtraInfo(fakeExtraProperties)
575+
testedSdkCore.setAccountInfo(fakeAccountId, fakeAccountName, fakeAccountExtraInfo)
576+
testedSdkCore.addAccountExtraInfo(fakeExtraProperties)
574577

575578
// When
576579
repeat(forge.anInt(1, 10)) {
@@ -580,7 +583,7 @@ class SdkCoreTest : MockServerTest() {
580583
// Then
581584
val countDownLatch = CountDownLatch(1)
582585
var readAccountInfo: AccountInfo? = null
583-
featureSdkCore?.getFeature(stubFeature.name)?.withWriteContext { datadogContext, _ ->
586+
featureSdkCore.getFeature(stubFeature.name)?.withWriteContext { datadogContext, _ ->
584587
readAccountInfo = datadogContext.accountInfo
585588
countDownLatch.countDown()
586589
}
@@ -594,20 +597,20 @@ class SdkCoreTest : MockServerTest() {
594597
@Test
595598
fun must_resetAccountInfo_when_setAccountInfoCalledSecondTime() {
596599
// Given
597-
testedSdkCore?.setAccountInfo(fakeAccountId, fakeAccountName, fakeAccountExtraInfo)
600+
testedSdkCore.setAccountInfo(fakeAccountId, fakeAccountName, fakeAccountExtraInfo)
598601
val expectedAccountExtraProperties = forge.exhaustiveAttributes()
599-
testedSdkCore?.addAccountExtraInfo(expectedAccountExtraProperties)
602+
testedSdkCore.addAccountExtraInfo(expectedAccountExtraProperties)
600603
val fakeAccountId2 = forge.anAlphabeticalString()
601604
val fakeAccountName2 = forge.anAlphabeticalString()
602605
val fakeAccountExtraInfo2 = forge.exhaustiveAttributes()
603606

604607
// When
605-
testedSdkCore?.setAccountInfo(fakeAccountId2, fakeAccountName2, fakeAccountExtraInfo2)
608+
testedSdkCore.setAccountInfo(fakeAccountId2, fakeAccountName2, fakeAccountExtraInfo2)
606609

607610
// Then
608611
val countDownLatch = CountDownLatch(1)
609612
var readAccountInfo: AccountInfo? = null
610-
featureSdkCore?.getFeature(stubFeature.name)?.withWriteContext { datadogContext, _ ->
613+
featureSdkCore.getFeature(stubFeature.name)?.withWriteContext { datadogContext, _ ->
611614
readAccountInfo = datadogContext.accountInfo
612615
countDownLatch.countDown()
613616
}
@@ -622,15 +625,15 @@ class SdkCoreTest : MockServerTest() {
622625
fun must_resetAccountInfo_when_setAccountInfoCalled_afterAddAccountExtraInfo() {
623626
// Given
624627
val expectedAccountExtraProperties = forge.exhaustiveAttributes()
625-
testedSdkCore?.addAccountExtraInfo(expectedAccountExtraProperties)
628+
testedSdkCore.addAccountExtraInfo(expectedAccountExtraProperties)
626629

627630
// When
628-
testedSdkCore?.setAccountInfo(fakeAccountId, fakeAccountName, fakeAccountExtraInfo)
631+
testedSdkCore.setAccountInfo(fakeAccountId, fakeAccountName, fakeAccountExtraInfo)
629632

630633
// Then
631634
val countDownLatch = CountDownLatch(1)
632635
var readAccountInfo: AccountInfo? = null
633-
featureSdkCore?.getFeature(stubFeature.name)?.withWriteContext { datadogContext, _ ->
636+
featureSdkCore.getFeature(stubFeature.name)?.withWriteContext { datadogContext, _ ->
634637
readAccountInfo = datadogContext.accountInfo
635638
countDownLatch.countDown()
636639
}

0 commit comments

Comments
 (0)