test cases for Instance.kt

featurevisor · Oct 1, 2024 · 10b325d · 10b325d
1 parent 0948a22
commit 10b325d
Show file tree

Hide file tree

Showing 7 changed files with 1,440 additions and 32 deletions.
diff --git a/src/main/kotlin/com/featurevisor/sdk/Instance+Fetch.kt b/src/main/kotlin/com/featurevisor/sdk/Instance+Fetch.kt
@@ -13,7 +13,7 @@ val client = OkHttpClient()
 
 // MARK: - Fetch datafile content
 @Throws(IOException::class)
-internal fun FeaturevisorInstance.fetchDatafileContent(
+suspend fun FeaturevisorInstance.fetchDatafileContent(
     url: String,
     handleDatafileFetch: DatafileFetchHandler? = null,
     completion: (Result<DatafileContent>) -> Unit,

diff --git a/src/main/kotlin/com/featurevisor/sdk/Instance+Refresh.kt b/src/main/kotlin/com/featurevisor/sdk/Instance+Refresh.kt
@@ -33,7 +33,7 @@ fun FeaturevisorInstance.stopRefreshing() {
     logger?.warn("refreshing has stopped")
 }
 
-private fun FeaturevisorInstance.refresh() {
+private suspend fun FeaturevisorInstance.refresh() {
     logger?.debug("refreshing datafile")
     when {
         statuses.refreshInProgress -> logger?.warn("refresh in progress, skipping")

diff --git a/src/main/kotlin/com/featurevisor/sdk/Instance+Status.kt b/src/main/kotlin/com/featurevisor/sdk/Instance+Status.kt
@@ -2,6 +2,6 @@ package com.featurevisor.sdk
 
 data class Statuses(var ready: Boolean, var refreshInProgress: Boolean)
 
-internal fun FeaturevisorInstance.isReady(): Boolean {
+fun FeaturevisorInstance.isReady(): Boolean {
     return statuses.ready
 }
diff --git a/src/main/kotlin/com/featurevisor/sdk/Instance+Variable.kt b/src/main/kotlin/com/featurevisor/sdk/Instance+Variable.kt
@@ -1,16 +1,11 @@
 package com.featurevisor.sdk
 
+import com.featurevisor.testRunner.getVariableValues
 import com.featurevisor.types.Context
 import com.featurevisor.types.FeatureKey
 import com.featurevisor.types.VariableKey
 import com.featurevisor.types.VariableValue
-import com.featurevisor.types.VariableValue.ArrayValue
-import com.featurevisor.types.VariableValue.BooleanValue
-import com.featurevisor.types.VariableValue.DoubleValue
-import com.featurevisor.types.VariableValue.IntValue
-import com.featurevisor.types.VariableValue.JsonValue
-import com.featurevisor.types.VariableValue.ObjectValue
-import com.featurevisor.types.VariableValue.StringValue
+import com.featurevisor.types.VariableValue.*
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.decodeFromJsonElement
@@ -76,8 +71,14 @@ inline fun <reified T : Any> FeaturevisorInstance.getVariableObject(
     context: Context,
 ): T? {
     val objectValue = getVariable(featureKey, variableKey, context) as? ObjectValue
+    val actualValue = objectValue?.value?.keys?.map {
+        mapOf(
+            it to getVariableValues(objectValue.value[it]).toString()
+        )
+    }?.firstOrNull()
+
     return try {
-        val encoded = Json.encodeToJsonElement(objectValue?.value)
+        val encoded = Json.encodeToJsonElement(actualValue)
         return Json.decodeFromJsonElement<T>(encoded)
     } catch (e: Exception) {
         null

diff --git a/src/main/kotlin/com/featurevisor/sdk/Instance.kt b/src/main/kotlin/com/featurevisor/sdk/Instance.kt
@@ -6,12 +6,10 @@ package com.featurevisor.sdk
 import com.featurevisor.sdk.FeaturevisorError.MissingDatafileOptions
 import com.featurevisor.types.*
 import com.featurevisor.types.EventName.*
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.*
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
+import kotlin.coroutines.resume
 
 typealias ConfigureBucketKey = (Feature, Context, BucketKey) -> BucketKey
 typealias ConfigureBucketValue = (Feature, Context, BucketValue) -> BucketValue
@@ -141,6 +139,21 @@ class FeaturevisorInstance private constructor(options: InstanceOptions) {
         this.logger?.setLevels(levels)
     }
 
+    suspend fun onReady(): FeaturevisorInstance {
+        return suspendCancellableCoroutine { continuation ->
+            if (this.statuses.ready) {
+                continuation.resume(this)
+            }
+
+            val cb :(result:Array<out Any>) -> Unit = {
+                this.emitter.removeListener(READY)
+                continuation.resume(this)
+            }
+
+            this.emitter.addListener(READY,cb)
+        }
+    }
+
     fun setDatafile(datafileJSON: String) {
         val data = datafileJSON.toByteArray(Charsets.UTF_8)
         try {

diff --git a/src/main/kotlin/com/featurevisor/testRunner/Utils.kt b/src/main/kotlin/com/featurevisor/testRunner/Utils.kt
@@ -4,6 +4,7 @@ import com.featurevisor.sdk.FeaturevisorInstance
 import com.featurevisor.sdk.InstanceOptions
 import com.featurevisor.sdk.emptyDatafile
 import com.featurevisor.types.*
+import com.featurevisor.types.VariableValue.*
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonElement
@@ -177,6 +178,18 @@ fun getContextValues(contextValue: AttributeValue?) =
         null -> null
     }
 
+fun getVariableValues(variableValue: VariableValue?) =
+    when (variableValue) {
+        is IntValue -> variableValue.value
+        is DoubleValue -> variableValue.value
+        is StringValue -> variableValue.value
+        is BooleanValue -> variableValue.value
+        is ArrayValue -> variableValue.values
+        is JsonValue -> variableValue.value
+        is ObjectValue -> variableValue.value
+        null -> null
+    }
+
 fun checkIfArraysAreEqual(a: Array<Any>, b: Array<Any>): Boolean {
     if (a.size != b.size) return false