Skip to content

Commit e59b289

Browse files
@W-20161958: [MSDK 13.1][Android] Cannot login GUS using Welcome endpoint (loginActivity_startsCorrectActivity_onStartDefaultLoginWithHintAndHost)
1 parent 4c9cfb9 commit e59b289

File tree

2 files changed

+30
-1
lines changed

2 files changed

+30
-1
lines changed

libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1616,7 +1616,8 @@ open class LoginActivity : FragmentActivity() {
16161616
* @param loginHint The Salesforce Welcome login username hint
16171617
* @param loginHost The Salesforce Welcome login host
16181618
*/
1619-
private fun startDefaultLoginWithHintAndHost(
1619+
@VisibleForTesting
1620+
internal fun startDefaultLoginWithHintAndHost(
16201621
context: Context,
16211622
loginHint: String,
16221623
loginHost: String,

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@
2626
*/
2727
package com.salesforce.androidsdk.ui
2828

29+
import android.content.Context
2930
import android.content.Intent
31+
import android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP
3032
import android.net.Uri.parse
3133
import android.webkit.WebView
3234
import androidx.core.net.toUri
@@ -45,6 +47,9 @@ import com.salesforce.androidsdk.ui.LoginActivity.Companion.SALESFORCE_WELCOME_D
4547
import com.salesforce.androidsdk.ui.LoginActivity.Companion.SALESFORCE_WELCOME_DISCOVERY_MOBILE_URL_QUERY_PARAMETER_KEY_CLIENT_VERSION
4648
import com.salesforce.androidsdk.ui.LoginActivity.Companion.SALESFORCE_WELCOME_DISCOVERY_URL_PATH
4749
import com.salesforce.androidsdk.ui.LoginActivity.Companion.isSalesforceWelcomeDiscoveryMobileUrl
50+
import com.salesforce.androidsdk.ui.LoginActivity.Companion.startDefaultLoginWithHintAndHost
51+
import io.mockk.mockk
52+
import io.mockk.verify
4853
import org.junit.Assert.assertEquals
4954
import org.junit.Assert.assertFalse
5055
import org.junit.Assert.assertTrue
@@ -311,5 +316,28 @@ class LoginActivityTest {
311316
}
312317
}
313318

319+
@Test
320+
fun loginActivity_startsCorrectActivity_onStartDefaultLoginWithHintAndHost() {
321+
322+
val context = mockk<Context>(relaxed = true)
323+
324+
startDefaultLoginWithHintAndHost(
325+
context = context,
326+
loginHint = "ExampleUser@Example.com", // IETF-Reserved Test Domain
327+
loginHost = "https://login.example.com" // IETF-Reserved Test Domain
328+
)
329+
330+
verify(exactly = 1) {
331+
context.startActivity(
332+
match {
333+
it.component?.className == LoginActivity::class.java.name
334+
it.getStringExtra(EXTRA_KEY_LOGIN_HINT) == "ExampleUser@Example.com"
335+
it.getStringExtra(EXTRA_KEY_LOGIN_HOST) == "https://login.example.com"
336+
it.flags == FLAG_ACTIVITY_SINGLE_TOP
337+
}
338+
)
339+
}
340+
}
341+
314342
// endregion
315343
}

0 commit comments

Comments
 (0)