@W-21933885: [MSDK Android] App Attestation Implementation (Fix Cross-Test Singleton Contamination In TokenMigrationActivityTest And TokenMigrationWebViewTest)

Author: JohnsonEricAtSalesforce

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

@@ -47,6 +47,7 @@ import io.mockk.every
 import io.mockk.mockk
 import io.mockk.mockkObject
 import io.mockk.mockkStatic
+import io.mockk.spyk
 import io.mockk.unmockkAll
 import org.junit.After
 import org.junit.Assert.assertEquals
@@ -75,9 +76,10 @@ class TokenMigrationActivityTest {
     )
 
     private lateinit var mockUserAccountManager: UserAccountManager
-    private lateinit var mockSdkManager: SalesforceSDKManager
     private lateinit var mockRestClient: RestClient
     private lateinit var mockUser: UserAccount
+    private lateinit var mockClientManager: com.salesforce.androidsdk.rest.ClientManager
+    private lateinit var savedFactory: ViewModelProvider.Factory
 
     @Before
     fun setUp() {
@@ -92,9 +94,9 @@ class TokenMigrationActivityTest {
         SalesforceLogger.resetLoggerPrefs(getApplicationContext())
 
         mockUserAccountManager = mockk(relaxed = true)
-        mockSdkManager = mockk(relaxed = true)
         mockRestClient = mockk(relaxed = true)
         mockUser = mockk(relaxed = true)
+        mockClientManager = mockk(relaxed = true)
 
         // Mock user properties needed for getAuthorizationUrl
         every { mockUser.instanceServer } returns "https://test.salesforce.com"
@@ -108,13 +110,18 @@ class TokenMigrationActivityTest {
             mockUserAccountManager.getUserFromOrgAndUserId(INVALID_ORG, INVALID_USER)
         } returns null
 
-        mockkObject(SalesforceSDKManager)
-        mockkObject(SalesforceSDKManager.Companion)
-        every { SalesforceSDKManager.getInstance() } returns mockSdkManager
-        every { mockSdkManager.appContext } returns getApplicationContext()
-        every { mockSdkManager.clientManager.peekRestClient(any<UserAccount>()) } returns mockRestClient
-        every { mockSdkManager.useHybridAuthentication } returns false
-        every { mockSdkManager.userAgent } returns "MockUserAgent"
+        // Get the REAL SalesforceSDKManager instance and save properties
+        val realSdkManager = SalesforceSDKManager.getInstance()
+        savedFactory = realSdkManager.loginViewModelFactory
+
+        // 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
+
+        // Replace getInstance() to return our spy instead of completely mocking the object
+        mockkStatic(SalesforceSDKManager::class)
+        every { SalesforceSDKManager.getInstance() } returns sdkManagerSpy
 
         // Default mock for sendSync to prevent hanging - tests can override this
         val mockResponse = mockk<com.salesforce.androidsdk.rest.RestResponse>(relaxed = true)
@@ -129,6 +136,13 @@ class TokenMigrationActivityTest {
 
     @After
     fun tearDown() {
+        // Restore the loginViewModelFactory on the real instance before unmocking
+        try {
+            val realSdkManager = SalesforceSDKManager.getInstance()
+            realSdkManager.loginViewModelFactory = savedFactory
+        } catch (e: Exception) {
+            // If getInstance() is still mocked, this will fail - unmockkAll will clean it up
+        }
         unmockkAll()
     }
 
@@ -326,7 +340,7 @@ class TokenMigrationActivityTest {
 
         // Throw exception when getting client
         every {
-            mockSdkManager.clientManager.peekRestClient(any<UserAccount>())
+            mockClientManager.peekRestClient(any<UserAccount>())
         } throws RuntimeException("Account not found")
 
         // When
@@ -372,8 +386,8 @@ class TokenMigrationActivityTest {
             every { asString() } returns "{}"
         }
 
-        // Mock loginViewModelFactory
-        every { mockSdkManager.loginViewModelFactory } returns object : ViewModelProvider.Factory {
+        // Mock loginViewModelFactory on the real/spied instance
+        SalesforceSDKManager.getInstance().loginViewModelFactory = object : ViewModelProvider.Factory {
             @Suppress("UNCHECKED_CAST")
             override fun <T : ViewModel> create(modelClass: Class<T>, extras: CreationExtras): T {
                 return mockk<LoginViewModel>(relaxed = true) as T

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

@@ -48,6 +48,7 @@ class TokenMigrationWebViewTest {
     )
 
     private lateinit var savedFactory: ViewModelProvider.Factory
+    private lateinit var savedWebViewFactory: (Context) -> WebView
     private lateinit var mockViewModel: LoginViewModel
     private lateinit var mockWebView: WebView
     private var testActivity: TokenMigrationActivity? = null
@@ -58,6 +59,9 @@ class TokenMigrationWebViewTest {
         // Save the real loginViewModelFactory so it can be restored in tearDown
         savedFactory = SalesforceSDKManager.getInstance().loginViewModelFactory
 
+        // Save the original webViewFactory so it can be restored in tearDown
+        savedWebViewFactory = TokenMigrationActivity.webViewFactory
+
         // Mock loginViewModelFactory to return a mock LoginViewModel
         mockViewModel = mockk<LoginViewModel>(relaxed = true) {
             every { dynamicBackgroundColor } returns mutableStateOf(Color.White)
@@ -98,6 +102,8 @@ class TokenMigrationWebViewTest {
         testActivity = null
         // Restore the real loginViewModelFactory
         SalesforceSDKManager.getInstance().loginViewModelFactory = savedFactory
+        // Restore the original webViewFactory
+        TokenMigrationActivity.webViewFactory = savedWebViewFactory
         unmockkAll()  // cleans up any mockk() instances created in tests
     }