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

Merge "Test extra info sent to NetworkMonitor" am: 9792742ee0

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331060

Change-Id: If48de0d3fe326d72170b13ec6a9477dfc8dc48ff
This commit is contained in:
Chiachang Wang
2020-06-16 00:52:01 +00:00
committed by Automerger Merge Worker
parent bab1782868 9792742ee0
commit 26cd395a9e
1 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -100,6 +100,7 @@ import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.ArgumentMatchers.startsWith; import static org.mockito.ArgumentMatchers.startsWith;
import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.any; import static org.mockito.Mockito.any;
@@ -164,6 +165,8 @@ import android.net.LinkAddress;
import android.net.LinkProperties; import android.net.LinkProperties;
import android.net.MatchAllNetworkSpecifier; import android.net.MatchAllNetworkSpecifier;
import android.net.Network; import android.net.Network;
import android.net.NetworkAgent;
import android.net.NetworkAgentConfig;
import android.net.NetworkCapabilities; import android.net.NetworkCapabilities;
import android.net.NetworkFactory; import android.net.NetworkFactory;
import android.net.NetworkInfo; import android.net.NetworkInfo;
@@ -6808,6 +6811,30 @@ public class ConnectivityServiceTest {
assertEquals(wifiLp, mService.getActiveLinkProperties()); assertEquals(wifiLp, mService.getActiveLinkProperties());
} }
@Test
public void testLegacyExtraInfoSentToNetworkMonitor() throws Exception {
class TestNetworkAgent extends NetworkAgent {
TestNetworkAgent(Context context, Looper looper, NetworkAgentConfig config) {
super(context, looper, "MockAgent", new NetworkCapabilities(),
new LinkProperties(), 40 , config, null /* provider */);
}
}
final NetworkAgent naNoExtraInfo = new TestNetworkAgent(
mServiceContext, mCsHandlerThread.getLooper(), new NetworkAgentConfig());
naNoExtraInfo.register();
verify(mNetworkStack).makeNetworkMonitor(any(), isNull(String.class), any());
naNoExtraInfo.unregister();
reset(mNetworkStack);
final NetworkAgentConfig config =
new NetworkAgentConfig.Builder().setLegacyExtraInfo("legacyinfo").build();
final NetworkAgent naExtraInfo = new TestNetworkAgent(
mServiceContext, mCsHandlerThread.getLooper(), config);
naExtraInfo.register();
verify(mNetworkStack).makeNetworkMonitor(any(), eq("legacyinfo"), any());
naExtraInfo.unregister();
}
private void setupLocationPermissions( private void setupLocationPermissions(
int targetSdk, boolean locationToggle, String op, String perm) throws Exception { int targetSdk, boolean locationToggle, String op, String perm) throws Exception {
final ApplicationInfo applicationInfo = new ApplicationInfo(); final ApplicationInfo applicationInfo = new ApplicationInfo();