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

Merge "Add a CTS test for NetworkAgent#setUnderlyingNetworks." am: 7d04b2a26c am: 6bd26a9f30

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1511114

Change-Id: Idee14f317424fe991d67f5c1e7a51a63dc3ba82d
This commit is contained in:
Lorenzo Colitti
2020-11-28 04:09:07 +00:00
committed by Automerger Merge Worker
parent 57f9551d85 6bd26a9f30
commit b8a7b65506
1 changed files with 62 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,6 +82,7 @@ import org.mockito.Mockito.mock
import org.mockito.Mockito.verify
import java.net.InetAddress
import java.time.Duration
import java.util.Arrays
import java.util.UUID
import kotlin.test.assertEquals
import kotlin.test.assertFailsWith
@@ -312,9 +313,11 @@ class NetworkAgentTest {
private fun createNetworkAgent(
context: Context = realContext,
name: String? = null
name: String? = null,
nc: NetworkCapabilities = NetworkCapabilities(),
lp: LinkProperties = LinkProperties()
): TestableNetworkAgent {
val nc = NetworkCapabilities().apply {
nc.apply {
addTransportType(NetworkCapabilities.TRANSPORT_TEST)
removeCapability(NetworkCapabilities.NET_CAPABILITY_TRUSTED)
removeCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
@@ -325,7 +328,7 @@ class NetworkAgentTest {
setNetworkSpecifier(StringNetworkSpecifier(name))
}
}
val lp = LinkProperties().apply {
lp.apply {
addLinkAddress(LinkAddress(LOCAL_IPV4_ADDRESS, 0))
}
val config = NetworkAgentConfig.Builder().build()
@@ -541,8 +544,63 @@ class NetworkAgentTest {
// tearDown() will unregister the requests and agents
}
private fun hasAllTransports(nc: NetworkCapabilities?, transports: IntArray) =
nc != null && transports.all { nc.hasTransport(it) }
@Test
@IgnoreUpTo(android.os.Build.VERSION_CODES.R)
@IgnoreUpTo(Build.VERSION_CODES.R)
fun testSetUnderlyingNetworks() {
val request = NetworkRequest.Builder()
.addTransportType(NetworkCapabilities.TRANSPORT_TEST)
.addTransportType(NetworkCapabilities.TRANSPORT_VPN)
.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)
.removeCapability(NetworkCapabilities.NET_CAPABILITY_TRUSTED) // TODO: add to VPN!
.build()
val callback = TestableNetworkCallback()
mCM.registerNetworkCallback(request, callback)
val nc = NetworkCapabilities().apply {
addTransportType(NetworkCapabilities.TRANSPORT_TEST)
addTransportType(NetworkCapabilities.TRANSPORT_VPN)
removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)
}
val defaultNetwork = mCM.activeNetwork
assertNotNull(defaultNetwork)
val defaultNetworkTransports = mCM.getNetworkCapabilities(defaultNetwork).transportTypes
val agent = createNetworkAgent(nc = nc)
agent.register()
agent.markConnected()
callback.expectAvailableThenValidatedCallbacks(agent.network!!)
var vpnNc = mCM.getNetworkCapabilities(agent.network)
assertNotNull(vpnNc)
assertTrue(NetworkCapabilities.TRANSPORT_VPN in vpnNc.transportTypes)
assertTrue(hasAllTransports(vpnNc, defaultNetworkTransports),
"VPN transports ${Arrays.toString(vpnNc.transportTypes)}" +
" lacking transports from ${Arrays.toString(defaultNetworkTransports)}")
agent.setUnderlyingNetworks(listOf<Network>())
callback.expectCapabilitiesThat(agent.network!!) {
it.transportTypes.size == 1 && it.hasTransport(NetworkCapabilities.TRANSPORT_VPN)
}
val expectedTransports = (defaultNetworkTransports.toSet() +
NetworkCapabilities.TRANSPORT_VPN).toIntArray()
agent.setUnderlyingNetworks(null)
callback.expectCapabilitiesThat(agent.network!!) {
it.transportTypes.size == expectedTransports.size &&
hasAllTransports(it, expectedTransports)
}
agent.unregister()
callback.expectCallback<Lost>(agent.network)
mCM.unregisterNetworkCallback(callback)
}
@Test
@IgnoreUpTo(Build.VERSION_CODES.R)
fun testAgentStartsInConnecting() {
val mockContext = mock(Context::class.java)
val mockCm = mock(ConnectivityManager::class.java)