Merge pull request #1668 from DataDog/xgouchet/RUM-392/3_shared_core_…

…fixtures (3/3) RUM-392 let all modules use the shared fixtures
DataDog · Oct 16, 2023 · cbdf622 · cbdf622
2 parents 72ae0d1 + a470a07
commit cbdf622
Show file tree

Hide file tree

Showing 35 changed files with 53 additions and 795 deletions.
diff --git a/dd-sdk-android-core/build.gradle.kts b/dd-sdk-android-core/build.gradle.kts
@@ -84,6 +84,11 @@ android {
             )
         }
     }
+
+    sourceSets.named("test") {
+        // Required because AGP doesn't support kotlin test fixtures :/
+        java.srcDir("${project.rootDir.path}/dd-sdk-android-core/src/testFixtures/kotlin")
+    }
 }
 
 dependencies {

diff --git a/dd-sdk-android-core/src/test/kotlin/com/datadog/android/utils/forge/Configurator.kt b/dd-sdk-android-core/src/test/kotlin/com/datadog/android/utils/forge/Configurator.kt
@@ -6,6 +6,7 @@
 
 package com.datadog.android.utils.forge
 
+import com.datadog.android.tests.elmyr.useCoreFactories
 import com.datadog.tools.unit.forge.BaseConfigurator
 import fr.xgouchet.elmyr.Forge
 import fr.xgouchet.elmyr.jvm.useJvmFactories
@@ -14,14 +15,13 @@ internal class Configurator :
     BaseConfigurator() {
     override fun configure(forge: Forge) {
         super.configure(forge)
+        forge.useCoreFactories()
 
         // Datadog Core
         forge.addFactory(CustomAttributesForgeryFactory())
         forge.addFactory(ConfigurationForgeryFactory())
         forge.addFactory(ConfigurationCoreForgeryFactory())
         forge.addFactory(ConfigurationForgeryFactory())
-        forge.addFactory(NetworkInfoForgeryFactory())
-        forge.addFactory(UserInfoForgeryFactory())
         forge.addFactory(FilePersistenceConfigForgeryFactory())
         forge.addFactory(AndroidInfoProviderForgeryFactory())
         forge.addFactory(FeatureStorageConfigurationForgeryFactory())
@@ -39,10 +39,6 @@ internal class Configurator :
         forge.addFactory(CharsetForgeryFactory())
 
         // Datadog SDK v2
-        forge.addFactory(TimeInfoForgeryFactory())
-        forge.addFactory(ProcessInfoForgeryFactory())
-        forge.addFactory(DeviceInfoForgeryFactory())
-        forge.addFactory(DatadogContextForgeryFactory())
         forge.addFactory(DataUploadConfigurationForgeryFactory())
 
         // UploadStatus

diff --git a/...roid-core/src/test/kotlin/com/datadog/android/utils/forge/DatadogContextForgeryFactory.kt b/...roid-core/src/test/kotlin/com/datadog/android/utils/forge/DatadogContextForgeryFactory.kt
diff --git a/...-android-core/src/test/kotlin/com/datadog/android/utils/forge/DeviceInfoForgeryFactory.kt b/...-android-core/src/test/kotlin/com/datadog/android/utils/forge/DeviceInfoForgeryFactory.kt
diff --git a/...android-core/src/test/kotlin/com/datadog/android/utils/forge/NetworkInfoForgeryFactory.kt b/...android-core/src/test/kotlin/com/datadog/android/utils/forge/NetworkInfoForgeryFactory.kt
diff --git a/...android-core/src/test/kotlin/com/datadog/android/utils/forge/ProcessInfoForgeryFactory.kt b/...android-core/src/test/kotlin/com/datadog/android/utils/forge/ProcessInfoForgeryFactory.kt
diff --git a/...dk-android-core/src/test/kotlin/com/datadog/android/utils/forge/TimeInfoForgeryFactory.kt b/...dk-android-core/src/test/kotlin/com/datadog/android/utils/forge/TimeInfoForgeryFactory.kt
diff --git a/...dk-android-core/src/test/kotlin/com/datadog/android/utils/forge/UserInfoForgeryFactory.kt b/...dk-android-core/src/test/kotlin/com/datadog/android/utils/forge/UserInfoForgeryFactory.kt
diff --git a/...core/src/testFixtures/kotlin/com/datadog/android/tests/elmyr/NetworkInfoForgeryFactory.kt b/...core/src/testFixtures/kotlin/com/datadog/android/tests/elmyr/NetworkInfoForgeryFactory.kt
@@ -12,6 +12,7 @@ import fr.xgouchet.elmyr.ForgeryFactory
 
 class NetworkInfoForgeryFactory : ForgeryFactory<NetworkInfo> {
 
+    @Suppress("MagicNumber")
     override fun getForgery(forge: Forge): NetworkInfo {
         return NetworkInfo(
             connectivity = forge.aValueFrom(NetworkInfo.Connectivity::class.java),

diff --git a/features/dd-sdk-android-logs/build.gradle.kts b/features/dd-sdk-android-logs/build.gradle.kts
@@ -44,6 +44,11 @@ android {
     }
 
     namespace = "com.datadog.android.log"
+
+    sourceSets.named("test") {
+        // Required because AGP doesn't support kotlin test fixtures :/
+        java.srcDir("${project.rootDir.path}/dd-sdk-android-core/src/testFixtures/kotlin")
+    }
 }
 
 dependencies {
@@ -63,6 +68,7 @@ dependencies {
             )
         }
     }
+    testImplementation(testFixtures(project(":dd-sdk-android-core")))
     testImplementation(libs.bundles.jUnit5)
     testImplementation(libs.bundles.testTools)
     unmock(libs.robolectric)

diff --git a/features/dd-sdk-android-logs/src/test/kotlin/com/datadog/android/utils/forge/Configurator.kt b/features/dd-sdk-android-logs/src/test/kotlin/com/datadog/android/utils/forge/Configurator.kt
@@ -6,6 +6,7 @@
 
 package com.datadog.android.utils.forge
 
+import com.datadog.android.tests.elmyr.useCoreFactories
 import com.datadog.tools.unit.forge.BaseConfigurator
 import fr.xgouchet.elmyr.Forge
 import fr.xgouchet.elmyr.jvm.useJvmFactories
@@ -15,11 +16,9 @@ internal class Configurator : BaseConfigurator() {
     override fun configure(forge: Forge) {
         super.configure(forge)
 
-        forge.addFactory(DatadogContextForgeryFactory())
-        forge.addFactory(LogEventForgeryFactory())
-        forge.addFactory(UserInfoForgeryFactory())
-        forge.addFactory(NetworkInfoForgeryFactory())
+        forge.useCoreFactories()
 
+        forge.addFactory(LogEventForgeryFactory())
         forge.addFactory(LogsConfigurationForgeryFactory())
 
         forge.useJvmFactories()

diff --git a/...roid-logs/src/test/kotlin/com/datadog/android/utils/forge/DatadogContextForgeryFactory.kt b/...roid-logs/src/test/kotlin/com/datadog/android/utils/forge/DatadogContextForgeryFactory.kt
diff --git a/...android-logs/src/test/kotlin/com/datadog/android/utils/forge/NetworkInfoForgeryFactory.kt b/...android-logs/src/test/kotlin/com/datadog/android/utils/forge/NetworkInfoForgeryFactory.kt
diff --git a/...dk-android-logs/src/test/kotlin/com/datadog/android/utils/forge/UserInfoForgeryFactory.kt b/...dk-android-logs/src/test/kotlin/com/datadog/android/utils/forge/UserInfoForgeryFactory.kt