LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add CTS test for NetworkAgent/NetworkAgentConfig API

Browse Source 
The following is a list of APIs:
1. NetworkAgent.setLegacySubtype
2. NetworkAgentConfig.Builder.setLegacySubType
3. NetworkAgentConfig.Builder.setLegacySubTypeName
4. NetworkAgentConfig.Builder.setLegacyExtraInfo

Bug: 190413710
Test: atest android.net.cts.NetworkAgentTest
      atest CtsNetTestCasesLatestSdk:NetworkAgentTest
Change-Id: Ia67b963b8e18af8440b1b9bd91f53439848bb838
This commit is contained in:
lifr
2021-06-09 17:21:24 +08:00
parent 07f97b249c
commit 561547a537
1 changed files with 51 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
tests/cts/net/src/android/net/cts/NetworkAgentTest.kt
View File

@@ -70,6 +70,7 @@ import android.os.HandlerThread
import android.os.Looper
import android.os.Message
import android.os.SystemClock
import android.telephony.TelephonyManager
import android.util.DebugUtils.valueToString
import androidx.test.InstrumentationRegistry
import com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity
@@ -362,15 +363,19 @@ class NetworkAgentTest {
}
}
private fun createConnectedNetworkAgent(context: Context = realContext, name: String? = null):
Pair<TestableNetworkAgent, TestableNetworkCallback> {
private fun createConnectedNetworkAgent(
context: Context = realContext,
name: String? = null,
initialConfig: NetworkAgentConfig? = null
): Pair<TestableNetworkAgent, TestableNetworkCallback> {
val request: NetworkRequest = NetworkRequest.Builder()
.clearCapabilities()
.addTransportType(TRANSPORT_TEST)
.build()
val callback = TestableNetworkCallback(timeoutMs = DEFAULT_TIMEOUT_MS)
requestNetwork(request, callback)
val agent = createNetworkAgent(context, name)
val config = initialConfig ?: NetworkAgentConfig.Builder().build()
val agent = createNetworkAgent(context, name, initialConfig = config)
agent.setTeardownDelayMillis(0)
agent.register()
agent.markConnected()
@@ -382,6 +387,49 @@ class NetworkAgentTest {
mFakeConnectivityService.connect(it.registerForTest(Network(FAKE_NET_ID)))
}
@Test
fun testSetSubtypeNameAndExtraInfoByAgentConfig() {
val subtypeLTE = TelephonyManager.NETWORK_TYPE_LTE
val subtypeNameLTE = "LTE"
val legacyExtraInfo = "mylegacyExtraInfo"
val config = NetworkAgentConfig.Builder()
.setLegacySubType(subtypeLTE)
.setLegacySubTypeName(subtypeNameLTE)
.setLegacyExtraInfo(legacyExtraInfo).build()
val (agent, callback) = createConnectedNetworkAgent(initialConfig = config)
val networkInfo = mCM.getNetworkInfo(agent.network)
assertEquals(subtypeLTE, networkInfo.getSubtype())
assertEquals(subtypeNameLTE, networkInfo.getSubtypeName())
assertEquals(legacyExtraInfo, config.getLegacyExtraInfo())
}
@Test
fun testSetLegacySubtypeInNetworkAgent() {
val subtypeLTE = TelephonyManager.NETWORK_TYPE_LTE
val subtypeUMTS = TelephonyManager.NETWORK_TYPE_UMTS
val subtypeNameLTE = "LTE"
val subtypeNameUMTS = "UMTS"
val config = NetworkAgentConfig.Builder()
.setLegacySubType(subtypeLTE)
.setLegacySubTypeName(subtypeNameLTE).build()
val (agent, callback) = createConnectedNetworkAgent(initialConfig = config)
callback.expectAvailableThenValidatedCallbacks(agent.network)
agent.setLegacySubtype(subtypeUMTS, subtypeNameUMTS)
// There is no callback when networkInfo changes,
// so use the NetworkCapabilities callback to ensure
// that networkInfo is ready for verification.
val nc = NetworkCapabilities(agent.nc)
nc.addCapability(NET_CAPABILITY_NOT_METERED)
agent.sendNetworkCapabilities(nc)
callback.expectCapabilitiesThat(agent.network) {
it.hasCapability(NET_CAPABILITY_NOT_METERED)
}
val networkInfo = mCM.getNetworkInfo(agent.network)
assertEquals(subtypeUMTS, networkInfo.getSubtype())
assertEquals(subtypeNameUMTS, networkInfo.getSubtypeName())
}
@Test
fun testConnectAndUnregister() {
val (agent, callback) = createConnectedNetworkAgent()