Share RawBatchEvent forgery for tests between the modules

DataDog · Oct 25, 2023 · fa17561 · fa17561
1 parent 4a3f24c
commit fa17561
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 15 deletions.
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
@@ -40,7 +40,6 @@ internal class Configurator :
 
         // Datadog SDK v2
         forge.addFactory(DataUploadConfigurationForgeryFactory())
-        forge.addFactory(RawBatchEventForgeryFactory())
 
         // UploadStatus
         forge.addFactory(HttpRedirectStatusForgeryFactory())

diff --git a/dd-sdk-android-core/src/testFixtures/kotlin/com/datadog/android/tests/elmyr/ForgeExt.kt b/dd-sdk-android-core/src/testFixtures/kotlin/com/datadog/android/tests/elmyr/ForgeExt.kt
@@ -43,6 +43,7 @@ fun <T : Forge> T.useCoreFactories(): T {
     addFactory(ProcessInfoForgeryFactory())
     addFactory(TimeInfoForgeryFactory())
     addFactory(UserInfoForgeryFactory())
+    addFactory(RawBatchEventForgeryFactory())
 
     return this
 }
diff --git a/...tils/forge/RawBatchEventForgeryFactory.kt → ...ests/elmyr/RawBatchEventForgeryFactory.kt b/...tils/forge/RawBatchEventForgeryFactory.kt → ...ests/elmyr/RawBatchEventForgeryFactory.kt
@@ -4,7 +4,7 @@
  * Copyright 2016-Present Datadog, Inc.
  */
 
-package com.datadog.android.utils.forge
+package com.datadog.android.tests.elmyr
 
 import com.datadog.android.api.storage.RawBatchEvent
 import fr.xgouchet.elmyr.Forge

diff --git a/...droid-logs/src/test/kotlin/com/datadog/android/log/internal/net/LogsRequestFactoryTest.kt b/...droid-logs/src/test/kotlin/com/datadog/android/log/internal/net/LogsRequestFactoryTest.kt
@@ -50,12 +50,11 @@ internal class LogsRequestFactoryTest {
     @Suppress("NAME_SHADOWING")
     @Test
     fun `𝕄 create a proper request 𝕎 create()`(
-        @StringForgery batchData: List<String>,
+        @Forgery batchData: List<RawBatchEvent>,
         @StringForgery batchMetadata: String,
         forge: Forge
     ) {
         // Given
-        val batchData = batchData.map { RawBatchEvent(it.toByteArray()) }
         val batchMetadata = forge.aNullable { batchMetadata.toByteArray() }
 
         // When
@@ -92,7 +91,7 @@ internal class LogsRequestFactoryTest {
     @Test
     fun `𝕄 create a proper request 𝕎 create() { custom endpoint }`(
         @StringForgery(regex = "https://[a-z]+\\.com") fakeEndpoint: String,
-        @StringForgery batchData: List<String>,
+        @Forgery batchData: List<RawBatchEvent>,
         @StringForgery batchMetadata: String,
         forge: Forge
     ) {
@@ -101,7 +100,6 @@ internal class LogsRequestFactoryTest {
             customEndpointUrl = fakeEndpoint,
             internalLogger = InternalLogger.UNBOUND
         )
-        val batchData = batchData.map { RawBatchEvent(it.toByteArray()) }
         val batchMetadata = forge.aNullable { batchMetadata.toByteArray() }
 
         // When

diff --git a/...android-rum/src/test/kotlin/com/datadog/android/rum/internal/net/RumRequestFactoryTest.kt b/...android-rum/src/test/kotlin/com/datadog/android/rum/internal/net/RumRequestFactoryTest.kt
@@ -64,12 +64,11 @@ internal class RumRequestFactoryTest {
     @Suppress("NAME_SHADOWING")
     @Test
     fun `𝕄 create a proper request 𝕎 create()`(
-        @StringForgery batchData: List<String>,
+        @Forgery batchData: List<RawBatchEvent>,
         @StringForgery batchMetadata: String,
         forge: Forge
     ) {
         // Given
-        val batchData = batchData.map { RawBatchEvent(it.toByteArray()) }
         val batchMetadata = forge.aNullable { batchMetadata.toByteArray() }
 
         // When
@@ -100,7 +99,7 @@ internal class RumRequestFactoryTest {
     @Test
     fun `𝕄 create a proper request 𝕎 create() { custom endpoint }`(
         @StringForgery(regex = "https://[a-z]+\\.com") fakeEndpoint: String,
-        @StringForgery batchData: List<String>,
+        @Forgery batchData: List<RawBatchEvent>,
         @StringForgery batchMetadata: String,
         forge: Forge
     ) {
@@ -110,7 +109,6 @@ internal class RumRequestFactoryTest {
             viewEventFilter = mockViewEventFilter,
             internalLogger = InternalLogger.UNBOUND
         )
-        val batchData = batchData.map { RawBatchEvent(it.toByteArray()) }
         val batchMetadata = forge.aNullable { batchMetadata.toByteArray() }
 
         // When

diff --git a/...tlin/com/datadog/android/sessionreplay/internal/domain/SessionReplayRequestFactoryTest.kt b/...tlin/com/datadog/android/sessionreplay/internal/domain/SessionReplayRequestFactoryTest.kt
@@ -59,6 +59,7 @@ internal class SessionReplayRequestFactoryTest {
 
     lateinit var fakeCompressedSegment: ByteArray
 
+    @Forgery
     lateinit var fakeBatchData: List<RawBatchEvent>
 
     @Forgery
@@ -84,7 +85,6 @@ internal class SessionReplayRequestFactoryTest {
         whenever(mockRequestBody.contentType()).thenReturn(fakeMediaType)
         fakeCompressedSegment = forge.aString().toByteArray()
         fakeBatchMetadata = forge.aNullable { forge.aString().toByteArray() }
-        fakeBatchData = forge.aList { RawBatchEvent(aString().toByteArray()) }
         whenever(mockRequestBodyFactory.create(fakeSegment, fakeSerializedSegment))
             .thenReturn(mockRequestBody)
         whenever(mockBatchesToSegmentsMapper.map(fakeBatchData.map { it.data }))

diff --git a/...-trace/src/test/kotlin/com/datadog/android/trace/internal/net/TracesRequestFactoryTest.kt b/...-trace/src/test/kotlin/com/datadog/android/trace/internal/net/TracesRequestFactoryTest.kt
@@ -50,12 +50,11 @@ internal class TracesRequestFactoryTest {
     @Suppress("NAME_SHADOWING")
     @Test
     fun `𝕄 create a proper request 𝕎 create()`(
-        @StringForgery batchData: List<String>,
+        @Forgery batchData: List<RawBatchEvent>,
         @StringForgery batchMetadata: String,
         forge: Forge
     ) {
         // Given
-        val batchData = batchData.map { RawBatchEvent(it.toByteArray()) }
         val batchMetadata = forge.aNullable { batchMetadata.toByteArray() }
 
         // When
@@ -86,13 +85,12 @@ internal class TracesRequestFactoryTest {
     @Test
     fun `𝕄 create a proper request 𝕎 create() { custom endpoint }`(
         @StringForgery(regex = "https://[a-z]+\\.com") fakeEndpoint: String,
-        @StringForgery batchData: List<String>,
+        @Forgery batchData: List<RawBatchEvent>,
         @StringForgery batchMetadata: String,
         forge: Forge
     ) {
         // Given
         testedFactory = TracesRequestFactory(customEndpointUrl = fakeEndpoint, internalLogger = InternalLogger.UNBOUND)
-        val batchData = batchData.map { RawBatchEvent(it.toByteArray()) }
         val batchMetadata = forge.aNullable { batchMetadata.toByteArray() }
 
         // When