Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Share RawBatchEvent forgery for tests between the modules #1680

Merged
merged 1 commit into from
Oct 26, 2023
Merged

Share RawBatchEvent forgery for tests between the modules #1680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion dd-sdk-android-core/src/test/kotlin/com/datadog/android/utils/forge/Configurator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ internal class Configurator :

// Datadog SDK v2
forge.addFactory(DataUploadConfigurationForgeryFactory())
forge.addFactory(RawBatchEventForgeryFactory())

// UploadStatus
forge.addFactory(HttpRedirectStatusForgeryFactory())
Expand Down
1 change: 1 addition & 0 deletions dd-sdk-android-core/src/testFixtures/kotlin/com/datadog/android/tests/elmyr/ForgeExt.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ fun <T : Forge> T.useCoreFactories(): T {
addFactory(ProcessInfoForgeryFactory())
addFactory(TimeInfoForgeryFactory())
addFactory(UserInfoForgeryFactory())
addFactory(RawBatchEventForgeryFactory())

return this
}
2 changes: 1 addition & 1 deletion ...tils/forge/RawBatchEventForgeryFactory.kt → ...ests/elmyr/RawBatchEventForgeryFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions ...droid-logs/src/test/kotlin/com/datadog/android/log/internal/net/LogsRequestFactoryTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
) {
Expand All @@ -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
Expand Down
6 changes: 2 additions & 4 deletions ...android-rum/src/test/kotlin/com/datadog/android/rum/internal/net/RumRequestFactoryTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
) {
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...tlin/com/datadog/android/sessionreplay/internal/domain/SessionReplayRequestFactoryTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ internal class SessionReplayRequestFactoryTest {

lateinit var fakeCompressedSegment: ByteArray

@Forgery
lateinit var fakeBatchData: List<RawBatchEvent>

@Forgery
Expand All @@ -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 }))
Expand Down
6 changes: 2 additions & 4 deletions ...-trace/src/test/kotlin/com/datadog/android/trace/internal/net/TracesRequestFactoryTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down