use stale event for the testOfflineScenarioLoadsStoredCache

spotify · Sep 6, 2023 · 197bb5e · 197bb5e
1 parent a8d0f76
commit 197bb5e
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 15 deletions.
diff --git a/Provider/src/main/java/dev/openfeature/contrib/providers/ConfidenceFeatureProvider.kt b/Provider/src/main/java/dev/openfeature/contrib/providers/ConfidenceFeatureProvider.kt
@@ -48,7 +48,7 @@ class ConfidenceFeatureProvider private constructor(
     private val client: ConfidenceClient,
     private val flagApplier: FlagApplier,
     private val eventsPublisher: EventsPublisher,
-    private val dispatcher: CoroutineDispatcher
+    dispatcher: CoroutineDispatcher
 ) : FeatureProvider {
     private val job = SupervisorJob()
     private val coroutineScope = CoroutineScope(job + dispatcher)
@@ -300,7 +300,7 @@ class ConfidenceFeatureProvider private constructor(
     }
 }
 
-sealed class InitialisationStrategy {
-    object FetchAndActivate : InitialisationStrategy()
-    object ActivateAndFetchAsync : InitialisationStrategy()
+sealed interface InitialisationStrategy {
+    object FetchAndActivate : InitialisationStrategy
+    object ActivateAndFetchAsync : InitialisationStrategy
 }
diff --git a/Provider/src/main/java/dev/openfeature/contrib/providers/cache/DiskStorage.kt b/Provider/src/main/java/dev/openfeature/contrib/providers/cache/DiskStorage.kt
@@ -0,0 +1,15 @@
+package dev.openfeature.contrib.providers.cache
+
+import dev.openfeature.contrib.providers.client.ResolvedFlag
+import dev.openfeature.sdk.EvaluationContext
+
+interface DiskStorage {
+    fun store(
+        resolvedFlags: List<ResolvedFlag>,
+        resolveToken: String,
+        evaluationContext: EvaluationContext
+    ): CacheData
+    fun read(): CacheData?
+
+    fun clear()
+}
diff --git a/Provider/src/main/java/dev/openfeature/contrib/providers/cache/StorageFileCache.kt b/Provider/src/main/java/dev/openfeature/contrib/providers/cache/StorageFileCache.kt
@@ -11,17 +11,6 @@ import java.io.File
 
 const val FLAGS_FILE_NAME = "confidence_flags_cache.json"
 
-interface DiskStorage {
-    fun store(
-        resolvedFlags: List<ResolvedFlag>,
-        resolveToken: String,
-        evaluationContext: EvaluationContext
-    ): CacheData
-    fun read(): CacheData?
-
-    fun clear()
-}
-
 class StorageFileCache private constructor(context: Context) : DiskStorage {
     private val file: File = File(context.filesDir, FLAGS_FILE_NAME)
 

diff --git a/Provider/src/test/java/dev/openfeature/contrib/providers/StorageFileCacheTests.kt b/Provider/src/test/java/dev/openfeature/contrib/providers/StorageFileCacheTests.kt
@@ -13,8 +13,11 @@ import dev.openfeature.sdk.ImmutableStructure
 import dev.openfeature.sdk.Reason
 import dev.openfeature.sdk.Value
 import dev.openfeature.sdk.async.awaitProviderReady
+import dev.openfeature.sdk.events.EventHandler
+import dev.openfeature.sdk.events.OpenFeatureEvents
 import junit.framework.TestCase
 import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.test.UnconfinedTestDispatcher
 import kotlinx.coroutines.test.runTest
 import org.junit.Before
 import org.junit.Test
@@ -61,12 +64,16 @@ class StorageFileCacheTests {
     @Test
     fun testOfflineScenarioLoadsStoredCache() = runTest {
         val mockClient: ConfidenceClient = mock()
+        val testDispatcher = UnconfinedTestDispatcher(testScheduler)
+        val eventPublisher = EventHandler.eventsPublisher(testDispatcher)
+        eventPublisher.publish(OpenFeatureEvents.ProviderStale)
         val cache1 = InMemoryCache()
         whenever(mockClient.resolve(eq(listOf()), any())).thenReturn(ResolveResponse.Resolved(ResolveFlags(resolvedFlags, "token1")))
         val provider1 = ConfidenceFeatureProvider.create(
             context = mockContext,
             clientSecret = "",
             client = mockClient,
+            eventsPublisher = eventPublisher,
             cache = cache1
         )
         runBlocking {