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

Merge "Fix setAdministratorUids tests on Q" am: 7e3fc61cf1 am: a59e208450

Browse Source 
Change-Id: Ifbcb485fad3a61c2cf48fb6e264bcdc130119ff0
This commit is contained in:
Remi NGUYEN VAN
2020-04-03 08:41:32 +00:00
committed by Automerger Merge Worker
parent af77f3649c a59e208450
commit 91627585e3
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tests/net/common/java/android/net/NetworkCapabilitiesTest.java
View File

@@ -55,6 +55,10 @@ import android.util.ArraySet;
import androidx.core.os.BuildCompat; import androidx.core.os.BuildCompat;
import androidx.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.android.testutils.DevSdkIgnoreRule;
import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@@ -67,6 +71,9 @@ public class NetworkCapabilitiesTest {
private static final String TEST_SSID = "TEST_SSID"; private static final String TEST_SSID = "TEST_SSID";
private static final String DIFFERENT_TEST_SSID = "DIFFERENT_TEST_SSID"; private static final String DIFFERENT_TEST_SSID = "DIFFERENT_TEST_SSID";
@Rule
public DevSdkIgnoreRule mDevSdkIgnoreRule = new DevSdkIgnoreRule();
private boolean isAtLeastR() { private boolean isAtLeastR() {
// BuildCompat.isAtLeastR() is used to check the Android version before releasing Android R. // BuildCompat.isAtLeastR() is used to check the Android version before releasing Android R.
// Build.VERSION.SDK_INT > Build.VERSION_CODES.Q is used to check the Android version after // Build.VERSION.SDK_INT > Build.VERSION_CODES.Q is used to check the Android version after
@@ -441,7 +448,7 @@ public class NetworkCapabilitiesTest {
return range; return range;
} }
@Test @Test @IgnoreUpTo(Build.VERSION_CODES.Q)
public void testSetAdministratorUids() { public void testSetAdministratorUids() {
NetworkCapabilities nc = NetworkCapabilities nc =
new NetworkCapabilities().setAdministratorUids(new int[] {2, 1, 3}); new NetworkCapabilities().setAdministratorUids(new int[] {2, 1, 3});
@@ -449,7 +456,7 @@ public class NetworkCapabilitiesTest {
assertArrayEquals(new int[] {1, 2, 3}, nc.getAdministratorUids()); assertArrayEquals(new int[] {1, 2, 3}, nc.getAdministratorUids());
} }
@Test @Test @IgnoreUpTo(Build.VERSION_CODES.Q)
public void testSetAdministratorUidsWithDuplicates() { public void testSetAdministratorUidsWithDuplicates() {
try { try {
new NetworkCapabilities().setAdministratorUids(new int[] {1, 1}); new NetworkCapabilities().setAdministratorUids(new int[] {1, 1});
@@ -510,6 +517,12 @@ public class NetworkCapabilitiesTest {
assertFalse(nc2.appliesToUid(12)); assertFalse(nc2.appliesToUid(12));
assertTrue(nc1.appliesToUid(22)); assertTrue(nc1.appliesToUid(22));
assertTrue(nc2.appliesToUid(22)); assertTrue(nc2.appliesToUid(22));
}
@Test @IgnoreUpTo(Build.VERSION_CODES.Q)
public void testCombineCapabilities_AdministratorUids() {
final NetworkCapabilities nc1 = new NetworkCapabilities();
final NetworkCapabilities nc2 = new NetworkCapabilities();
final int[] adminUids = {3, 6, 12}; final int[] adminUids = {3, 6, 12};
nc1.setAdministratorUids(adminUids); nc1.setAdministratorUids(adminUids);
@@ -518,7 +531,7 @@ public class NetworkCapabilitiesTest {
assertArrayEquals(nc2.getAdministratorUids(), adminUids); assertArrayEquals(nc2.getAdministratorUids(), adminUids);
final int[] adminUidsOtherOrder = {3, 12, 6}; final int[] adminUidsOtherOrder = {3, 12, 6};
nc1.setAdministratorUids(adminUids); nc1.setAdministratorUids(adminUidsOtherOrder);
assertTrue(nc2.equalsAdministratorUids(nc1)); assertTrue(nc2.equalsAdministratorUids(nc1));
final int[] adminUids2 = {11, 1, 12, 3, 6}; final int[] adminUids2 = {11, 1, 12, 3, 6};