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

Merge "Add a method to help mocking registerNetworkAgent" into main am: 13a5d4b36e

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

Change-Id: I234ac8bf938052ba1a1c5fc1d9734657b7b08481
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2025-03-14 01:47:52 -07:00 • committed by Automerger Merge Worker
commit 684e8d273d
2 changed files with 30 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

16
framework/src/android/net/ConnectivityManager.java
View file

@ -1242,6 +1242,22 @@ public class ConnectivityManager {
@ConnectivityManagerFeature
private Long mEnabledConnectivityManagerFeatures = null;
/**
* A class to help with mocking ConnectivityManager.
* @hide
*/
public static class MockHelpers {
/**
* Produce an instance of the class returned by
* {@link ConnectivityManager#registerNetworkAgent}
* @hide
*/
public static Network registerNetworkAgentResult(
@Nullable final Network network, @Nullable final INetworkAgentRegistry registry) {
return network;
}
}
private TetheringManager getTetheringManager() {
synchronized (mTetheringEventCallbacks) {
if (mTetheringManager == null) {

14
tests/cts/net/src/android/net/cts/NetworkAgentTest.kt
View file

@ -172,6 +172,7 @@ import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import org.mockito.ArgumentMatchers.any
import org.mockito.ArgumentMatchers.anyInt
import org.mockito.ArgumentMatchers.argThat
import org.mockito.ArgumentMatchers.eq
import org.mockito.Mockito.doReturn
@ -1066,7 +1067,20 @@ class NetworkAgentTest {
fun testAgentStartsInConnecting() {
val mockContext = mock(Context::class.java)
val mockCm = mock(ConnectivityManager::class.java)
val mockedResult = ConnectivityManager.MockHelpers.registerNetworkAgentResult(
mock(Network::class.java),
mock(INetworkAgentRegistry::class.java)
)
doReturn(mockCm).`when`(mockContext).getSystemService(Context.CONNECTIVITY_SERVICE)
doReturn(mockedResult).`when`(mockCm).registerNetworkAgent(
any(),
any(),
any(),
any(),
any(),
any(),
anyInt()
)
val agent = createNetworkAgent(mockContext)
agent.register()
verify(mockCm).registerNetworkAgent(