Merge "Add CTS test for NetworkRequest.getCapabilities API" into sc-dev

This commit is contained in:
Frank Li
2021-06-18 01:37:20 +00:00
committed by Android (Google) Code Review

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.assertNotEquals;
@@ -456,6 +457,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());