Merge "Change apn type into ExposedDropdownMenuCheckBox" into main

This commit is contained in:
Charlotte Lu
2024-01-22 08:39:59 +00:00
committed by Android (Google) Code Review
4 changed files with 212 additions and 123 deletions

View File

@@ -50,9 +50,9 @@ class ApnEditPageProviderTest {
private val context: Context = ApplicationProvider.getApplicationContext()
private val apnName = "apn_name"
private val mmsc = "mmsc"
private val mmsProxy = "mms_proxy"
private val apnType = "apn_type"
private val proxy = "proxy"
private val port = "port"
private val apnType = context.resources.getString(R.string.apn_type)
private val apnRoaming = "IPv4"
private val apnEnable = context.resources.getString(R.string.carrier_enabled)
private val apnProtocolOptions =
@@ -61,8 +61,8 @@ class ApnEditPageProviderTest {
private val passwordTitle = context.resources.getString(R.string.apn_password)
private val apnInit = ApnData(
name = apnName,
mmsc = mmsc,
mmsProxy = mmsProxy,
proxy = proxy,
port = port,
apnType = apnType,
apnRoaming = apnProtocolOptions.indexOf(apnRoaming),
apnEnable = true
@@ -94,23 +94,23 @@ class ApnEditPageProviderTest {
}
@Test
fun mmsc_displayed() {
fun proxy_displayed() {
composeTestRule.setContent {
ApnPage(apnInit, remember { apnData }, uri)
}
composeTestRule.onRoot().onChild().onChildAt(0)
.performScrollToNode(hasText(mmsc, true))
composeTestRule.onNodeWithText(mmsc, true).assertIsDisplayed()
.performScrollToNode(hasText(proxy, true))
composeTestRule.onNodeWithText(proxy, true).assertIsDisplayed()
}
@Test
fun mms_proxy_displayed() {
fun port_displayed() {
composeTestRule.setContent {
ApnPage(apnInit, remember { apnData }, uri)
}
composeTestRule.onRoot().onChild().onChildAt(0)
.performScrollToNode(hasText(mmsProxy, true))
composeTestRule.onNodeWithText(mmsProxy, true).assertIsDisplayed()
.performScrollToNode(hasText(port, true))
composeTestRule.onNodeWithText(port, true).assertIsDisplayed()
}
@Test