Skip to content

Commit 11a89da

Browse files
committed
Set the version in ConfigurationForgeryFactory as "nullable".
Fix related test.
1 parent a722eb3 commit 11a89da

3 files changed

Lines changed: 27 additions & 1 deletion

File tree

dd-sdk-android-core/src/test/kotlin/com/datadog/android/core/DatadogCoreInitializationTest.kt

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -625,6 +625,28 @@ internal class DatadogCoreInitializationTest {
625625
)
626626
}
627627

628+
@Test
629+
fun `M apply app version W setVersion(appVersion) { with app version }`(
630+
@StringForgery appVersion: String
631+
) {
632+
// When
633+
testedCore = DatadogCore(
634+
appContext.mockInstance,
635+
fakeInstanceId,
636+
fakeInstanceName,
637+
executorServiceFactory = { _, _, _, _ -> mockPersistenceExecutorService }
638+
).apply {
639+
initialize(
640+
fakeConfiguration.copy(
641+
version = appVersion
642+
)
643+
)
644+
}
645+
646+
// Then
647+
assertThat(testedCore.coreFeature.packageVersionProvider.version).isEqualTo(appVersion)
648+
}
649+
628650
// endregion
629651

630652
companion object {

dd-sdk-android-core/src/test/kotlin/com/datadog/android/core/internal/CoreFeatureTest.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,9 @@ internal class CoreFeatureTest {
140140
@Forgery
141141
lateinit var fakeBuildId: UUID
142142

143+
@StringForgery(type = StringForgeryType.ALPHA_NUMERICAL)
144+
lateinit var fakeVersion: String
145+
143146
@BeforeEach
144147
fun `set up`() {
145148
CoreFeature.disableKronosBackgroundSync = true
@@ -158,6 +161,7 @@ internal class CoreFeatureTest {
158161
whenever(mockPersistenceExecutorService.execute(any())) doAnswer {
159162
it.getArgument<Runnable>(0).run()
160163
}
164+
fakeConfig = fakeConfig.copy(version = fakeVersion)
161165
}
162166

163167
@AfterEach

dd-sdk-android-core/src/test/kotlin/com/datadog/android/utils/forge/ConfigurationForgeryFactory.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ internal class ConfigurationForgeryFactory :
2121
service = forge.aStringMatching("[a-z]+(\\.[a-z]+)+"),
2222
crashReportsEnabled = forge.aBool(),
2323
additionalConfig = forge.aMap { aString() to aString() },
24-
version = forge.anAlphaNumericalString()
24+
version = forge.aNullable { forge.anAlphaNumericalString() }
2525
)
2626
}
2727
}

0 commit comments

Comments
 (0)