joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

ethernet: add support for enable/disableInterface in tests

Browse source 
Adds an outcome receiver and wraps the EthernetManager#enableInterface
and EthernetManager#disableInterface APIs.

Test: m -- test only change
Change-Id: I7064edda3ebbdd91e2bf28651fdf85b9a7cf2134
This commit is contained in:
Patrick Rohr 2022-06-16 10:53:42 -07:00
commit 901ff96210
1 changed files with 43 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

43
tests/cts/net/src/android/net/cts/EthernetManagerTest.kt
View file

@ -30,6 +30,7 @@ import android.net.EthernetManager.STATE_LINK_DOWN
import android.net.EthernetManager.STATE_LINK_UP
import android.net.EthernetManager.TetheredInterfaceCallback
import android.net.EthernetManager.TetheredInterfaceRequest
import android.net.EthernetNetworkManagementException
import android.net.EthernetNetworkSpecifier
import android.net.InetAddresses
import android.net.IpConfiguration
@ -45,6 +46,7 @@ import android.net.cts.EthernetManagerTest.EthernetStateListener.CallbackEntry.I
import android.os.Build
import android.os.Handler
import android.os.Looper
import android.os.OutcomeReceiver
import android.os.SystemProperties
import android.platform.test.annotations.AppModeFull
import android.util.ArraySet
@ -227,6 +229,35 @@ class EthernetManagerTest {
}
}
private class EthernetOutcomeReceiver :
OutcomeReceiver<String, EthernetNetworkManagementException> {
private val result = CompletableFuture<String>()
override fun onResult(iface: String) {
result.complete(iface)
}
override fun onError(e: EthernetNetworkManagementException) {
result.completeExceptionally(e)
}
fun expectResult(expected: String) {
assertEquals(expected, result.get(TIMEOUT_MS, TimeUnit.MILLISECONDS))
}
fun expectError() {
// Assert that the future fails with EthernetNetworkManagementException from the
// completeExceptionally() call inside onUnavailable.
assertFailsWith(EthernetNetworkManagementException::class) {
try {
result.get()
} catch (e: ExecutionException) {
throw e.cause!!
}
}
}
}
@Before
fun setUp() {
setIncludeTestInterfaces(true)
@ -311,6 +342,18 @@ class EthernetManagerTest {
registeredCallbacks.remove(cb)
}
private fun disableInterface(iface: EthernetTestInterface) = EthernetOutcomeReceiver().also {
runAsShell(MANAGE_TEST_NETWORKS) {
em.disableInterface(iface.name, handler::post, it)
}
}
private fun enableInterface(iface: EthernetTestInterface) = EthernetOutcomeReceiver().also {
runAsShell(MANAGE_TEST_NETWORKS) {
em.enableInterface(iface.name, handler::post, it)
}
}
// NetworkRequest.Builder does not create a copy of the passed NetworkRequest, so in order to
// keep ETH_REQUEST as it is, a defensive copy is created here.
private fun NetworkRequest.createCopyWithEthernetSpecifier(ifaceName: String) =