PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Telephony.Carriers.MVNO_TYPE is Deprecated." into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-10-10 03:28:29 +00:00
committed by Android (Google) Code Review
parent ceb23d4407 2d029133f2
commit f062d1cd6e
7 changed files with 66 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/spa_unit/src/com/android/settings/network/apn/ApnEditPageProviderTest.kt
View File

@@ -51,7 +51,6 @@ class ApnEditPageProviderTest {
private val apnName = "apn_name"
private val mmsc = "mmsc"
private val mmsProxy = "mms_proxy"
private val mnc = "mnc"
private val apnType = "apn_type"
private val apnRoaming = "IPv4"
private val apnEnable = context.resources.getString(R.string.carrier_enabled)
@@ -64,7 +63,6 @@ class ApnEditPageProviderTest {
name = apnName,
mmsc = mmsc,
mmsProxy = mmsProxy,
mnc = mnc,
apnType = apnType,
apnRoaming = apnProtocolOptions.indexOf(apnRoaming),
apnEnable = true
@@ -120,18 +118,6 @@ class ApnEditPageProviderTest {
composeTestRule.onNodeWithText(mmsProxy, true).assertIsDisplayed()
}
@Test
fun mnc_displayed() {
composeTestRule.setContent {
ApnPage(remember {
apnData
})
}
composeTestRule.onRoot().onChild().onChildAt(0)
.performScrollToNode(hasText(mnc, true))
composeTestRule.onNodeWithText(mnc, true).assertIsDisplayed()
}
@Test
fun apn_type_displayed() {
composeTestRule.setContent {

24
tests/spa_unit/src/com/android/settings/network/apn/ApnRepositoryTest.kt
View File

@@ -41,10 +41,26 @@ class ApnRepositoryTest {
val cursor = MatrixCursor(sProjection)
cursor.addRow(
arrayOf<Any?>(
0, "name", "apn", "proxy", "port",
"userName", "server", "passWord", "mmsc", "mcc", "mnc", "numeric",
"mmsProxy", "mmsPort", 0, "apnType", "apnProtocol", 0,
0, "apnRoaming", "mvnoType", "mvnoValue", 0, 1, 0
0,
"name",
"apn",
"proxy",
"port",
"userName",
"server",
"passWord",
"mmsc",
"mmsProxy",
"mmsPort",
0,
"apnType",
"apnProtocol",
0,
0,
"apnRoaming",
0,
1,
0
)
)
val context = Mockito.spy(context)

10
tests/spa_unit/src/com/android/settings/network/apn/ApnStatusTest.kt
View File

@@ -26,13 +26,17 @@ import org.mockito.kotlin.mock
@RunWith(AndroidJUnit4::class)
class ApnStatusTest {
private val subId = 1
private val apnData = mock<ApnData> {
on {
it.subId
} doReturn 1
}
private val configManager = mock<CarrierConfigManager> {
val p = PersistableBundle()
p.putBoolean(CarrierConfigManager.KEY_ALLOW_ADDING_APNS_BOOL, true)
on {
getConfigForSubId(
subId,
apnData.subId,
CarrierConfigManager.KEY_READ_ONLY_APN_TYPES_STRING_ARRAY,
CarrierConfigManager.KEY_READ_ONLY_APN_FIELDS_STRING_ARRAY,
CarrierConfigManager.KEY_APN_SETTINGS_DEFAULT_APN_TYPES_STRING_ARRAY,
@@ -45,6 +49,6 @@ class ApnStatusTest {
@Test
fun getCarrierCustomizedConfig_test() {
assert(getCarrierCustomizedConfig(configManager, subId).isAddApnAllowed)
assert(getCarrierCustomizedConfig(apnData, configManager).isAddApnAllowed)
}
}