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

Merge "Use assumeTrue in VpnTest"

Browse Source
This commit is contained in:
Taras Antoshchuk
2022-01-13 10:03:57 +00:00
committed by Gerrit Code Review
parent 136f2d2d91 c8b0428da5
commit b209f64b3c
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tests/cts/hostside/app/src/com/android/cts/net/hostside/VpnTest.java
View File

@@ -893,7 +893,7 @@ public class VpnTest {
@Test @Test
public void testDefault() throws Exception { public void testDefault() throws Exception {
if (!supportedHardware()) return; assumeTrue(supportedHardware());
if (!SdkLevel.isAtLeastS() && ( if (!SdkLevel.isAtLeastS() && (
SystemProperties.getInt("persist.adb.tcp.port", -1) > -1 SystemProperties.getInt("persist.adb.tcp.port", -1) > -1
|| SystemProperties.getInt("service.adb.tcp.port", -1) > -1)) { || SystemProperties.getInt("service.adb.tcp.port", -1) > -1)) {
@@ -986,7 +986,7 @@ public class VpnTest {
@Test @Test
public void testAppAllowed() throws Exception { public void testAppAllowed() throws Exception {
if (!supportedHardware()) return; assumeTrue(supportedHardware());
FileDescriptor fd = openSocketFdInOtherApp(TEST_HOST, 80, TIMEOUT_MS); FileDescriptor fd = openSocketFdInOtherApp(TEST_HOST, 80, TIMEOUT_MS);
@@ -1007,7 +1007,7 @@ public class VpnTest {
@Test @Test
public void testAppDisallowed() throws Exception { public void testAppDisallowed() throws Exception {
if (!supportedHardware()) return; assumeTrue(supportedHardware());
FileDescriptor localFd = openSocketFd(TEST_HOST, 80, TIMEOUT_MS); FileDescriptor localFd = openSocketFd(TEST_HOST, 80, TIMEOUT_MS);
FileDescriptor remoteFd = openSocketFdInOtherApp(TEST_HOST, 80, TIMEOUT_MS); FileDescriptor remoteFd = openSocketFdInOtherApp(TEST_HOST, 80, TIMEOUT_MS);
@@ -1041,8 +1041,8 @@ public class VpnTest {
@Test @Test
public void testExcludedRoutes() throws Exception { public void testExcludedRoutes() throws Exception {
if (!supportedHardware()) return; assumeTrue(supportedHardware());
if (!SdkLevel.isAtLeastT()) return; assumeTrue(SdkLevel.isAtLeastT());
// Shell app must not be put in here or it would kill the ADB-over-network use case // Shell app must not be put in here or it would kill the ADB-over-network use case
String allowedApps = mRemoteSocketFactoryClient.getPackageName() + "," + mPackageName; String allowedApps = mRemoteSocketFactoryClient.getPackageName() + "," + mPackageName;
@@ -1062,7 +1062,7 @@ public class VpnTest {
@Test @Test
public void testIncludedRoutes() throws Exception { public void testIncludedRoutes() throws Exception {
if (!supportedHardware()) return; assumeTrue(supportedHardware());
// Shell app must not be put in here or it would kill the ADB-over-network use case // Shell app must not be put in here or it would kill the ADB-over-network use case
String allowedApps = mRemoteSocketFactoryClient.getPackageName() + "," + mPackageName; String allowedApps = mRemoteSocketFactoryClient.getPackageName() + "," + mPackageName;
@@ -1081,8 +1081,8 @@ public class VpnTest {
@Test @Test
public void testInterleavedRoutes() throws Exception { public void testInterleavedRoutes() throws Exception {
if (!supportedHardware()) return; assumeTrue(supportedHardware());
if (!SdkLevel.isAtLeastT()) return; assumeTrue(SdkLevel.isAtLeastT());
// Shell app must not be put in here or it would kill the ADB-over-network use case // Shell app must not be put in here or it would kill the ADB-over-network use case
String allowedApps = mRemoteSocketFactoryClient.getPackageName() + "," + mPackageName; String allowedApps = mRemoteSocketFactoryClient.getPackageName() + "," + mPackageName;
@@ -1109,7 +1109,7 @@ public class VpnTest {
@Test @Test
public void testGetConnectionOwnerUidSecurity() throws Exception { public void testGetConnectionOwnerUidSecurity() throws Exception {
if (!supportedHardware()) return; assumeTrue(supportedHardware());
DatagramSocket s; DatagramSocket s;
InetAddress address = InetAddress.getByName("localhost"); InetAddress address = InetAddress.getByName("localhost");
@@ -1131,7 +1131,7 @@ public class VpnTest {
@Test @Test
public void testSetProxy() throws Exception { public void testSetProxy() throws Exception {
if (!supportedHardware()) return; assumeTrue(supportedHardware());
ProxyInfo initialProxy = mCM.getDefaultProxy(); ProxyInfo initialProxy = mCM.getDefaultProxy();
// Receiver for the proxy change broadcast. // Receiver for the proxy change broadcast.
BlockingBroadcastReceiver proxyBroadcastReceiver = new ProxyChangeBroadcastReceiver(); BlockingBroadcastReceiver proxyBroadcastReceiver = new ProxyChangeBroadcastReceiver();
@@ -1171,7 +1171,7 @@ public class VpnTest {
@Test @Test
public void testSetProxyDisallowedApps() throws Exception { public void testSetProxyDisallowedApps() throws Exception {
if (!supportedHardware()) return; assumeTrue(supportedHardware());
ProxyInfo initialProxy = mCM.getDefaultProxy(); ProxyInfo initialProxy = mCM.getDefaultProxy();
String disallowedApps = mPackageName; String disallowedApps = mPackageName;
@@ -1197,7 +1197,7 @@ public class VpnTest {
@Test @Test
public void testNoProxy() throws Exception { public void testNoProxy() throws Exception {
if (!supportedHardware()) return; assumeTrue(supportedHardware());
ProxyInfo initialProxy = mCM.getDefaultProxy(); ProxyInfo initialProxy = mCM.getDefaultProxy();
BlockingBroadcastReceiver proxyBroadcastReceiver = new ProxyChangeBroadcastReceiver(); BlockingBroadcastReceiver proxyBroadcastReceiver = new ProxyChangeBroadcastReceiver();
proxyBroadcastReceiver.register(); proxyBroadcastReceiver.register();
@@ -1232,7 +1232,7 @@ public class VpnTest {
@Test @Test
public void testBindToNetworkWithProxy() throws Exception { public void testBindToNetworkWithProxy() throws Exception {
if (!supportedHardware()) return; assumeTrue(supportedHardware());
String allowedApps = mPackageName; String allowedApps = mPackageName;
Network initialNetwork = mCM.getActiveNetwork(); Network initialNetwork = mCM.getActiveNetwork();
ProxyInfo initialProxy = mCM.getDefaultProxy(); ProxyInfo initialProxy = mCM.getDefaultProxy();
@@ -1474,7 +1474,7 @@ public class VpnTest {
} }
private void maybeExpectVpnTransportInfo(Network network) { private void maybeExpectVpnTransportInfo(Network network) {
if (!SdkLevel.isAtLeastS()) return; assumeTrue(SdkLevel.isAtLeastS());
final NetworkCapabilities vpnNc = mCM.getNetworkCapabilities(network); final NetworkCapabilities vpnNc = mCM.getNetworkCapabilities(network);
assertTrue(vpnNc.hasTransport(TRANSPORT_VPN)); assertTrue(vpnNc.hasTransport(TRANSPORT_VPN));
final TransportInfo ti = vpnNc.getTransportInfo(); final TransportInfo ti = vpnNc.getTransportInfo();
@@ -1526,7 +1526,7 @@ public class VpnTest {
*/ */
@Test @Test
public void testDownloadWithDownloadManagerDisallowed() throws Exception { public void testDownloadWithDownloadManagerDisallowed() throws Exception {
if (!supportedHardware()) return; assumeTrue(supportedHardware());
// Start a VPN with DownloadManager package in disallowed list. // Start a VPN with DownloadManager package in disallowed list.
startVpn(new String[] {"192.0.2.2/32", "2001:db8:1:2::ffe/128"}, startVpn(new String[] {"192.0.2.2/32", "2001:db8:1:2::ffe/128"},