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

Clean up permission usage in EthernetManagerTest

Browse source 
Wrap all functions that require adapting shell permissions in a private
helper function.

Test: atest CtsNetTestCases:EthernetManagerTest
Change-Id: Ic2df53f184bd0f83767d6dff3c47a53b0b7442e2
This commit is contained in:
Patrick Rohr 2022-04-08 15:48:41 +02:00
commit 284888ea6a
1 changed files with 22 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -121,18 +121,14 @@ class EthernetManagerTest {
val executor = HandlerExecutor(Handler(Looper.getMainLooper()))
// If an interface exists when the callback is registered, it is reported on registration.
val iface = runAsShell(MANAGE_TEST_NETWORKS) {
createInterface()
}
val iface = createInterface()
val listener = EthernetStateListener()
addInterfaceStateListener(executor, listener)
listener.expectCallback(iface, STATE_LINK_UP, ROLE_CLIENT)
// If an interface appears, existing callbacks see it.
// TODO: fix the up/up/down/up callbacks and only send down/up.
val iface2 = runAsShell(MANAGE_TEST_NETWORKS) {
createInterface()
}
val iface2 = createInterface()
listener.expectCallback(iface2, STATE_LINK_UP, ROLE_CLIENT)
listener.expectCallback(iface2, STATE_LINK_UP, ROLE_CLIENT)
listener.expectCallback(iface2, STATE_LINK_DOWN, ROLE_CLIENT)
@ -151,21 +147,17 @@ class EthernetManagerTest {
@Before
fun setUp() {
runAsShell(MANAGE_TEST_NETWORKS, NETWORK_SETTINGS) {
em.setIncludeTestInterfaces(true)
}
setIncludeTestInterfaces(true)
}
@After
fun tearDown() {
runAsShell(MANAGE_TEST_NETWORKS, NETWORK_SETTINGS) {
em.setIncludeTestInterfaces(false)
for (iface in createdIfaces) {
if (iface.fileDescriptor.fileDescriptor.valid()) iface.fileDescriptor.close()
}
for (listener in addedListeners) {
em.removeInterfaceStateListener(listener)
}
setIncludeTestInterfaces(false)
for (iface in createdIfaces) {
if (iface.fileDescriptor.fileDescriptor.valid()) iface.fileDescriptor.close()
}
for (listener in addedListeners) {
em.removeInterfaceStateListener(listener)
}
}
@ -175,8 +167,16 @@ class EthernetManagerTest {
}
private fun createInterface(): TestNetworkInterface {
val tnm = context.getSystemService(TestNetworkManager::class.java)
return tnm.createTapInterface(false /* bringUp */).also { createdIfaces.add(it) }
return runAsShell(MANAGE_TEST_NETWORKS) {
val tnm = context.getSystemService(TestNetworkManager::class.java)
tnm.createTapInterface(false /* bringUp */).also { createdIfaces.add(it) }
}
}
private fun setIncludeTestInterfaces(value: Boolean) {
runAsShell(NETWORK_SETTINGS) {
em.setIncludeTestInterfaces(value)
}
}
private fun removeInterface(iface: TestNetworkInterface) {
@ -184,8 +184,9 @@ class EthernetManagerTest {
createdIfaces.remove(iface)
}
private fun doTestGetInterfaceList() {
em.setIncludeTestInterfaces(true)
@Test
public fun testGetInterfaceList() {
setIncludeTestInterfaces(true)
// Create two test interfaces and check the return list contains the interface names.
val iface1 = createInterface()
@ -204,11 +205,4 @@ class EthernetManagerTest {
removeInterface(iface2)
}
@Test
public fun testGetInterfaceList() {
runAsShell(MANAGE_TEST_NETWORKS, NETWORK_SETTINGS) {
doTestGetInterfaceList()
}
}
}