joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix NetworkCapabilitiesTest on S

Browse source 
Mark NetworkCapabilitiesTest as ConnectivityModuleTest so that it is
only run in MTS with the Connectivity module installed, and fix
parceling tests to use the right number of fields in that case.

NetworkCapabilitiesTest is only useful to test the Connectivity module,
and not other modules like NetworkStack, as it is a unit test of a class
in the Connectivity module.

Bug: 205901761
Test: atest NetworkCapabilitiesTest
Change-Id: I10ba0f866bc7a39b2c90bdde12a79feefea2d5ee
This commit is contained in:
Remi NGUYEN VAN 2021-11-11 10:00:14 +09:00
commit daa03defee
1 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
tests/common/java/android/net/NetworkCapabilitiesTest.java
View file

@ -92,6 +92,7 @@ import java.util.Set;
@RunWith(AndroidJUnit4.class)
@SmallTest
@ConnectivityModuleTest
public class NetworkCapabilitiesTest {
private static final String TEST_SSID = "TEST_SSID";
private static final String DIFFERENT_TEST_SSID = "DIFFERENT_TEST_SSID";
@ -345,10 +346,16 @@ public class NetworkCapabilitiesTest {
}
private void testParcelSane(NetworkCapabilities cap) {
if (isAtLeastT()) {
// This test can be run as unit test against the latest system image, as CTS to verify
// an Android release that is as recent as the test, or as MTS to verify the
// Connectivity module. In the first two cases NetworkCapabilities will be as recent
// as the test. In the last case, starting from S NetworkCapabilities is updated as part
// of Connectivity, so it is also as recent as the test. For MTS on Q and R,
// NetworkCapabilities is not updatable, so it may have a different number of fields.
if (isAtLeastS()) {
// When this test is run on S+, NetworkCapabilities is as recent as the test,
// so this should be the most recent known number of fields.
assertParcelSane(cap, 17);
} else if (isAtLeastS()) {
assertParcelSane(cap, 16);
} else if (isAtLeastR()) {
assertParcelSane(cap, 15);
} else {
@ -1226,12 +1233,12 @@ public class NetworkCapabilitiesTest {
assertEquals(0, nc.getCapabilities().length);
}
@Test @IgnoreUpTo(Build.VERSION_CODES.R) @ConnectivityModuleTest
@Test @IgnoreUpTo(Build.VERSION_CODES.R)
public void testRestrictCapabilitiesForTestNetworkByNotOwnerWithNonRestrictedNc() {
testRestrictCapabilitiesForTestNetworkWithNonRestrictedNc(false /* isOwner */);
}
@Test @IgnoreUpTo(Build.VERSION_CODES.R) @ConnectivityModuleTest
@Test @IgnoreUpTo(Build.VERSION_CODES.R)
public void testRestrictCapabilitiesForTestNetworkByOwnerWithNonRestrictedNc() {
testRestrictCapabilitiesForTestNetworkWithNonRestrictedNc(true /* isOwner */);
}
@ -1276,12 +1283,12 @@ public class NetworkCapabilitiesTest {
assertEquals(expectedNcBuilder.build(), nonRestrictedNc);
}
@Test @IgnoreUpTo(Build.VERSION_CODES.R) @ConnectivityModuleTest
@Test @IgnoreUpTo(Build.VERSION_CODES.R)
public void testRestrictCapabilitiesForTestNetworkByNotOwnerWithRestrictedNc() {
testRestrictCapabilitiesForTestNetworkWithRestrictedNc(false /* isOwner */);
}
@Test @IgnoreUpTo(Build.VERSION_CODES.R) @ConnectivityModuleTest
@Test @IgnoreUpTo(Build.VERSION_CODES.R)
public void testRestrictCapabilitiesForTestNetworkByOwnerWithRestrictedNc() {
testRestrictCapabilitiesForTestNetworkWithRestrictedNc(true /* isOwner */);
}