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

Use the new NetworkStackConnector constructor

Browse Source 
The constructor was changed to allow for unit tests.

Bug: 137328719
Test: atest FrameworksNetIntegrationTests
Change-Id: I46f247268310e12d420531745a22e93cf3550e89
This commit is contained in:
Remi NGUYEN VAN
2020-04-28 15:50:38 +09:00
parent c44ca579ad
commit a065d07edf
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/net/integration/src/com/android/server/net/integrationtests/TestNetworkStackService.kt
View File

@@ -52,7 +52,7 @@ class TestNetworkStackService : Service() {
doReturn(mock(IBinder::class.java)).`when`(it).getSystemService(Context.NETD_SERVICE) doReturn(mock(IBinder::class.java)).`when`(it).getSystemService(Context.NETD_SERVICE)
} }
private class TestPermissionChecker : NetworkStackConnector.PermissionChecker() { private class TestPermissionChecker : NetworkStackService.PermissionChecker() {
override fun enforceNetworkStackCallingPermission() = Unit override fun enforceNetworkStackCallingPermission() = Unit
} }
@@ -62,8 +62,8 @@ class TestNetworkStackService : Service() {
override fun sendNetworkConditionsBroadcast(context: Context, broadcast: Intent) = Unit override fun sendNetworkConditionsBroadcast(context: Context, broadcast: Intent) = Unit
} }
private inner class TestNetworkStackConnector(context: Context) : private inner class TestNetworkStackConnector(context: Context) : NetworkStackConnector(
NetworkStackConnector(context, TestPermissionChecker()) { context, TestPermissionChecker(), NetworkStackService.Dependencies()) {
private val network = Network(TEST_NETID) private val network = Network(TEST_NETID)
private val privateDnsBypassNetwork = TestNetwork(TEST_NETID) private val privateDnsBypassNetwork = TestNetwork(TEST_NETID)