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

Merge "Update VpnTest to use VpnNetworkAgentWrapper"

Browse Source
This commit is contained in:
Treehugger Robot
2022-08-02 12:08:13 +00:00
committed by Gerrit Code Review
parent 2719dc8682 bbb586d7f1
commit 7dce599f42
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/unit/java/com/android/server/connectivity/VpnTest.java
View File

@@ -92,7 +92,6 @@ import android.net.LinkAddress;
import android.net.LinkProperties; import android.net.LinkProperties;
import android.net.LocalSocket; import android.net.LocalSocket;
import android.net.Network; import android.net.Network;
import android.net.NetworkAgent;
import android.net.NetworkCapabilities; import android.net.NetworkCapabilities;
import android.net.NetworkInfo.DetailedState; import android.net.NetworkInfo.DetailedState;
import android.net.RouteInfo; import android.net.RouteInfo;
@@ -246,7 +245,7 @@ public class VpnTest extends VpnTestBase {
@Mock private Vpn.SystemServices mSystemServices; @Mock private Vpn.SystemServices mSystemServices;
@Mock private Vpn.IkeSessionWrapper mIkeSessionWrapper; @Mock private Vpn.IkeSessionWrapper mIkeSessionWrapper;
@Mock private Vpn.Ikev2SessionCreator mIkev2SessionCreator; @Mock private Vpn.Ikev2SessionCreator mIkev2SessionCreator;
@Mock private NetworkAgent mMockNetworkAgent; @Mock private Vpn.VpnNetworkAgentWrapper mMockNetworkAgent;
@Mock private ConnectivityManager mConnectivityManager; @Mock private ConnectivityManager mConnectivityManager;
@Mock private IpSecService mIpSecService; @Mock private IpSecService mIpSecService;
@Mock private VpnProfileStore mVpnProfileStore; @Mock private VpnProfileStore mVpnProfileStore;
@@ -870,7 +869,7 @@ public class VpnTest extends VpnTestBase {
public void testRefreshPlatformVpnAppExclusionList_updatesExcludedUids() throws Exception { public void testRefreshPlatformVpnAppExclusionList_updatesExcludedUids() throws Exception {
final Vpn vpn = prepareVpnForVerifyAppExclusionList(); final Vpn vpn = prepareVpnForVerifyAppExclusionList();
vpn.setAppExclusionList(TEST_VPN_PKG, Arrays.asList(PKGS)); vpn.setAppExclusionList(TEST_VPN_PKG, Arrays.asList(PKGS));
verify(mMockNetworkAgent).sendNetworkCapabilities(any()); verify(mMockNetworkAgent).doSendNetworkCapabilities(any());
assertEquals(Arrays.asList(PKGS), vpn.getAppExclusionList(TEST_VPN_PKG)); assertEquals(Arrays.asList(PKGS), vpn.getAppExclusionList(TEST_VPN_PKG));
reset(mMockNetworkAgent); reset(mMockNetworkAgent);
@@ -887,7 +886,7 @@ public class VpnTest extends VpnTestBase {
vpn.mNetworkCapabilities.getUids()); vpn.mNetworkCapabilities.getUids());
ArgumentCaptor<NetworkCapabilities> ncCaptor = ArgumentCaptor<NetworkCapabilities> ncCaptor =
ArgumentCaptor.forClass(NetworkCapabilities.class); ArgumentCaptor.forClass(NetworkCapabilities.class);
verify(mMockNetworkAgent).sendNetworkCapabilities(ncCaptor.capture()); verify(mMockNetworkAgent).doSendNetworkCapabilities(ncCaptor.capture());
assertEquals(makeVpnUidRange(PRIMARY_USER.id, newExcludedUids), assertEquals(makeVpnUidRange(PRIMARY_USER.id, newExcludedUids),
ncCaptor.getValue().getUids()); ncCaptor.getValue().getUids());
@@ -902,7 +901,7 @@ public class VpnTest extends VpnTestBase {
assertEquals(Arrays.asList(PKGS), vpn.getAppExclusionList(TEST_VPN_PKG)); assertEquals(Arrays.asList(PKGS), vpn.getAppExclusionList(TEST_VPN_PKG));
assertEquals(makeVpnUidRange(PRIMARY_USER.id, newExcludedUids), assertEquals(makeVpnUidRange(PRIMARY_USER.id, newExcludedUids),
vpn.mNetworkCapabilities.getUids()); vpn.mNetworkCapabilities.getUids());
verify(mMockNetworkAgent).sendNetworkCapabilities(ncCaptor.capture()); verify(mMockNetworkAgent).doSendNetworkCapabilities(ncCaptor.capture());
assertEquals(makeVpnUidRange(PRIMARY_USER.id, newExcludedUids), assertEquals(makeVpnUidRange(PRIMARY_USER.id, newExcludedUids),
ncCaptor.getValue().getUids()); ncCaptor.getValue().getUids());
} }
@@ -1854,7 +1853,7 @@ public class VpnTest extends VpnTestBase {
Collections.singletonList(TEST_NETWORK_2), Collections.singletonList(TEST_NETWORK_2),
vpnSnapShot.vpn.mNetworkCapabilities.getUnderlyingNetworks()); vpnSnapShot.vpn.mNetworkCapabilities.getUnderlyingNetworks());
verify(mMockNetworkAgent) verify(mMockNetworkAgent)
.setUnderlyingNetworks(Collections.singletonList(TEST_NETWORK_2)); .doSetUnderlyingNetworks(Collections.singletonList(TEST_NETWORK_2));
vpnSnapShot.vpn.mVpnRunner.exitVpnRunner(); vpnSnapShot.vpn.mVpnRunner.exitVpnRunner();
} }
@@ -1896,7 +1895,7 @@ public class VpnTest extends VpnTestBase {
Collections.singletonList(TEST_NETWORK_2), Collections.singletonList(TEST_NETWORK_2),
vpnSnapShot.vpn.mNetworkCapabilities.getUnderlyingNetworks()); vpnSnapShot.vpn.mNetworkCapabilities.getUnderlyingNetworks());
verify(mMockNetworkAgent) verify(mMockNetworkAgent)
.setUnderlyingNetworks(Collections.singletonList(TEST_NETWORK_2)); .doSetUnderlyingNetworks(Collections.singletonList(TEST_NETWORK_2));
vpnSnapShot.vpn.mVpnRunner.exitVpnRunner(); vpnSnapShot.vpn.mVpnRunner.exitVpnRunner();
} }
@@ -1904,7 +1903,7 @@ public class VpnTest extends VpnTestBase {
private void verifyHandlingNetworkLoss() throws Exception { private void verifyHandlingNetworkLoss() throws Exception {
final ArgumentCaptor<LinkProperties> lpCaptor = final ArgumentCaptor<LinkProperties> lpCaptor =
ArgumentCaptor.forClass(LinkProperties.class); ArgumentCaptor.forClass(LinkProperties.class);
verify(mMockNetworkAgent).sendLinkProperties(lpCaptor.capture()); verify(mMockNetworkAgent).doSendLinkProperties(lpCaptor.capture());
final LinkProperties lp = lpCaptor.getValue(); final LinkProperties lp = lpCaptor.getValue();
assertNull(lp.getInterfaceName()); assertNull(lp.getInterfaceName());