From dc075e33c69741114d3de3499641e11bce3f3cfc Mon Sep 17 00:00:00 2001 From: Junyu Lai Date: Wed, 28 Jun 2023 12:19:18 +0800 Subject: [PATCH] Migrate HostsideNetworkTestCase to use JUnit4 This is no-op refactoring but allows subsequent changes to use modern JUnit4 functionalities such as @BeforeClass annotation. Test: atest HostsideNetworkCallbackTests \ HostsideConnOnActivityStartTest \ HostsideSelfDeclaredNetworkCapabilitiesCheckTest \ HostsideVpnTests HostsideNetworkPolicyManagerTests Bug: 289002798 Change-Id: I503c13ffcb239c4535781ba5d660a3280b7a395b --- .../net/HostsideConnOnActivityStartTest.java | 14 ++- .../cts/net/HostsideNetworkCallbackTests.java | 15 ++- .../HostsideNetworkPolicyManagerTests.java | 18 ++- .../cts/net/HostsideNetworkTestCase.java | 104 +++--------------- ...ostsideRestrictBackgroundNetworkTests.java | 65 ++++++++++- ...fDeclaredNetworkCapabilitiesCheckTest.java | 6 + .../com/android/cts/net/HostsideVpnTests.java | 36 +++++- 7 files changed, 151 insertions(+), 107 deletions(-) diff --git a/tests/cts/hostside/src/com/android/cts/net/HostsideConnOnActivityStartTest.java b/tests/cts/hostside/src/com/android/cts/net/HostsideConnOnActivityStartTest.java index cfd3130a3d..a7d5590ce7 100644 --- a/tests/cts/hostside/src/com/android/cts/net/HostsideConnOnActivityStartTest.java +++ b/tests/cts/hostside/src/com/android/cts/net/HostsideConnOnActivityStartTest.java @@ -18,9 +18,13 @@ package com.android.cts.net; import android.platform.test.annotations.FlakyTest; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + public class HostsideConnOnActivityStartTest extends HostsideNetworkTestCase { private static final String TEST_CLASS = TEST_PKG + ".ConnOnActivityStartTest"; - @Override + @Before public void setUp() throws Exception { super.setUp(); @@ -28,26 +32,30 @@ public class HostsideConnOnActivityStartTest extends HostsideNetworkTestCase { installPackage(TEST_APP2_APK); } - @Override - protected void tearDown() throws Exception { + @After + public void tearDown() throws Exception { super.tearDown(); uninstallPackage(TEST_APP2_PKG, true); } + @Test public void testStartActivity_batterySaver() throws Exception { runDeviceTests(TEST_PKG, TEST_CLASS, "testStartActivity_batterySaver"); } + @Test public void testStartActivity_dataSaver() throws Exception { runDeviceTests(TEST_PKG, TEST_CLASS, "testStartActivity_dataSaver"); } @FlakyTest(bugId = 231440256) + @Test public void testStartActivity_doze() throws Exception { runDeviceTests(TEST_PKG, TEST_CLASS, "testStartActivity_doze"); } + @Test public void testStartActivity_appStandby() throws Exception { runDeviceTests(TEST_PKG, TEST_CLASS, "testStartActivity_appStandby"); } diff --git a/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkCallbackTests.java b/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkCallbackTests.java index 1312085478..5d7ad6229d 100644 --- a/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkCallbackTests.java +++ b/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkCallbackTests.java @@ -14,26 +14,33 @@ * limitations under the License. */ package com.android.cts.net; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + public class HostsideNetworkCallbackTests extends HostsideNetworkTestCase { - @Override - protected void setUp() throws Exception { + @Before + public void setUp() throws Exception { super.setUp(); uninstallPackage(TEST_APP2_PKG, false); installPackage(TEST_APP2_APK); } - @Override - protected void tearDown() throws Exception { + @After + public void tearDown() throws Exception { super.tearDown(); uninstallPackage(TEST_APP2_PKG, true); } + @Test public void testOnBlockedStatusChanged_dataSaver() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".NetworkCallbackTest", "testOnBlockedStatusChanged_dataSaver"); } + @Test public void testOnBlockedStatusChanged_powerSaver() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".NetworkCallbackTest", "testOnBlockedStatusChanged_powerSaver"); diff --git a/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkPolicyManagerTests.java b/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkPolicyManagerTests.java index fdb8876a36..40f5f59b6a 100644 --- a/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkPolicyManagerTests.java +++ b/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkPolicyManagerTests.java @@ -16,49 +16,59 @@ package com.android.cts.net; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + public class HostsideNetworkPolicyManagerTests extends HostsideNetworkTestCase { - @Override - protected void setUp() throws Exception { + @Before + public void setUp() throws Exception { super.setUp(); uninstallPackage(TEST_APP2_PKG, false); installPackage(TEST_APP2_APK); } - @Override - protected void tearDown() throws Exception { + @After + public void tearDown() throws Exception { super.tearDown(); uninstallPackage(TEST_APP2_PKG, true); } + @Test public void testIsUidNetworkingBlocked_withUidNotBlocked() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".NetworkPolicyManagerTest", "testIsUidNetworkingBlocked_withUidNotBlocked"); } + @Test public void testIsUidNetworkingBlocked_withSystemUid() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".NetworkPolicyManagerTest", "testIsUidNetworkingBlocked_withSystemUid"); } + @Test public void testIsUidNetworkingBlocked_withDataSaverMode() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".NetworkPolicyManagerTest", "testIsUidNetworkingBlocked_withDataSaverMode"); } + @Test public void testIsUidNetworkingBlocked_withRestrictedNetworkingMode() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".NetworkPolicyManagerTest", "testIsUidNetworkingBlocked_withRestrictedNetworkingMode"); } + @Test public void testIsUidNetworkingBlocked_withPowerSaverMode() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".NetworkPolicyManagerTest", "testIsUidNetworkingBlocked_withPowerSaverMode"); } + @Test public void testIsUidRestrictedOnMeteredNetworks() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".NetworkPolicyManagerTest", "testIsUidRestrictedOnMeteredNetworks"); diff --git a/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkTestCase.java b/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkTestCase.java index 2aa1032c5e..c896168e61 100644 --- a/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkTestCase.java +++ b/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkTestCase.java @@ -16,28 +16,22 @@ package com.android.cts.net; -import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.fail; + import com.android.ddmlib.Log; -import com.android.ddmlib.testrunner.RemoteAndroidTestRunner; -import com.android.ddmlib.testrunner.TestResult.TestStatus; import com.android.modules.utils.build.testing.DeviceSdkLevel; -import com.android.tradefed.build.IBuildInfo; import com.android.tradefed.device.DeviceNotAvailableException; -import com.android.tradefed.result.CollectingTestListener; -import com.android.tradefed.result.TestDescription; -import com.android.tradefed.result.TestResult; -import com.android.tradefed.result.TestRunResult; -import com.android.tradefed.testtype.DeviceTestCase; -import com.android.tradefed.testtype.IAbi; -import com.android.tradefed.testtype.IAbiReceiver; -import com.android.tradefed.testtype.IBuildReceiver; +import com.android.tradefed.targetprep.TargetSetupError; +import com.android.tradefed.testtype.DeviceJUnit4ClassRunner; +import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test; +import com.android.tradefed.testtype.junit4.DeviceTestRunOptions; import com.android.tradefed.util.RunUtil; -import java.io.FileNotFoundException; -import java.util.Map; +import org.junit.runner.RunWith; -abstract class HostsideNetworkTestCase extends DeviceTestCase implements IAbiReceiver, - IBuildReceiver { +@RunWith(DeviceJUnit4ClassRunner.class) +abstract class HostsideNetworkTestCase extends BaseHostJUnit4Test { protected static final boolean DEBUG = false; protected static final String TAG = "HostsideNetworkTests"; protected static final String TEST_PKG = "com.android.cts.net.hostside"; @@ -46,26 +40,7 @@ abstract class HostsideNetworkTestCase extends DeviceTestCase implements IAbiRec protected static final String TEST_APP2_PKG = "com.android.cts.net.hostside.app2"; protected static final String TEST_APP2_APK = "CtsHostsideNetworkTestsApp2.apk"; - private IAbi mAbi; - private IBuildInfo mCtsBuild; - - @Override - public void setAbi(IAbi abi) { - mAbi = abi; - } - - @Override - public void setBuild(IBuildInfo buildInfo) { - mCtsBuild = buildInfo; - } - - @Override protected void setUp() throws Exception { - super.setUp(); - - assertNotNull(mAbi); - assertNotNull(mCtsBuild); - DeviceSdkLevel deviceSdkLevel = new DeviceSdkLevel(getDevice()); String testApk = deviceSdkLevel.isDeviceAtLeastT() ? TEST_APK_NEXT : TEST_APK; @@ -74,23 +49,20 @@ abstract class HostsideNetworkTestCase extends DeviceTestCase implements IAbiRec installPackage(testApk); } - @Override protected void tearDown() throws Exception { - super.tearDown(); - uninstallPackage(TEST_PKG, true); } - protected void installPackage(String apk) throws FileNotFoundException, - DeviceNotAvailableException { - CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mCtsBuild); - assertNull(getDevice().installPackage(buildHelper.getTestFile(apk), - false /* reinstall */, true /* grantPermissions */, "-t")); + protected void installPackage(String apk) throws DeviceNotAvailableException, TargetSetupError { + final DeviceTestRunOptions installOptions = new DeviceTestRunOptions( + null /* packageName */); + final int userId = getDevice().getCurrentUser(); + installPackageAsUser(apk, true /* grantPermission */, userId, "-t"); } protected void uninstallPackage(String packageName, boolean shouldSucceed) throws DeviceNotAvailableException { - final String result = getDevice().uninstallPackage(packageName); + final String result = uninstallPackage(packageName); if (shouldSucceed) { assertNull("uninstallPackage(" + packageName + ") failed: " + result, result); } @@ -126,50 +98,6 @@ abstract class HostsideNetworkTestCase extends DeviceTestCase implements IAbiRec fail("Package '" + packageName + "' not uinstalled after " + max_tries + " seconds"); } - protected void runDeviceTests(String packageName, String testClassName) - throws DeviceNotAvailableException { - runDeviceTests(packageName, testClassName, null); - } - - protected void runDeviceTests(String packageName, String testClassName, String methodName) - throws DeviceNotAvailableException { - RemoteAndroidTestRunner testRunner = new RemoteAndroidTestRunner(packageName, - "androidx.test.runner.AndroidJUnitRunner", getDevice().getIDevice()); - - if (testClassName != null) { - if (methodName != null) { - testRunner.setMethodName(testClassName, methodName); - } else { - testRunner.setClassName(testClassName); - } - } - - final CollectingTestListener listener = new CollectingTestListener(); - getDevice().runInstrumentationTests(testRunner, listener); - - final TestRunResult result = listener.getCurrentRunResults(); - if (result.isRunFailure()) { - throw new AssertionError("Failed to successfully run device tests for " - + result.getName() + ": " + result.getRunFailureMessage()); - } - - if (result.hasFailedTests()) { - // build a meaningful error message - StringBuilder errorBuilder = new StringBuilder("on-device tests failed:\n"); - for (Map.Entry resultEntry : - result.getTestResults().entrySet()) { - final TestStatus testStatus = resultEntry.getValue().getStatus(); - if (!TestStatus.PASSED.equals(testStatus) - && !TestStatus.ASSUMPTION_FAILURE.equals(testStatus)) { - errorBuilder.append(resultEntry.getKey().toString()); - errorBuilder.append(":\n"); - errorBuilder.append(resultEntry.getValue().getStackTrace()); - } - } - throw new AssertionError(errorBuilder.toString()); - } - } - protected int getUid(String packageName) throws DeviceNotAvailableException { final int currentUser = getDevice().getCurrentUser(); final String uidLines = runCommand( diff --git a/tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java b/tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java index 21c78b79a4..0977deb801 100644 --- a/tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java +++ b/tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java @@ -16,30 +16,37 @@ package com.android.cts.net; +import static org.junit.Assert.fail; + import android.platform.test.annotations.SecurityTest; import com.android.ddmlib.Log; import com.android.tradefed.device.DeviceNotAvailableException; import com.android.tradefed.util.RunUtil; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + public class HostsideRestrictBackgroundNetworkTests extends HostsideNetworkTestCase { - @Override - protected void setUp() throws Exception { + @Before + public void setUp() throws Exception { super.setUp(); uninstallPackage(TEST_APP2_PKG, false); installPackage(TEST_APP2_APK); } - @Override - protected void tearDown() throws Exception { + @After + public void tearDown() throws Exception { super.tearDown(); uninstallPackage(TEST_APP2_PKG, true); } @SecurityTest + @Test public void testDataWarningReceiver() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".DataWarningReceiverTest", "testSnoozeWarningNotReceived"); @@ -49,26 +56,31 @@ public class HostsideRestrictBackgroundNetworkTests extends HostsideNetworkTestC * Data Saver Mode tests. * **************************/ + @Test public void testDataSaverMode_disabled() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".DataSaverModeTest", "testGetRestrictBackgroundStatus_disabled"); } + @Test public void testDataSaverMode_whitelisted() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".DataSaverModeTest", "testGetRestrictBackgroundStatus_whitelisted"); } + @Test public void testDataSaverMode_enabled() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".DataSaverModeTest", "testGetRestrictBackgroundStatus_enabled"); } + @Test public void testDataSaverMode_blacklisted() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".DataSaverModeTest", "testGetRestrictBackgroundStatus_blacklisted"); } + @Test public void testDataSaverMode_reinstall() throws Exception { final int oldUid = getUid(TEST_APP2_PKG); @@ -85,11 +97,13 @@ public class HostsideRestrictBackgroundNetworkTests extends HostsideNetworkTestC assertRestrictBackgroundWhitelist(newUid, false); } + @Test public void testDataSaverMode_requiredWhitelistedPackages() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".DataSaverModeTest", "testGetRestrictBackgroundStatus_requiredWhitelistedPackages"); } + @Test public void testDataSaverMode_broadcastNotSentOnUnsupportedDevices() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".DataSaverModeTest", "testBroadcastNotSentOnUnsupportedDevices"); @@ -99,21 +113,25 @@ public class HostsideRestrictBackgroundNetworkTests extends HostsideNetworkTestC * Battery Saver Mode tests. * *****************************/ + @Test public void testBatterySaverModeMetered_disabled() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".BatterySaverModeMeteredTest", "testBackgroundNetworkAccess_disabled"); } + @Test public void testBatterySaverModeMetered_whitelisted() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".BatterySaverModeMeteredTest", "testBackgroundNetworkAccess_whitelisted"); } + @Test public void testBatterySaverModeMetered_enabled() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".BatterySaverModeMeteredTest", "testBackgroundNetworkAccess_enabled"); } + @Test public void testBatterySaverMode_reinstall() throws Exception { if (!isDozeModeEnabled()) { Log.w(TAG, "testBatterySaverMode_reinstall() skipped because device does not support " @@ -131,16 +149,19 @@ public class HostsideRestrictBackgroundNetworkTests extends HostsideNetworkTestC assertPowerSaveModeWhitelist(TEST_APP2_PKG, false); } + @Test public void testBatterySaverModeNonMetered_disabled() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".BatterySaverModeNonMeteredTest", "testBackgroundNetworkAccess_disabled"); } + @Test public void testBatterySaverModeNonMetered_whitelisted() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".BatterySaverModeNonMeteredTest", "testBackgroundNetworkAccess_whitelisted"); } + @Test public void testBatterySaverModeNonMetered_enabled() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".BatterySaverModeNonMeteredTest", "testBackgroundNetworkAccess_enabled"); @@ -150,26 +171,31 @@ public class HostsideRestrictBackgroundNetworkTests extends HostsideNetworkTestC * App idle tests. * *******************/ + @Test public void testAppIdleMetered_disabled() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".AppIdleMeteredTest", "testBackgroundNetworkAccess_disabled"); } + @Test public void testAppIdleMetered_whitelisted() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".AppIdleMeteredTest", "testBackgroundNetworkAccess_whitelisted"); } + @Test public void testAppIdleMetered_tempWhitelisted() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".AppIdleMeteredTest", "testBackgroundNetworkAccess_tempWhitelisted"); } + @Test public void testAppIdleMetered_enabled() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".AppIdleMeteredTest", "testBackgroundNetworkAccess_enabled"); } + @Test public void testAppIdleMetered_idleWhitelisted() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".AppIdleMeteredTest", "testAppIdleNetworkAccess_idleWhitelisted"); @@ -180,41 +206,50 @@ public class HostsideRestrictBackgroundNetworkTests extends HostsideNetworkTestC // public void testAppIdle_reinstall() throws Exception { // } + @Test public void testAppIdleNonMetered_disabled() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".AppIdleNonMeteredTest", "testBackgroundNetworkAccess_disabled"); } + + @Test public void testAppIdleNonMetered_whitelisted() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".AppIdleNonMeteredTest", "testBackgroundNetworkAccess_whitelisted"); } + @Test public void testAppIdleNonMetered_tempWhitelisted() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".AppIdleNonMeteredTest", "testBackgroundNetworkAccess_tempWhitelisted"); } + @Test public void testAppIdleNonMetered_enabled() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".AppIdleNonMeteredTest", "testBackgroundNetworkAccess_enabled"); } + @Test public void testAppIdleNonMetered_idleWhitelisted() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".AppIdleNonMeteredTest", "testAppIdleNetworkAccess_idleWhitelisted"); } + @Test public void testAppIdleNonMetered_whenCharging() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".AppIdleNonMeteredTest", "testAppIdleNetworkAccess_whenCharging"); } + @Test public void testAppIdleMetered_whenCharging() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".AppIdleMeteredTest", "testAppIdleNetworkAccess_whenCharging"); } + @Test public void testAppIdle_toast() throws Exception { // Check that showing a toast doesn't bring an app out of standby runDeviceTests(TEST_PKG, TEST_PKG + ".AppIdleNonMeteredTest", @@ -225,21 +260,25 @@ public class HostsideRestrictBackgroundNetworkTests extends HostsideNetworkTestC * Doze Mode tests. * ********************/ + @Test public void testDozeModeMetered_disabled() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".DozeModeMeteredTest", "testBackgroundNetworkAccess_disabled"); } + @Test public void testDozeModeMetered_whitelisted() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".DozeModeMeteredTest", "testBackgroundNetworkAccess_whitelisted"); } + @Test public void testDozeModeMetered_enabled() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".DozeModeMeteredTest", "testBackgroundNetworkAccess_enabled"); } + @Test public void testDozeModeMetered_enabledButWhitelistedOnNotificationAction() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".DozeModeMeteredTest", "testBackgroundNetworkAccess_enabledButWhitelistedOnNotificationAction"); @@ -250,21 +289,25 @@ public class HostsideRestrictBackgroundNetworkTests extends HostsideNetworkTestC // public void testDozeMode_reinstall() throws Exception { // } + @Test public void testDozeModeNonMetered_disabled() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".DozeModeNonMeteredTest", "testBackgroundNetworkAccess_disabled"); } + @Test public void testDozeModeNonMetered_whitelisted() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".DozeModeNonMeteredTest", "testBackgroundNetworkAccess_whitelisted"); } + @Test public void testDozeModeNonMetered_enabled() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".DozeModeNonMeteredTest", "testBackgroundNetworkAccess_enabled"); } + @Test public void testDozeModeNonMetered_enabledButWhitelistedOnNotificationAction() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".DozeModeNonMeteredTest", @@ -275,46 +318,55 @@ public class HostsideRestrictBackgroundNetworkTests extends HostsideNetworkTestC * Mixed modes tests. * **********************/ + @Test public void testDataAndBatterySaverModes_meteredNetwork() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".MixedModesTest", "testDataAndBatterySaverModes_meteredNetwork"); } + @Test public void testDataAndBatterySaverModes_nonMeteredNetwork() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".MixedModesTest", "testDataAndBatterySaverModes_nonMeteredNetwork"); } + @Test public void testDozeAndBatterySaverMode_powerSaveWhitelists() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".MixedModesTest", "testDozeAndBatterySaverMode_powerSaveWhitelists"); } + @Test public void testDozeAndAppIdle_powerSaveWhitelists() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".MixedModesTest", "testDozeAndAppIdle_powerSaveWhitelists"); } + @Test public void testAppIdleAndDoze_tempPowerSaveWhitelists() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".MixedModesTest", "testAppIdleAndDoze_tempPowerSaveWhitelists"); } + @Test public void testAppIdleAndBatterySaver_tempPowerSaveWhitelists() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".MixedModesTest", "testAppIdleAndBatterySaver_tempPowerSaveWhitelists"); } + @Test public void testDozeAndAppIdle_appIdleWhitelist() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".MixedModesTest", "testDozeAndAppIdle_appIdleWhitelist"); } + @Test public void testAppIdleAndDoze_tempPowerSaveAndAppIdleWhitelists() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".MixedModesTest", "testAppIdleAndDoze_tempPowerSaveAndAppIdleWhitelists"); } + @Test public void testAppIdleAndBatterySaver_tempPowerSaveAndAppIdleWhitelists() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".MixedModesTest", "testAppIdleAndBatterySaver_tempPowerSaveAndAppIdleWhitelists"); @@ -323,11 +375,14 @@ public class HostsideRestrictBackgroundNetworkTests extends HostsideNetworkTestC /************************** * Restricted mode tests. * **************************/ + + @Test public void testNetworkAccess_restrictedMode() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".RestrictedModeTest", "testNetworkAccess"); } + @Test public void testNetworkAccess_restrictedMode_withBatterySaver() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".RestrictedModeTest", "testNetworkAccess_withBatterySaver"); @@ -337,10 +392,12 @@ public class HostsideRestrictBackgroundNetworkTests extends HostsideNetworkTestC * Expedited job tests. * ************************/ + @Test public void testMeteredNetworkAccess_expeditedJob() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".ExpeditedJobMeteredTest"); } + @Test public void testNonMeteredNetworkAccess_expeditedJob() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".ExpeditedJobNonMeteredTest"); } diff --git a/tests/cts/hostside/src/com/android/cts/net/HostsideSelfDeclaredNetworkCapabilitiesCheckTest.java b/tests/cts/hostside/src/com/android/cts/net/HostsideSelfDeclaredNetworkCapabilitiesCheckTest.java index 4c2985d4f0..c3bdb6d8f2 100644 --- a/tests/cts/hostside/src/com/android/cts/net/HostsideSelfDeclaredNetworkCapabilitiesCheckTest.java +++ b/tests/cts/hostside/src/com/android/cts/net/HostsideSelfDeclaredNetworkCapabilitiesCheckTest.java @@ -15,6 +15,8 @@ */ package com.android.cts.net; +import org.junit.Test; + public class HostsideSelfDeclaredNetworkCapabilitiesCheckTest extends HostsideNetworkTestCase { private static final String TEST_WITH_PROPERTY_IN_CURRENT_SDK_APK = @@ -34,6 +36,7 @@ public class HostsideSelfDeclaredNetworkCapabilitiesCheckTest extends HostsideNe "requestNetwork_withoutRequestCapabilities"; + @Test public void testRequestNetworkInCurrentSdkWithProperty() throws Exception { uninstallPackage(TEST_APP_PKG, false); installPackage(TEST_WITH_PROPERTY_IN_CURRENT_SDK_APK); @@ -48,6 +51,7 @@ public class HostsideSelfDeclaredNetworkCapabilitiesCheckTest extends HostsideNe uninstallPackage(TEST_APP_PKG, true); } + @Test public void testRequestNetworkInCurrentSdkWithoutProperty() throws Exception { uninstallPackage(TEST_APP_PKG, false); installPackage(TEST_WITHOUT_PROPERTY_IN_CURRENT_SDK_APK); @@ -62,6 +66,7 @@ public class HostsideSelfDeclaredNetworkCapabilitiesCheckTest extends HostsideNe uninstallPackage(TEST_APP_PKG, true); } + @Test public void testRequestNetworkInSdk33() throws Exception { uninstallPackage(TEST_APP_PKG, false); installPackage(TEST_IN_SDK_33_APK); @@ -75,6 +80,7 @@ public class HostsideSelfDeclaredNetworkCapabilitiesCheckTest extends HostsideNe uninstallPackage(TEST_APP_PKG, true); } + @Test public void testReinstallPackageWillUpdateProperty() throws Exception { uninstallPackage(TEST_APP_PKG, false); installPackage(TEST_WITHOUT_PROPERTY_IN_CURRENT_SDK_APK); diff --git a/tests/cts/hostside/src/com/android/cts/net/HostsideVpnTests.java b/tests/cts/hostside/src/com/android/cts/net/HostsideVpnTests.java index 3ca4775f35..242fd5da7f 100644 --- a/tests/cts/hostside/src/com/android/cts/net/HostsideVpnTests.java +++ b/tests/cts/hostside/src/com/android/cts/net/HostsideVpnTests.java @@ -18,95 +18,116 @@ package com.android.cts.net; import android.platform.test.annotations.RequiresDevice; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + public class HostsideVpnTests extends HostsideNetworkTestCase { - @Override - protected void setUp() throws Exception { + @Before + public void setUp() throws Exception { super.setUp(); uninstallPackage(TEST_APP2_PKG, false); installPackage(TEST_APP2_APK); } - @Override - protected void tearDown() throws Exception { + @After + public void tearDown() throws Exception { super.tearDown(); uninstallPackage(TEST_APP2_PKG, true); } + @Test public void testChangeUnderlyingNetworks() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".VpnTest", "testChangeUnderlyingNetworks"); } + @Test public void testDefault() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".VpnTest", "testDefault"); } + @Test public void testAppAllowed() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".VpnTest", "testAppAllowed"); } + @Test public void testAppDisallowed() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".VpnTest", "testAppDisallowed"); } + @Test public void testSocketClosed() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".VpnTest", "testSocketClosed"); } + @Test public void testGetConnectionOwnerUidSecurity() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".VpnTest", "testGetConnectionOwnerUidSecurity"); } + @Test public void testSetProxy() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".VpnTest", "testSetProxy"); } + @Test public void testSetProxyDisallowedApps() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".VpnTest", "testSetProxyDisallowedApps"); } + @Test public void testNoProxy() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".VpnTest", "testNoProxy"); } + @Test public void testBindToNetworkWithProxy() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".VpnTest", "testBindToNetworkWithProxy"); } + @Test public void testVpnMeterednessWithNoUnderlyingNetwork() throws Exception { runDeviceTests( TEST_PKG, TEST_PKG + ".VpnTest", "testVpnMeterednessWithNoUnderlyingNetwork"); } + @Test public void testVpnMeterednessWithNullUnderlyingNetwork() throws Exception { runDeviceTests( TEST_PKG, TEST_PKG + ".VpnTest", "testVpnMeterednessWithNullUnderlyingNetwork"); } + @Test public void testVpnMeterednessWithNonNullUnderlyingNetwork() throws Exception { runDeviceTests( TEST_PKG, TEST_PKG + ".VpnTest", "testVpnMeterednessWithNonNullUnderlyingNetwork"); } + @Test public void testAlwaysMeteredVpnWithNullUnderlyingNetwork() throws Exception { runDeviceTests( TEST_PKG, TEST_PKG + ".VpnTest", "testAlwaysMeteredVpnWithNullUnderlyingNetwork"); } @RequiresDevice // Keepalive is not supported on virtual hardware + @Test public void testAutomaticOnOffKeepaliveModeClose() throws Exception { runDeviceTests( TEST_PKG, TEST_PKG + ".VpnTest", "testAutomaticOnOffKeepaliveModeClose"); } @RequiresDevice // Keepalive is not supported on virtual hardware + @Test public void testAutomaticOnOffKeepaliveModeNoClose() throws Exception { runDeviceTests( TEST_PKG, TEST_PKG + ".VpnTest", "testAutomaticOnOffKeepaliveModeNoClose"); } + @Test public void testAlwaysMeteredVpnWithNonNullUnderlyingNetwork() throws Exception { runDeviceTests( TEST_PKG, @@ -114,31 +135,38 @@ public class HostsideVpnTests extends HostsideNetworkTestCase { "testAlwaysMeteredVpnWithNonNullUnderlyingNetwork"); } + @Test public void testB141603906() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".VpnTest", "testB141603906"); } + @Test public void testDownloadWithDownloadManagerDisallowed() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".VpnTest", "testDownloadWithDownloadManagerDisallowed"); } + @Test public void testExcludedRoutes() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".VpnTest", "testExcludedRoutes"); } + @Test public void testIncludedRoutes() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".VpnTest", "testIncludedRoutes"); } + @Test public void testInterleavedRoutes() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".VpnTest", "testInterleavedRoutes"); } + @Test public void testBlockIncomingPackets() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".VpnTest", "testBlockIncomingPackets"); } + @Test public void testSetVpnDefaultForUids() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".VpnTest", "testSetVpnDefaultForUids"); }