polish up tests

Author: typotter

features/dd-sdk-android-flags/src/main/kotlin/com/datadog/android/flags/internal/JsonExtensions.kt

@@ -108,7 +108,7 @@ internal fun Map<String, Any?>.toJSONObject(): JSONObject {
  *
  * @return A JSONArray with all nested structures converted
  */
-internal fun List<Any?>.toJSONArray(): JSONArray {
+internal fun List<*>.toJSONArray(): JSONArray {
     val jsonArray = JSONArray()
 
     forEach { value ->
@@ -136,14 +136,10 @@ private fun convertToJsonValue(value: Any?): Any = when (value) {
     null -> JSONObject.NULL
     is Map<*, *> -> {
         // Convert keys to String (supports non-String keys via toString())
-        @Suppress("UNCHECKED_CAST")
         val stringMap = value.entries.associate { (k, v) -> k.toString() to v }
         stringMap.toJSONObject()
     }
-    is List<*> -> {
-        @Suppress("UNCHECKED_CAST")
-        (value as List<Any?>).toJSONArray()
-    }
+    is List<*> -> value.toJSONArray()
     else -> value // Primitives: String, Int, Long, Double, Boolean
 }
 

features/dd-sdk-android-flags/src/test/kotlin/com/datadog/android/flags/internal/DatadogFlagsClientTest.kt

@@ -496,18 +496,21 @@ internal class DatadogFlagsClientTest {
 
     // endregion
 
+    // region resolveStructureValue()
+
     @Test
-    fun `M return flag value W resolveStructureValue() { flag exists with valid JSON string }`(forge: Forge) {
+    fun `M return flag value W resolveStructureValue() { flag exists with valid JSON string }`(
+        forge: Forge,
+        @StringForgery fakeFlagKey: String
+    ) {
         // Given
         val fakeFlagKey = forge.anAlphabeticalString()
         val fakeDefaultValue = JSONObject().apply {
             put(fakeJsonKey, forge.anAlphabeticalString())
         }
-        val fakeKey1Value = forge.anAlphabeticalString()
-        val fakeKey2Value = forge.anInt()
         val fakeFlagValue = JSONObject().apply {
-            put("key1", fakeKey1Value)
-            put("key2", fakeKey2Value)
+            put("key1", forge.anAlphabeticalString())
+            put("key2", forge.anInt())
         }
         val fakeFlag = forge.getForgery<PrecomputedFlag>().copy(
             variationType = VariationType.OBJECT.value,

features/dd-sdk-android-flags/src/test/kotlin/com/datadog/android/flags/internal/JsonExtensionsTest.kt

@@ -106,9 +106,7 @@ internal class JsonExtensionsTest {
         assertThat(result["items"]).isInstanceOf(List::class.java)
         val items = result["items"] as List<*>
         assertThat(items).hasSize(3)
-        assertThat(items[0]).isEqualTo(fakeItem1)
-        assertThat(items[1]).isEqualTo(fakeItem2)
-        assertThat(items[2]).isEqualTo(fakeItem3)
+        assertThat(items).isEqualTo(listOf(fakeItem1, fakeItem2, fakeItem3))
     }
 
     @Test
@@ -186,10 +184,7 @@ internal class JsonExtensionsTest {
 
         // Then
         assertThat(result).hasSize(4)
-        assertThat(result[0]).isEqualTo(fakeString)
-        assertThat(result[1]).isEqualTo(fakeInt)
-        assertThat(result[2]).isEqualTo(fakeBool)
-        assertThat(result[3]).isEqualTo(fakeDouble)
+        assertThat(result).isEqualTo(listOf(fakeString, fakeInt, fakeBool, fakeDouble))
     }
 
     @Test