Refactor SwitchBrowserActivityTest to use an inline IFlightsManager for deterministic flight behavior across environments, replacing the previous MockCommonFlightsManager implementation.

Author: p3dr0rv

common/src/test/java/com/microsoft/identity/common/internal/providers/oauth2/SwitchBrowserActivityTest.kt

@@ -26,9 +26,9 @@ import android.content.Context
 import android.content.Intent
 import com.microsoft.identity.common.adal.internal.AuthenticationConstants.Broker
 import com.microsoft.identity.common.adal.internal.AuthenticationConstants.SWITCH_BROWSER
-import com.microsoft.identity.common.internal.mocks.MockCommonFlightsManager
 import com.microsoft.identity.common.java.flighting.CommonFlightsManager
 import com.microsoft.identity.common.java.flighting.IFlightConfig
+import com.microsoft.identity.common.java.flighting.IFlightsManager
 import com.microsoft.identity.common.java.flighting.IFlightsProvider
 import io.mockk.every
 import io.mockk.just
@@ -60,13 +60,14 @@ class SwitchBrowserActivityTest {
         // CommonFlight.ENABLE_AUTH_TAB_FOR_SWITCH_BROWSER. Its default value is environment-
         // dependent (true on a developer machine where it has been initialized, false in CI
         // where the DefaultValueFlightsProvider returns the flight's default — which is false
-        // for any feature still rolling out). Force it ON here via the shared
-        // MockCommonFlightsManager helper so the Auth Tab branch is exercised deterministically
-        // across local and pipeline runs.
-        val flightsManager = MockCommonFlightsManager().apply {
-            setMockCommonFlightsProvider(AllOnFlightsProvider)
-        }
-        CommonFlightsManager.initializeCommonFlightsManager(flightsManager)
+        // for any feature still rolling out). Force it ON here so the Auth Tab branch is
+        // exercised deterministically across local and pipeline runs.
+        //
+        // Note: We can't reuse the existing MockCommonFlightsManager helper here because its
+        // setter is generated by Lombok at Java-compile time, which runs after kotlinc — so
+        // the setter is invisible from Kotlin. A small inline IFlightsManager test double is
+        // simpler than introducing kapt/Lombok wiring just for this test.
+        CommonFlightsManager.initializeCommonFlightsManager(AllOnFlightsManager)
     }
 
     @After
@@ -180,20 +181,33 @@ class SwitchBrowserActivityTest {
     }
 
     /**
-     * Test [IFlightsProvider] that returns `true` for any boolean flight, ensuring tests are
-     * not affected by environment-specific flight defaults (CI vs local dev machine).
-     * Plugged into the shared [MockCommonFlightsManager] helper.
+     * Inline test [IFlightsManager] that returns `true` for every boolean flight, ensuring tests
+     * are not affected by environment-specific flight defaults (CI vs local dev machine).
+     *
+     * Implemented inline (rather than via [com.microsoft.identity.common.internal.mocks.MockCommonFlightsManager])
+     * because that helper's setter is generated by Lombok and is therefore not visible from Kotlin
+     * sources without enabling kapt for the test source set.
      */
-    private object AllOnFlightsProvider : IFlightsProvider {
-        override fun isFlightEnabled(flightConfig: IFlightConfig): Boolean = true
-        override fun getBooleanValue(flightConfig: IFlightConfig): Boolean = true
-        override fun getIntValue(flightConfig: IFlightConfig): Int =
-            flightConfig.defaultValue as Int
-        override fun getDoubleValue(flightConfig: IFlightConfig): Double =
-            flightConfig.defaultValue as Double
-        override fun getStringValue(flightConfig: IFlightConfig): String =
-            flightConfig.defaultValue as String
-        override fun getJsonValue(flightConfig: IFlightConfig): JSONObject =
-            flightConfig.defaultValue as JSONObject
+    private object AllOnFlightsManager : IFlightsManager {
+        private val provider = object : IFlightsProvider {
+            override fun isFlightEnabled(flightConfig: IFlightConfig): Boolean = true
+            override fun getBooleanValue(flightConfig: IFlightConfig): Boolean = true
+            override fun getIntValue(flightConfig: IFlightConfig): Int =
+                flightConfig.defaultValue as Int
+            override fun getDoubleValue(flightConfig: IFlightConfig): Double =
+                flightConfig.defaultValue as Double
+            override fun getStringValue(flightConfig: IFlightConfig): String =
+                flightConfig.defaultValue as String
+            override fun getJsonValue(flightConfig: IFlightConfig): JSONObject =
+                flightConfig.defaultValue as JSONObject
+        }
+
+        override fun getFlightsProvider(waitForConfigsWithTimeoutInMs: Long): IFlightsProvider =
+            provider
+
+        override fun getFlightsProviderForTenant(
+            tenantId: String,
+            waitForConfigsWithTimeoutInMs: Long
+        ): IFlightsProvider = provider
     }
 }