Update tests for new isValidationRequired args
Bug: 253989196 Test: atest NetworkMonitorTest Change-Id: I70633d748cc09a7f695cdc2b4c835d5bf187ec3d
This commit is contained in:
@@ -2944,7 +2944,8 @@ public class ConnectivityServiceTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testRequiresValidation() {
|
public void testRequiresValidation() {
|
||||||
assertTrue(NetworkMonitorUtils.isValidationRequired(false /* isVpnValidationRequired */,
|
assertTrue(NetworkMonitorUtils.isValidationRequired(false /* isDunValidationRequired */,
|
||||||
|
false /* isVpnValidationRequired */,
|
||||||
mCm.getDefaultRequest().networkCapabilities));
|
mCm.getDefaultRequest().networkCapabilities));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -8212,6 +8213,7 @@ public class ConnectivityServiceTest {
|
|||||||
// VPN networks do not satisfy the default request and are automatically validated
|
// VPN networks do not satisfy the default request and are automatically validated
|
||||||
// by NetworkMonitor
|
// by NetworkMonitor
|
||||||
assertFalse(NetworkMonitorUtils.isValidationRequired(
|
assertFalse(NetworkMonitorUtils.isValidationRequired(
|
||||||
|
false /* isDunValidationRequired */,
|
||||||
NetworkAgentConfigShimImpl.newInstance(mMockVpn.getNetworkAgentConfig())
|
NetworkAgentConfigShimImpl.newInstance(mMockVpn.getNetworkAgentConfig())
|
||||||
.isVpnValidationRequired(),
|
.isVpnValidationRequired(),
|
||||||
mMockVpn.getAgent().getNetworkCapabilities()));
|
mMockVpn.getAgent().getNetworkCapabilities()));
|
||||||
@@ -8364,6 +8366,7 @@ public class ConnectivityServiceTest {
|
|||||||
assertTrue(nc.hasCapability(NET_CAPABILITY_INTERNET));
|
assertTrue(nc.hasCapability(NET_CAPABILITY_INTERNET));
|
||||||
|
|
||||||
assertFalse(NetworkMonitorUtils.isValidationRequired(
|
assertFalse(NetworkMonitorUtils.isValidationRequired(
|
||||||
|
false /* isDunValidationRequired */,
|
||||||
NetworkAgentConfigShimImpl.newInstance(mMockVpn.getNetworkAgentConfig())
|
NetworkAgentConfigShimImpl.newInstance(mMockVpn.getNetworkAgentConfig())
|
||||||
.isVpnValidationRequired(),
|
.isVpnValidationRequired(),
|
||||||
mMockVpn.getAgent().getNetworkCapabilities()));
|
mMockVpn.getAgent().getNetworkCapabilities()));
|
||||||
|
|||||||
Reference in New Issue
Block a user