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

Merge "[VCN21.1] Verify capability is not added if specifier is present" am: 20d9f4722e

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

Change-Id: Iae49fd663e9b90e935b9065ef60561f2b4c55439
This commit is contained in:
Treehugger Robot
2021-05-18 09:36:16 +00:00
committed by Automerger Merge Worker
parent c59d6fa12d 20d9f4722e
commit 82e910ecc5
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tests/cts/net/src/android/net/cts/NetworkRequestTest.java
View File

@@ -327,7 +327,7 @@ public class NetworkRequestTest {
// TODO: 1. Refactor test cases with helper method. // TODO: 1. Refactor test cases with helper method.
// 2. Test capability that does not yet exist. // 2. Test capability that does not yet exist.
@Test @IgnoreUpTo(Build.VERSION_CODES.R) @Test @IgnoreUpTo(Build.VERSION_CODES.R)
public void testBypassingVcnForNonInternetRequest() { public void testBypassingVcn() {
// Make an empty request. Verify the NOT_VCN_MANAGED is added. // Make an empty request. Verify the NOT_VCN_MANAGED is added.
final NetworkRequest emptyRequest = new NetworkRequest.Builder().build(); final NetworkRequest emptyRequest = new NetworkRequest.Builder().build();
assertTrue(emptyRequest.hasCapability(ConstantsShim.NET_CAPABILITY_NOT_VCN_MANAGED)); assertTrue(emptyRequest.hasCapability(ConstantsShim.NET_CAPABILITY_NOT_VCN_MANAGED));
@@ -360,12 +360,12 @@ public class NetworkRequestTest {
.addCapability(NET_CAPABILITY_NOT_ROAMING).build(); .addCapability(NET_CAPABILITY_NOT_ROAMING).build();
assertTrue(notRoamRequest.hasCapability(ConstantsShim.NET_CAPABILITY_NOT_VCN_MANAGED)); assertTrue(notRoamRequest.hasCapability(ConstantsShim.NET_CAPABILITY_NOT_VCN_MANAGED));
// Make a internet request. Verify the NOT_VCN_MANAGED is added. // Make an internet request. Verify the NOT_VCN_MANAGED is added.
final NetworkRequest internetRequest = new NetworkRequest.Builder() final NetworkRequest internetRequest = new NetworkRequest.Builder()
.addCapability(NET_CAPABILITY_INTERNET).build(); .addCapability(NET_CAPABILITY_INTERNET).build();
assertTrue(internetRequest.hasCapability(ConstantsShim.NET_CAPABILITY_NOT_VCN_MANAGED)); assertTrue(internetRequest.hasCapability(ConstantsShim.NET_CAPABILITY_NOT_VCN_MANAGED));
// Make a internet request which explicitly removed NOT_VCN_MANAGED. // Make an internet request which explicitly removed NOT_VCN_MANAGED.
// Verify the NOT_VCN_MANAGED is removed. // Verify the NOT_VCN_MANAGED is removed.
final NetworkRequest internetRemoveNotVcnRequest = new NetworkRequest.Builder() final NetworkRequest internetRemoveNotVcnRequest = new NetworkRequest.Builder()
.addCapability(NET_CAPABILITY_INTERNET) .addCapability(NET_CAPABILITY_INTERNET)
@@ -398,6 +398,14 @@ public class NetworkRequestTest {
final NetworkRequest dunRequest = new NetworkRequest.Builder() final NetworkRequest dunRequest = new NetworkRequest.Builder()
.addCapability(NET_CAPABILITY_DUN).build(); .addCapability(NET_CAPABILITY_DUN).build();
assertTrue(dunRequest.hasCapability(ConstantsShim.NET_CAPABILITY_NOT_VCN_MANAGED)); assertTrue(dunRequest.hasCapability(ConstantsShim.NET_CAPABILITY_NOT_VCN_MANAGED));
// Make an internet request but with NetworkSpecifier. Verify the NOT_VCN_MANAGED is not
// added.
final NetworkRequest internetWithSpecifierRequest = new NetworkRequest.Builder()
.addTransportType(TRANSPORT_WIFI).addCapability(NET_CAPABILITY_INTERNET)
.setNetworkSpecifier(makeTestWifiSpecifier()).build();
assertFalse(internetWithSpecifierRequest.hasCapability(
ConstantsShim.NET_CAPABILITY_NOT_VCN_MANAGED));
} }
private void verifyEqualRequestBuilt(NetworkRequest orig) { private void verifyEqualRequestBuilt(NetworkRequest orig) {
@@ -424,17 +432,20 @@ public class NetworkRequestTest {
.setSignalStrength(-99).build(); .setSignalStrength(-99).build();
verifyEqualRequestBuilt(requestCellMms); verifyEqualRequestBuilt(requestCellMms);
final WifiNetworkSpecifier specifier = new WifiNetworkSpecifier.Builder()
.setSsidPattern(new PatternMatcher(TEST_SSID, PatternMatcher.PATTERN_LITERAL))
.setBssidPattern(ARBITRARY_ADDRESS, ARBITRARY_ADDRESS)
.build();
final NetworkRequest requestWifi = builder final NetworkRequest requestWifi = builder
.addTransportType(TRANSPORT_WIFI) .addTransportType(TRANSPORT_WIFI)
.removeTransportType(TRANSPORT_CELLULAR) .removeTransportType(TRANSPORT_CELLULAR)
.addCapability(NET_CAPABILITY_INTERNET) .addCapability(NET_CAPABILITY_INTERNET)
.removeCapability(NET_CAPABILITY_MMS) .removeCapability(NET_CAPABILITY_MMS)
.setNetworkSpecifier(specifier) .setNetworkSpecifier(makeTestWifiSpecifier())
.setSignalStrength(-33).build(); .setSignalStrength(-33).build();
verifyEqualRequestBuilt(requestWifi); verifyEqualRequestBuilt(requestWifi);
} }
private WifiNetworkSpecifier makeTestWifiSpecifier() {
return new WifiNetworkSpecifier.Builder()
.setSsidPattern(new PatternMatcher(TEST_SSID, PatternMatcher.PATTERN_LITERAL))
.setBssidPattern(ARBITRARY_ADDRESS, ARBITRARY_ADDRESS)
.build();
}
} }