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

Merge "Expose the netd mock in CSTest to allow verifying calls on it" into main

Browse Source
This commit is contained in:
Jean Chalard
2023-10-10 04:17:29 +00:00
committed by Gerrit Code Review
parent e339c6b780 ff7edd36eb
commit 4dec273ab4
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/unit/java/com/android/server/connectivityservice/base/CSTest.kt
View File

@@ -127,6 +127,7 @@ open class CSTest {
val packageManager = makeMockPackageManager() val packageManager = makeMockPackageManager()
val connResources = makeMockConnResources(sysResources, packageManager) val connResources = makeMockConnResources(sysResources, packageManager)
val netd = mock<INetd>()
val bpfNetMaps = mock<BpfNetMaps>() val bpfNetMaps = mock<BpfNetMaps>()
val clatCoordinator = mock<ClatCoordinator>() val clatCoordinator = mock<ClatCoordinator>()
val proxyTracker = ProxyTracker(context, mock<Handler>(), 16 /* EVENT_PROXY_HAS_CHANGED */) val proxyTracker = ProxyTracker(context, mock<Handler>(), 16 /* EVENT_PROXY_HAS_CHANGED */)
@@ -138,7 +139,7 @@ open class CSTest {
} }
val deps = CSDeps() val deps = CSDeps()
val service = makeConnectivityService(context, deps).also { it.systemReadyInternal() } val service = makeConnectivityService(context, netd, deps).also { it.systemReadyInternal() }
val cm = ConnectivityManager(context, service) val cm = ConnectivityManager(context, service)
val csHandler = Handler(csHandlerThread.looper) val csHandler = Handler(csHandlerThread.looper)

5
tests/unit/java/com/android/server/connectivityservice/base/CSTestHelpers.kt
View File

@@ -145,11 +145,12 @@ internal fun initMockedResources(res: Resources) {
private val TEST_LINGER_DELAY_MS = 400 private val TEST_LINGER_DELAY_MS = 400
private val TEST_NASCENT_DELAY_MS = 300 private val TEST_NASCENT_DELAY_MS = 300
internal fun makeConnectivityService(context: Context, deps: Dependencies) = ConnectivityService( internal fun makeConnectivityService(context: Context, netd: INetd, deps: Dependencies) =
ConnectivityService(
context, context,
mock<IDnsResolver>(), mock<IDnsResolver>(),
mock<IpConnectivityLog>(), mock<IpConnectivityLog>(),
mock<INetd>(), netd,
deps).also { deps).also {
it.mLingerDelayMs = TEST_LINGER_DELAY_MS it.mLingerDelayMs = TEST_LINGER_DELAY_MS
it.mNascentDelayMs = TEST_NASCENT_DELAY_MS it.mNascentDelayMs = TEST_NASCENT_DELAY_MS