state listeners

Author: typotter

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

@@ -11,7 +11,6 @@ import com.datadog.android.flags.FlagsClient
 import com.datadog.android.flags.FlagsStateListener
 import com.datadog.android.flags.model.ErrorCode
 import com.datadog.android.flags.model.EvaluationContext
-import com.datadog.android.flags.model.FlagsClientState
 import com.datadog.android.flags.model.ResolutionDetails
 import org.json.JSONObject
 
@@ -116,12 +115,6 @@ internal class NoOpFlagsClient(
         return defaultValue
     }
 
-    /**
-     * Returns [FlagsClientState.ERROR] as this is a no-op client.
-     * @return Always [FlagsClientState.ERROR].
-     */
-    override fun getCurrentState(): FlagsClientState = FlagsClientState.ERROR
-
     /**
      * No-op implementation that ignores listener registration.
      * @param listener Ignored listener.

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

@@ -11,7 +11,6 @@ import com.datadog.android.flags.internal.LogWithPolicy
 import com.datadog.android.flags.internal.NoOpFlagsClient
 import com.datadog.android.flags.model.ErrorCode
 import com.datadog.android.flags.model.EvaluationContext
-import com.datadog.android.flags.model.FlagsClientState
 import fr.xgouchet.elmyr.Forge
 import fr.xgouchet.elmyr.annotation.StringForgery
 import fr.xgouchet.elmyr.junit5.ForgeExtension
@@ -26,6 +25,7 @@ import org.mockito.junit.jupiter.MockitoExtension
 import org.mockito.junit.jupiter.MockitoSettings
 import org.mockito.kotlin.argThat
 import org.mockito.kotlin.eq
+import org.mockito.kotlin.mock
 import org.mockito.kotlin.verify
 import org.mockito.kotlin.verifyNoInteractions
 import org.mockito.quality.Strictness
@@ -430,19 +430,10 @@ internal class NoOpFlagsClientTest {
 
     // region State Management
 
-    @Test
-    fun `M return ERROR state W getCurrentState()`() {
-        // When
-        val result = testedClient.getCurrentState()
-
-        // Then
-        assertThat(result).isEqualTo(FlagsClientState.ERROR)
-    }
-
     @Test
     fun `M do nothing W addStateListener()`() {
         // Given
-        val mockListener = org.mockito.Mockito.mock(FlagsStateListener::class.java)
+        val mockListener = mock<FlagsStateListener>()
 
         // When
         testedClient.addStateListener(mockListener)
@@ -455,7 +446,7 @@ internal class NoOpFlagsClientTest {
     @Test
     fun `M do nothing W removeStateListener()`() {
         // Given
-        val mockListener = org.mockito.Mockito.mock(FlagsStateListener::class.java)
+        val mockListener = mock<FlagsStateListener>()
 
         // When
         testedClient.removeStateListener(mockListener)

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

@@ -17,7 +17,6 @@ import com.datadog.android.flags.internal.model.VariationType
 import com.datadog.android.flags.internal.repository.FlagsRepository
 import com.datadog.android.flags.model.ErrorCode
 import com.datadog.android.flags.model.EvaluationContext
-import com.datadog.android.flags.model.FlagsClientState
 import com.datadog.android.flags.model.ResolutionReason
 import com.datadog.android.flags.utils.forge.ForgeConfigurator
 import com.datadog.android.internal.utils.DDCoreSubscription
@@ -43,6 +42,7 @@ import org.mockito.kotlin.verify
 import org.mockito.kotlin.verifyNoInteractions
 import org.mockito.kotlin.whenever
 import org.mockito.quality.Strictness
+import java.util.concurrent.ExecutorService
 
 @Extensions(
     ExtendWith(MockitoExtension::class),
@@ -70,6 +70,9 @@ internal class DatadogFlagsClientTest {
     @Mock
     lateinit var mockRumEvaluationLogger: RumEvaluationLogger
 
+    @Mock
+    lateinit var mockExecutorService: ExecutorService
+
     private lateinit var testedClient: DatadogFlagsClient
 
     @StringForgery
@@ -83,6 +86,12 @@ internal class DatadogFlagsClientTest {
         whenever(mockFeatureSdkCore.internalLogger) doReturn mockInternalLogger
         whenever(mockFeatureSdkCore.getFeature(RUM_FEATURE_NAME)) doReturn mock()
 
+        // Mock executor to run tasks synchronously for testing
+        whenever(mockExecutorService.execute(any())).thenAnswer { invocation ->
+            val runnable = invocation.getArgument<Runnable>(0)
+            runnable.run()
+        }
+
         // Mock evaluation context as ready by default
         // Tests that need to test "not ready" state should override this
         val defaultContext = EvaluationContext(
@@ -101,7 +110,10 @@ internal class DatadogFlagsClientTest {
             ),
             rumEvaluationLogger = mockRumEvaluationLogger,
             processor = mockProcessor,
-            flagStateChannel = FlagsStateChannel(DDCoreSubscription.create())
+            flagStateManager = FlagsStateManager(
+                subscription = DDCoreSubscription.create(),
+                executorService = mockExecutorService
+            )
         )
     }
 
@@ -642,7 +654,11 @@ internal class DatadogFlagsClientTest {
             flagsRepository = customRepository,
             flagsConfiguration = forge.getForgery(),
             rumEvaluationLogger = mockRumEvaluationLogger,
-            processor = mockProcessor
+            processor = mockProcessor,
+            flagStateManager = FlagsStateManager(
+                subscription = DDCoreSubscription.create(),
+                executorService = mockExecutorService
+            )
         )
 
         // When
@@ -941,7 +957,11 @@ internal class DatadogFlagsClientTest {
                 rumIntegrationEnabled = false
             ),
             rumEvaluationLogger = mockRumEvaluationLogger,
-            processor = mockProcessor
+            processor = mockProcessor,
+            flagStateManager = FlagsStateManager(
+                subscription = DDCoreSubscription.create(),
+                executorService = mockExecutorService
+            )
         )
 
         // When
@@ -1045,7 +1065,11 @@ internal class DatadogFlagsClientTest {
                 rumIntegrationEnabled = false
             ),
             rumEvaluationLogger = mockRumEvaluationLogger,
-            processor = mockProcessor
+            processor = mockProcessor,
+            flagStateManager = FlagsStateManager(
+                subscription = DDCoreSubscription.create(),
+                executorService = mockExecutorService
+            )
         )
         whenever(mockFlagsRepository.getPrecomputedFlagWithContext(fakeFlagKey)) doReturn
             (fakeFlag to fakeEvaluationContext)
@@ -1299,15 +1323,6 @@ internal class DatadogFlagsClientTest {
 
     // region State Management
 
-    @Test
-    fun `M return NOT_READY W getCurrentState() {initial state}`() {
-        // When
-        val result = testedClient.getCurrentState()
-
-        // Then
-        assertThat(result).isEqualTo(FlagsClientState.NOT_READY)
-    }
-
     @Test
     fun `M add listener W addStateListener()`() {
         // Given
@@ -1335,64 +1350,8 @@ internal class DatadogFlagsClientTest {
         verifyNoInteractions(mockListener)
     }
 
-    @Test
-    fun `M notify listener W updateState() called`() {
-        // Given
-        val mockListener = mock(FlagsStateListener::class.java)
-        testedClient.addStateListener(mockListener)
-
-        // When
-        testedClient.updateState(FlagsClientState.READY, null)
-
-        // Then
-        verify(mockListener).onStateChanged(FlagsClientState.READY, null)
-        assertThat(testedClient.getCurrentState()).isEqualTo(FlagsClientState.READY)
-    }
-
-    @Test
-    fun `M notify listener with error W updateState(ERROR) called`() {
-        // Given
-        val mockListener = mock(FlagsStateListener::class.java)
-        val fakeError = RuntimeException("Test error")
-        testedClient.addStateListener(mockListener)
-
-        // When
-        testedClient.updateState(FlagsClientState.ERROR, fakeError)
-
-        // Then
-        verify(mockListener).onStateChanged(FlagsClientState.ERROR, fakeError)
-        assertThat(testedClient.getCurrentState()).isEqualTo(FlagsClientState.ERROR)
-    }
-
-    @Test
-    fun `M notify all listeners W updateState() with multiple listeners`() {
-        // Given
-        val mockListener1 = mock(FlagsStateListener::class.java)
-        val mockListener2 = mock(FlagsStateListener::class.java)
-        testedClient.addStateListener(mockListener1)
-        testedClient.addStateListener(mockListener2)
-
-        // When
-        testedClient.updateState(FlagsClientState.RECONCILING, null)
-
-        // Then
-        verify(mockListener1).onStateChanged(FlagsClientState.RECONCILING, null)
-        verify(mockListener2).onStateChanged(FlagsClientState.RECONCILING, null)
-    }
-
-    @Test
-    fun `M not notify removed listener W removeStateListener() then updateState()`() {
-        // Given
-        val mockListener = mock(FlagsStateListener::class.java)
-        testedClient.addStateListener(mockListener)
-        testedClient.removeStateListener(mockListener)
-
-        // When
-        testedClient.updateState(FlagsClientState.READY, null)
-
-        // Then
-        verifyNoInteractions(mockListener)
-    }
+    // Note: updateState() tests removed - this is now an internal method called only by
+    // EvaluationsManager. State notification testing is covered in FlagsStateManagerTest.
 
     // endregion
 }