From a34e045610aed8983652b982fd642709aef0e405 Mon Sep 17 00:00:00 2001 From: Chiachang Wang Date: Thu, 16 Nov 2023 09:40:24 +0000 Subject: [PATCH] Update test as the parameters are removed from production code Bug: 161776767 Test: atest FrameworksNetTests Change-Id: Id2cef626c5893a4ff29161c801e497b7de551136 --- .../com/android/server/ConnectivityServiceTest.java | 7 +++---- .../java/com/android/server/connectivity/VpnTest.java | 11 +---------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/tests/unit/java/com/android/server/ConnectivityServiceTest.java b/tests/unit/java/com/android/server/ConnectivityServiceTest.java index b8cf08e609..fff9a30b31 100755 --- a/tests/unit/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/unit/java/com/android/server/ConnectivityServiceTest.java @@ -1659,8 +1659,7 @@ public class ConnectivityServiceTest { waitForIdle(); } - public void startLegacyVpnPrivileged(VpnProfile profile, - @Nullable Network underlying, @NonNull LinkProperties egress) { + public void startLegacyVpnPrivileged(VpnProfile profile) { switch (profile.type) { case VpnProfile.TYPE_IKEV2_IPSEC_RSA: case VpnProfile.TYPE_IKEV2_IPSEC_USER_PASS: @@ -10252,7 +10251,7 @@ public class ConnectivityServiceTest { b.expectBroadcast(); // Simulate LockdownVpnTracker attempting to start the VPN since it received the // systemDefault callback. - mMockVpn.startLegacyVpnPrivileged(profile, mCellAgent.getNetwork(), cellLp); + mMockVpn.startLegacyVpnPrivileged(profile); if (expectSetVpnDefaultForUids) { // setVpnDefaultForUids() releases the original network request and creates a VPN // request so LOST callback is received. @@ -10323,7 +10322,7 @@ public class ConnectivityServiceTest { // callback with different network. final ExpectedBroadcast b6 = expectConnectivityAction(TYPE_VPN, DetailedState.DISCONNECTED); mMockVpn.stopVpnRunnerPrivileged(); - mMockVpn.startLegacyVpnPrivileged(profile, mWiFiAgent.getNetwork(), wifiLp); + mMockVpn.startLegacyVpnPrivileged(profile); // VPN network is disconnected (to restart) callback.expect(LOST, mMockVpn); defaultCallback.expect(LOST, mMockVpn); diff --git a/tests/unit/java/com/android/server/connectivity/VpnTest.java b/tests/unit/java/com/android/server/connectivity/VpnTest.java index ef8898490d..931b696018 100644 --- a/tests/unit/java/com/android/server/connectivity/VpnTest.java +++ b/tests/unit/java/com/android/server/connectivity/VpnTest.java @@ -2039,16 +2039,7 @@ public class VpnTest extends VpnTestBase { private Vpn startLegacyVpn(final Vpn vpn, final VpnProfile vpnProfile) throws Exception { setMockedUsers(PRIMARY_USER); - - // Dummy egress interface - final LinkProperties lp = new LinkProperties(); - lp.setInterfaceName(EGRESS_IFACE); - - final RouteInfo defaultRoute = new RouteInfo(new IpPrefix(Inet4Address.ANY, 0), - InetAddresses.parseNumericAddress("192.0.2.0"), EGRESS_IFACE); - lp.addRoute(defaultRoute); - - vpn.startLegacyVpn(vpnProfile, EGRESS_NETWORK, lp); + vpn.startLegacyVpn(vpnProfile); return vpn; }