Merge "Add CTS test for NetworkRequest.getCapabilities API" am: ae5bd10a09

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

Change-Id: Id6b9f05c83fe84acae4b72fa54aeb1957853a534
This commit is contained in:
Frank Li
2021-06-04 09:50:32 +00:00
committed by Automerger Merge Worker

View File

@@ -30,6 +30,7 @@ import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
import static junit.framework.Assert.fail;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
@@ -418,6 +419,21 @@ public class NetworkRequestTest {
}
}
@Test @IgnoreUpTo(Build.VERSION_CODES.R)
public void testGetCapabilities() {
final int[] netCapabilities = new int[] {
NET_CAPABILITY_INTERNET,
NET_CAPABILITY_NOT_ROAMING };
final NetworkCapabilities.Builder builder = NetworkCapabilities.Builder
.withoutDefaultCapabilities();
for (int capability : netCapabilities) builder.addCapability(capability);
final NetworkRequest nr = new NetworkRequest.Builder()
.clearCapabilities()
.setCapabilities(builder.build())
.build();
assertArrayEquals(netCapabilities, nr.getCapabilities());
}
@Test
public void testBuildRequestFromExistingRequestWithBuilder() {
assumeTrue(TestUtils.shouldTestSApis());