Skip to content

Commit

Permalink
RUM-2704: Cleanup tests - remove elvis operators
Browse files Browse the repository at this point in the history
  • Loading branch information
@jonathanmos
jonathanmos committed Feb 21, 2024
1 parent 85058ae commit cbd637a
Show file tree
Hide file tree
Showing 7 changed files with 87 additions and 72 deletions.
30 changes: 16 additions & 14 deletions ...droid-logs/src/test/kotlin/com/datadog/android/log/internal/net/LogsRequestFactoryTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,22 +61,23 @@ internal class LogsRequestFactoryTest {
val request = testedFactory.create(fakeDatadogContext, batchData, batchMetadata)

// Then
assertThat(request?.url).isEqualTo(
requireNotNull(request)
assertThat(request.url).isEqualTo(
"${fakeDatadogContext.site.intakeEndpoint}/api/v2/logs?" +
"ddsource=${fakeDatadogContext.source}"
)
assertThat(request?.contentType).isEqualTo(RequestFactory.CONTENT_TYPE_JSON)
assertThat(request?.headers?.minus(RequestFactory.HEADER_REQUEST_ID)).isEqualTo(
assertThat(request.contentType).isEqualTo(RequestFactory.CONTENT_TYPE_JSON)
assertThat(request.headers.minus(RequestFactory.HEADER_REQUEST_ID)).isEqualTo(
mapOf(
RequestFactory.HEADER_API_KEY to fakeDatadogContext.clientToken,
RequestFactory.HEADER_EVP_ORIGIN to fakeDatadogContext.source,
RequestFactory.HEADER_EVP_ORIGIN_VERSION to fakeDatadogContext.sdkVersion
)
)
assertThat(request?.headers?.get(RequestFactory.HEADER_REQUEST_ID)).isNotEmpty()
assertThat(request?.id).isEqualTo(request?.headers?.get(RequestFactory.HEADER_REQUEST_ID))
assertThat(request?.description).isEqualTo("Logs Request")
assertThat(request?.body).isEqualTo(
assertThat(request.headers[RequestFactory.HEADER_REQUEST_ID]).isNotEmpty()
assertThat(request.id).isEqualTo(request.headers[RequestFactory.HEADER_REQUEST_ID])
assertThat(request.description).isEqualTo("Logs Request")
assertThat(request.body).isEqualTo(
batchData.map { it.data }
.join(
separator = ",".toByteArray(),
Expand Down Expand Up @@ -106,22 +107,23 @@ internal class LogsRequestFactoryTest {
val request = testedFactory.create(fakeDatadogContext, batchData, batchMetadata)

// Then
assertThat(request?.url).isEqualTo(
requireNotNull(request)
assertThat(request.url).isEqualTo(
"$fakeEndpoint/api/v2/logs?" +
"ddsource=${fakeDatadogContext.source}"
)
assertThat(request?.contentType).isEqualTo(RequestFactory.CONTENT_TYPE_JSON)
assertThat(request?.headers?.minus(RequestFactory.HEADER_REQUEST_ID)).isEqualTo(
assertThat(request.contentType).isEqualTo(RequestFactory.CONTENT_TYPE_JSON)
assertThat(request.headers.minus(RequestFactory.HEADER_REQUEST_ID)).isEqualTo(
mapOf(
RequestFactory.HEADER_API_KEY to fakeDatadogContext.clientToken,
RequestFactory.HEADER_EVP_ORIGIN to fakeDatadogContext.source,
RequestFactory.HEADER_EVP_ORIGIN_VERSION to fakeDatadogContext.sdkVersion
)
)
assertThat(request?.headers?.get(RequestFactory.HEADER_REQUEST_ID)).isNotEmpty()
assertThat(request?.id).isEqualTo(request?.headers?.get(RequestFactory.HEADER_REQUEST_ID))
assertThat(request?.description).isEqualTo("Logs Request")
assertThat(request?.body).isEqualTo(
assertThat(request.headers[RequestFactory.HEADER_REQUEST_ID]).isNotEmpty()
assertThat(request.id).isEqualTo(request.headers[RequestFactory.HEADER_REQUEST_ID])
assertThat(request.description).isEqualTo("Logs Request")
assertThat(request.body).isEqualTo(
batchData.map { it.data }
.join(
separator = ",".toByteArray(),
Expand Down
30 changes: 16 additions & 14 deletions ...android-rum/src/test/kotlin/com/datadog/android/rum/internal/net/RumRequestFactoryTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,19 +75,20 @@ internal class RumRequestFactoryTest {
val request = testedFactory.create(fakeDatadogContext, batchData, batchMetadata)

// Then
assertThat(request?.url).isEqualTo(expectedUrl(fakeDatadogContext.site.intakeEndpoint))
assertThat(request?.contentType).isEqualTo(RequestFactory.CONTENT_TYPE_TEXT_UTF8)
assertThat(request?.headers?.minus(RequestFactory.HEADER_REQUEST_ID)).isEqualTo(
requireNotNull(request)
assertThat(request.url).isEqualTo(expectedUrl(fakeDatadogContext.site.intakeEndpoint))
assertThat(request.contentType).isEqualTo(RequestFactory.CONTENT_TYPE_TEXT_UTF8)
assertThat(request.headers.minus(RequestFactory.HEADER_REQUEST_ID)).isEqualTo(
mapOf(
RequestFactory.HEADER_API_KEY to fakeDatadogContext.clientToken,
RequestFactory.HEADER_EVP_ORIGIN to fakeDatadogContext.source,
RequestFactory.HEADER_EVP_ORIGIN_VERSION to fakeDatadogContext.sdkVersion
)
)
assertThat(request?.headers?.get(RequestFactory.HEADER_REQUEST_ID)).isNotEmpty()
assertThat(request?.id).isEqualTo(request?.headers?.get(RequestFactory.HEADER_REQUEST_ID))
assertThat(request?.description).isEqualTo("RUM Request")
assertThat(request?.body).isEqualTo(
assertThat(request.headers[RequestFactory.HEADER_REQUEST_ID]).isNotEmpty()
assertThat(request.id).isEqualTo(request.headers[RequestFactory.HEADER_REQUEST_ID])
assertThat(request.description).isEqualTo("RUM Request")
assertThat(request.body).isEqualTo(
batchData.map { it.data }.join(
separator = "\n".toByteArray(),
internalLogger = InternalLogger.UNBOUND
Expand Down Expand Up @@ -115,19 +116,20 @@ internal class RumRequestFactoryTest {
val request = testedFactory.create(fakeDatadogContext, batchData, batchMetadata)

// Then
assertThat(request?.url).isEqualTo(expectedUrl(fakeEndpoint))
assertThat(request?.contentType).isEqualTo(RequestFactory.CONTENT_TYPE_TEXT_UTF8)
assertThat(request?.headers?.minus(RequestFactory.HEADER_REQUEST_ID)).isEqualTo(
requireNotNull(request)
assertThat(request.url).isEqualTo(expectedUrl(fakeEndpoint))
assertThat(request.contentType).isEqualTo(RequestFactory.CONTENT_TYPE_TEXT_UTF8)
assertThat(request.headers.minus(RequestFactory.HEADER_REQUEST_ID)).isEqualTo(
mapOf(
RequestFactory.HEADER_API_KEY to fakeDatadogContext.clientToken,
RequestFactory.HEADER_EVP_ORIGIN to fakeDatadogContext.source,
RequestFactory.HEADER_EVP_ORIGIN_VERSION to fakeDatadogContext.sdkVersion
)
)
assertThat(request?.headers?.get(RequestFactory.HEADER_REQUEST_ID)).isNotEmpty()
assertThat(request?.id).isEqualTo(request?.headers?.get(RequestFactory.HEADER_REQUEST_ID))
assertThat(request?.description).isEqualTo("RUM Request")
assertThat(request?.body).isEqualTo(
assertThat(request.headers[RequestFactory.HEADER_REQUEST_ID]).isNotEmpty()
assertThat(request.id).isEqualTo(request.headers[RequestFactory.HEADER_REQUEST_ID])
assertThat(request.description).isEqualTo("RUM Request")
assertThat(request.body).isEqualTo(
batchData.map { it.data }.join(
separator = "\n".toByteArray(),
internalLogger = InternalLogger.UNBOUND
Expand Down
9 changes: 7 additions & 2 deletions ...t/kotlin/com/datadog/android/sessionreplay/internal/net/ResourceRequestBodyFactoryTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,14 @@ internal class ResourceRequestBodyFactoryTest {
val requestBody = testedRequestBodyFactory.create(fakeListResources)

// Then
requireNotNull(requestBody)
assertThat(requestBody).isInstanceOf(MultipartBody::class.java)
assertThat(requestBody?.contentType()?.type).isEqualTo(MultipartBody.FORM.type)
assertThat(requestBody?.contentType()?.subtype).isEqualTo(MultipartBody.FORM.subtype)

val contentType = requestBody.contentType()
requireNotNull(contentType)

assertThat(contentType.type).isEqualTo(MultipartBody.FORM.type)
assertThat(contentType.subtype).isEqualTo(MultipartBody.FORM.subtype)

val body = requestBody as MultipartBody
val parts = body.parts
Expand Down
24 changes: 13 additions & 11 deletions .../test/kotlin/com/datadog/android/sessionreplay/internal/net/ResourceRequestFactoryTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,18 +109,19 @@ internal class ResourceRequestFactoryTest {

// Then
assertThat(request).isInstanceOf(Request::class.java)
val requestHeaders = request?.headers
val requestBody = request?.body
assertThat(requestHeaders?.get(HEADER_API_KEY))
requireNotNull(request)
val requestHeaders = request.headers
val requestBody = request.body
assertThat(requestHeaders[HEADER_API_KEY])
.isEqualTo(fakeDatadogContext.clientToken)
assertThat(requestHeaders?.get(HEADER_EVP_ORIGIN))
assertThat(requestHeaders[HEADER_EVP_ORIGIN])
.isEqualTo(fakeDatadogContext.source)
assertThat(requestHeaders?.get(HEADER_EVP_ORIGIN_VERSION))
assertThat(requestHeaders[HEADER_EVP_ORIGIN_VERSION])
.isEqualTo(fakeDatadogContext.sdkVersion)
assertThat(requestBody).isEqualTo(mockRequestBody.toByteArray())

assertThat(request?.description).isEqualTo(UPLOAD_DESCRIPTION)
assertThat(request?.url).isEqualTo(expectedUrl(fakeDatadogContext.site.intakeEndpoint))
assertThat(request.description).isEqualTo(UPLOAD_DESCRIPTION)
assertThat(request.url).isEqualTo(expectedUrl(fakeDatadogContext.site.intakeEndpoint))
}

@Test
Expand All @@ -142,10 +143,11 @@ internal class ResourceRequestFactoryTest {
)

// Then
assertThat(request?.url).isEqualTo(expectedUrl(fakeEndpoint))
assertThat(request?.id).isEqualTo(request?.headers?.get(RequestFactory.HEADER_REQUEST_ID))
assertThat(request?.description).isEqualTo(UPLOAD_DESCRIPTION)
assertThat(request?.body).isEqualTo(mockRequestBody.toByteArray())
requireNotNull(request)
assertThat(request.url).isEqualTo(expectedUrl(fakeEndpoint))
assertThat(request.id).isEqualTo(request.headers[RequestFactory.HEADER_REQUEST_ID])
assertThat(request.description).isEqualTo(UPLOAD_DESCRIPTION)
assertThat(request.body).isEqualTo(mockRequestBody.toByteArray())
}

private fun expectedUrl(endpointUrl: String): String {
Expand Down
6 changes: 3 additions & 3 deletions ...st/kotlin/com/datadog/android/sessionreplay/internal/net/SegmentRequestBodyFactoryTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,20 @@ import org.mockito.quality.Strictness
@ForgeConfiguration(ForgeConfigurator::class)
internal class SegmentRequestBodyFactoryTest {

lateinit var testedRequestBodyFactory: SegmentRequestBodyFactory
private lateinit var testedRequestBodyFactory: SegmentRequestBodyFactory

@Mock
lateinit var mockCompressor: BytesCompressor

lateinit var fakeCompressedData: ByteArray
private lateinit var fakeCompressedData: ByteArray

@Forgery
lateinit var fakeSegment: MobileSegment

@Forgery
lateinit var fakeSegmentAsJson: JsonObject

lateinit var fakeSerializedSegmentWithNewLine: String
private lateinit var fakeSerializedSegmentWithNewLine: String

@BeforeEach
fun `set up`(forge: Forge) {
Expand Down
30 changes: 16 additions & 14 deletions ...c/test/kotlin/com/datadog/android/sessionreplay/internal/net/SegmentRequestFactoryTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,19 +107,20 @@ internal class SegmentRequestFactoryTest {
)

// Then
assertThat(request?.url).isEqualTo(expectedUrl(fakeDatadogContext.site.intakeEndpoint))
assertThat(request?.contentType).isEqualTo(fakeMediaType.toString())
assertThat(request?.headers?.minus(RequestFactory.HEADER_REQUEST_ID)).isEqualTo(
requireNotNull(request)
assertThat(request.url).isEqualTo(expectedUrl(fakeDatadogContext.site.intakeEndpoint))
assertThat(request.contentType).isEqualTo(fakeMediaType.toString())
assertThat(request.headers.minus(RequestFactory.HEADER_REQUEST_ID)).isEqualTo(
mapOf(
RequestFactory.HEADER_API_KEY to fakeDatadogContext.clientToken,
RequestFactory.HEADER_EVP_ORIGIN to fakeDatadogContext.source,
RequestFactory.HEADER_EVP_ORIGIN_VERSION to fakeDatadogContext.sdkVersion
)
)
assertThat(request?.headers?.get(RequestFactory.HEADER_REQUEST_ID)).isNotEmpty
assertThat(request?.id).isEqualTo(request?.headers?.get(RequestFactory.HEADER_REQUEST_ID))
assertThat(request?.description).isEqualTo("Session Replay Segment Upload Request")
assertThat(request?.body).isEqualTo(mockRequestBody.toByteArray())
assertThat(request.headers[RequestFactory.HEADER_REQUEST_ID]).isNotEmpty
assertThat(request.id).isEqualTo(request.headers[RequestFactory.HEADER_REQUEST_ID])
assertThat(request.description).isEqualTo("Session Replay Segment Upload Request")
assertThat(request.body).isEqualTo(mockRequestBody.toByteArray())
}

@Test
Expand All @@ -139,19 +140,20 @@ internal class SegmentRequestFactoryTest {
)

// Then
assertThat(request?.url).isEqualTo(expectedUrl(fakeEndpoint))
assertThat(request?.contentType).isEqualTo(fakeMediaType.toString())
assertThat(request?.headers?.minus(RequestFactory.HEADER_REQUEST_ID)).isEqualTo(
requireNotNull(request)
assertThat(request.url).isEqualTo(expectedUrl(fakeEndpoint))
assertThat(request.contentType).isEqualTo(fakeMediaType.toString())
assertThat(request.headers.minus(RequestFactory.HEADER_REQUEST_ID)).isEqualTo(
mapOf(
RequestFactory.HEADER_API_KEY to fakeDatadogContext.clientToken,
RequestFactory.HEADER_EVP_ORIGIN to fakeDatadogContext.source,
RequestFactory.HEADER_EVP_ORIGIN_VERSION to fakeDatadogContext.sdkVersion
)
)
assertThat(request?.headers?.get(RequestFactory.HEADER_REQUEST_ID)).isNotEmpty
assertThat(request?.id).isEqualTo(request?.headers?.get(RequestFactory.HEADER_REQUEST_ID))
assertThat(request?.description).isEqualTo("Session Replay Segment Upload Request")
assertThat(request?.body).isEqualTo(mockRequestBody.toByteArray())
assertThat(request.headers[RequestFactory.HEADER_REQUEST_ID]).isNotEmpty
assertThat(request.id).isEqualTo(request.headers[RequestFactory.HEADER_REQUEST_ID])
assertThat(request.description).isEqualTo("Session Replay Segment Upload Request")
assertThat(request.body).isEqualTo(mockRequestBody.toByteArray())
}

@Test
Expand Down
30 changes: 16 additions & 14 deletions ...-trace/src/test/kotlin/com/datadog/android/trace/internal/net/TracesRequestFactoryTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,19 +61,20 @@ internal class TracesRequestFactoryTest {
val request = testedFactory.create(fakeDatadogContext, batchData, batchMetadata)

// Then
assertThat(request?.url).isEqualTo("${fakeDatadogContext.site.intakeEndpoint}/api/v2/spans")
assertThat(request?.contentType).isEqualTo(RequestFactory.CONTENT_TYPE_TEXT_UTF8)
assertThat(request?.headers?.minus(RequestFactory.HEADER_REQUEST_ID)).isEqualTo(
requireNotNull(request)
assertThat(request.url).isEqualTo("${fakeDatadogContext.site.intakeEndpoint}/api/v2/spans")
assertThat(request.contentType).isEqualTo(RequestFactory.CONTENT_TYPE_TEXT_UTF8)
assertThat(request.headers.minus(RequestFactory.HEADER_REQUEST_ID)).isEqualTo(
mapOf(
RequestFactory.HEADER_API_KEY to fakeDatadogContext.clientToken,
RequestFactory.HEADER_EVP_ORIGIN to fakeDatadogContext.source,
RequestFactory.HEADER_EVP_ORIGIN_VERSION to fakeDatadogContext.sdkVersion
)
)
assertThat(request?.headers?.get(RequestFactory.HEADER_REQUEST_ID)).isNotEmpty()
assertThat(request?.id).isEqualTo(request?.headers?.get(RequestFactory.HEADER_REQUEST_ID))
assertThat(request?.description).isEqualTo("Traces Request")
assertThat(request?.body).isEqualTo(
assertThat(request.headers[RequestFactory.HEADER_REQUEST_ID]).isNotEmpty()
assertThat(request.id).isEqualTo(request.headers[RequestFactory.HEADER_REQUEST_ID])
assertThat(request.description).isEqualTo("Traces Request")
assertThat(request.body).isEqualTo(
batchData.map { it.data }.join(
separator = "\n".toByteArray(),
internalLogger = InternalLogger.UNBOUND
Expand All @@ -97,19 +98,20 @@ internal class TracesRequestFactoryTest {
val request = testedFactory.create(fakeDatadogContext, batchData, batchMetadata)

// Then
assertThat(request?.url).isEqualTo("$fakeEndpoint/api/v2/spans")
assertThat(request?.contentType).isEqualTo(RequestFactory.CONTENT_TYPE_TEXT_UTF8)
assertThat(request?.headers?.minus(RequestFactory.HEADER_REQUEST_ID)).isEqualTo(
requireNotNull(request)
assertThat(request.url).isEqualTo("$fakeEndpoint/api/v2/spans")
assertThat(request.contentType).isEqualTo(RequestFactory.CONTENT_TYPE_TEXT_UTF8)
assertThat(request.headers.minus(RequestFactory.HEADER_REQUEST_ID)).isEqualTo(
mapOf(
RequestFactory.HEADER_API_KEY to fakeDatadogContext.clientToken,
RequestFactory.HEADER_EVP_ORIGIN to fakeDatadogContext.source,
RequestFactory.HEADER_EVP_ORIGIN_VERSION to fakeDatadogContext.sdkVersion
)
)
assertThat(request?.headers?.get(RequestFactory.HEADER_REQUEST_ID)).isNotEmpty()
assertThat(request?.id).isEqualTo(request?.headers?.get(RequestFactory.HEADER_REQUEST_ID))
assertThat(request?.description).isEqualTo("Traces Request")
assertThat(request?.body).isEqualTo(
assertThat(request.headers[RequestFactory.HEADER_REQUEST_ID]).isNotEmpty()
assertThat(request.id).isEqualTo(request.headers[RequestFactory.HEADER_REQUEST_ID])
assertThat(request.description).isEqualTo("Traces Request")
assertThat(request.body).isEqualTo(
batchData.map { it.data }.join(
separator = "\n".toByteArray(),
internalLogger = InternalLogger.UNBOUND
Expand Down

0 comments on commit cbd637a

Please sign in to comment.