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

Merge "Skip tests on unsupported devices." am: 0dc6206752 am: f8110a2cda

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

Change-Id: Ib0d27578e15d6f4af77723700ca564ecf15c0f4e
This commit is contained in:
Sudheer Shanka
2021-07-01 17:28:49 +00:00
committed by Automerger Merge Worker
parent 7a10686a8d f8110a2cda
commit d80b8cc4a9
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkPolicyManagerTest.java
View File

@@ -23,6 +23,8 @@ import static com.android.cts.net.hostside.NetworkPolicyTestUtils.canChangeActiv
import static com.android.cts.net.hostside.NetworkPolicyTestUtils.isUidNetworkingBlocked; import static com.android.cts.net.hostside.NetworkPolicyTestUtils.isUidNetworkingBlocked;
import static com.android.cts.net.hostside.NetworkPolicyTestUtils.isUidRestrictedOnMeteredNetworks; import static com.android.cts.net.hostside.NetworkPolicyTestUtils.isUidRestrictedOnMeteredNetworks;
import static com.android.cts.net.hostside.NetworkPolicyTestUtils.setRestrictBackground; import static com.android.cts.net.hostside.NetworkPolicyTestUtils.setRestrictBackground;
import static com.android.cts.net.hostside.Property.BATTERY_SAVER_MODE;
import static com.android.cts.net.hostside.Property.DATA_SAVER_MODE;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
@@ -79,6 +81,7 @@ public class NetworkPolicyManagerTest extends AbstractRestrictBackgroundNetworkT
assertFalse(isUidNetworkingBlocked(mUid, NON_METERED)); // Match NTWK_ALLOWED_NON_METERED assertFalse(isUidNetworkingBlocked(mUid, NON_METERED)); // Match NTWK_ALLOWED_NON_METERED
} }
@RequiredProperties({DATA_SAVER_MODE, BATTERY_SAVER_MODE})
@Test @Test
public void testIsUidNetworkingBlocked_withSystemUid() throws Exception { public void testIsUidNetworkingBlocked_withSystemUid() throws Exception {
// Refer to NetworkPolicyManagerService#isUidNetworkingBlockedInternal(), this test is to // Refer to NetworkPolicyManagerService#isUidNetworkingBlockedInternal(), this test is to
@@ -103,6 +106,7 @@ public class NetworkPolicyManagerTest extends AbstractRestrictBackgroundNetworkT
} }
} }
@RequiredProperties({DATA_SAVER_MODE})
@Test @Test
public void testIsUidNetworkingBlocked_withDataSaverMode() throws Exception { public void testIsUidNetworkingBlocked_withDataSaverMode() throws Exception {
// Refer to NetworkPolicyManagerService#isUidNetworkingBlockedInternal(), this test is to // Refer to NetworkPolicyManagerService#isUidNetworkingBlockedInternal(), this test is to
@@ -182,6 +186,7 @@ public class NetworkPolicyManagerTest extends AbstractRestrictBackgroundNetworkT
} }
} }
@RequiredProperties({BATTERY_SAVER_MODE})
@Test @Test
public void testIsUidNetworkingBlocked_withPowerSaverMode() throws Exception { public void testIsUidNetworkingBlocked_withPowerSaverMode() throws Exception {
// Refer to NetworkPolicyManagerService#isUidNetworkingBlockedInternal(), this test is to // Refer to NetworkPolicyManagerService#isUidNetworkingBlockedInternal(), this test is to
@@ -209,6 +214,7 @@ public class NetworkPolicyManagerTest extends AbstractRestrictBackgroundNetworkT
} }
} }
@RequiredProperties({DATA_SAVER_MODE})
@Test @Test
public void testIsUidRestrictedOnMeteredNetworks() throws Exception { public void testIsUidRestrictedOnMeteredNetworks() throws Exception {
try { try {