@W-21933885: [MSDK Android] App Attestation Implementation (Fix TokenMigrationActivityTest tearDown By Using Real SDK Manager Reference)

Author: JohnsonEricAtSalesforce

libs/test/SalesforceSDKTest/src/com/salesforce/androidsdk/ui/TokenMigrationActivityTest.kt

@@ -80,6 +80,7 @@ class TokenMigrationActivityTest {
     private lateinit var mockRestClient: RestClient
     private lateinit var mockUser: UserAccount
     private lateinit var mockClientManager: com.salesforce.androidsdk.rest.ClientManager
+    private lateinit var realSdkManager: SalesforceSDKManager
     private lateinit var savedFactory: ViewModelProvider.Factory
     private var savedAppAttestationClient: AppAttestationClient? = null
 
@@ -112,20 +113,20 @@ class TokenMigrationActivityTest {
             mockUserAccountManager.getUserFromOrgAndUserId(INVALID_ORG, INVALID_USER)
         } returns null
 
-        // Get the REAL SalesforceSDKManager instance and save properties
-        val realSdkManager = SalesforceSDKManager.getInstance()
+        // Get the REAL SalesforceSDKManager instance and save reference + properties
+        realSdkManager = SalesforceSDKManager.getInstance()
         savedFactory = realSdkManager.loginViewModelFactory
         savedAppAttestationClient = realSdkManager.appAttestationClient
 
+        // CRITICAL: Set appAttestationClient to null on the REAL instance to prevent blocking network calls
+        // This must be done before creating the spy to ensure the spy sees the null value
+        realSdkManager.appAttestationClient = null
+
         // Mock only the clientManager on the real instance using spyk
         val sdkManagerSpy = spyk(realSdkManager)
         every { sdkManagerSpy.clientManager } returns mockClientManager
         every { mockClientManager.peekRestClient(any<UserAccount>()) } returns mockRestClient
 
-        // CRITICAL: Set appAttestationClient to null to prevent blocking network calls
-        // in LoginViewModel.getAuthorizationUrl() and OAuth2.makeTokenEndpointRequest()
-        every { sdkManagerSpy.appAttestationClient } returns null
-
         // Replace getInstance() to return our spy instead of completely mocking the object
         mockkStatic(SalesforceSDKManager::class)
         every { SalesforceSDKManager.getInstance() } returns sdkManagerSpy
@@ -143,14 +144,12 @@ class TokenMigrationActivityTest {
 
     @After
     fun tearDown() {
-        // Restore the loginViewModelFactory and appAttestationClient on the real instance before unmocking
-        try {
-            val realSdkManager = SalesforceSDKManager.getInstance()
-            realSdkManager.loginViewModelFactory = savedFactory
-            realSdkManager.appAttestationClient = savedAppAttestationClient
-        } catch (e: Exception) {
-            // If getInstance() is still mocked, this will fail - unmockkAll will clean it up
-        }
+        // Restore the loginViewModelFactory and appAttestationClient on the REAL instance (not via getInstance())
+        // This must be done before unmockkAll() so we have the reference
+        realSdkManager.loginViewModelFactory = savedFactory
+        realSdkManager.appAttestationClient = savedAppAttestationClient
+
+        // Clean up all mocks
         unmockkAll()
     }