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

Add version check to prevent test fail on Android Q

Browse Source 
Include androidx.core_core for androidx.core.os.BuildCompat.

Bug: 151293251
Test: atest CtsNetTestCasesLatestSdk:android.net.NetworkCapabilitiesTest
Change-Id: I73ef7eececec757a6e9683b231bf73fcd8d49f8d
This commit is contained in:
lucaslin
2020-03-12 19:47:37 +08:00
committed by Lucas Lin
parent da284dc189
commit 9e90c02511
2 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/net/common/Android.bp
View File

@@ -20,6 +20,7 @@ java_library {
name: "FrameworksNetCommonTests", name: "FrameworksNetCommonTests",
srcs: ["java/**/*.java", "java/**/*.kt"], srcs: ["java/**/*.java", "java/**/*.kt"],
static_libs: [ static_libs: [
"androidx.core_core",
"androidx.test.rules", "androidx.test.rules",
"junit", "junit",
"mockito-target-minus-junit4", "mockito-target-minus-junit4",

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

@@ -48,9 +48,11 @@ import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import android.os.Build;
import android.test.suitebuilder.annotation.SmallTest; import android.test.suitebuilder.annotation.SmallTest;
import android.util.ArraySet; import android.util.ArraySet;
import androidx.core.os.BuildCompat;
import androidx.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import org.junit.Test; import org.junit.Test;
@@ -64,6 +66,13 @@ 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";
private boolean isAtLeastR() {
// 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
// releasing Android R.
return BuildCompat.isAtLeastR() || Build.VERSION.SDK_INT > Build.VERSION_CODES.Q;
}
@Test @Test
public void testMaybeMarkCapabilitiesRestricted() { public void testMaybeMarkCapabilitiesRestricted() {
// verify EIMS is restricted // verify EIMS is restricted
@@ -269,25 +278,36 @@ public class NetworkCapabilitiesTest {
.setUids(uids) .setUids(uids)
.addCapability(NET_CAPABILITY_EIMS) .addCapability(NET_CAPABILITY_EIMS)
.addCapability(NET_CAPABILITY_NOT_METERED); .addCapability(NET_CAPABILITY_NOT_METERED);
netCap.setOwnerUid(123); if (isAtLeastR()) {
netCap.setOwnerUid(123);
}
assertParcelingIsLossless(netCap); assertParcelingIsLossless(netCap);
netCap.setSSID(TEST_SSID); netCap.setSSID(TEST_SSID);
assertParcelSane(netCap, 15); testParcelSane(netCap);
} }
@Test @Test
public void testParcelNetworkCapabilitiesWithRequestorUidAndPackageName() { public void testParcelNetworkCapabilitiesWithRequestorUidAndPackageName() {
final NetworkCapabilities netCap = new NetworkCapabilities() final NetworkCapabilities netCap = new NetworkCapabilities()
.addCapability(NET_CAPABILITY_INTERNET) .addCapability(NET_CAPABILITY_INTERNET)
.setRequestorUid(9304)
.setRequestorPackageName("com.android.test")
.addCapability(NET_CAPABILITY_EIMS) .addCapability(NET_CAPABILITY_EIMS)
.addCapability(NET_CAPABILITY_NOT_METERED); .addCapability(NET_CAPABILITY_NOT_METERED);
if (isAtLeastR()) {
netCap.setRequestorPackageName("com.android.test");
netCap.setRequestorUid(9304);
}
assertParcelingIsLossless(netCap); assertParcelingIsLossless(netCap);
netCap.setSSID(TEST_SSID); netCap.setSSID(TEST_SSID);
assertParcelSane(netCap, 15); testParcelSane(netCap);
} }
private void testParcelSane(NetworkCapabilities cap) {
if (isAtLeastR()) {
assertParcelSane(cap, 15);
} else {
assertParcelSane(cap, 11);
}
}
@Test @Test
public void testOemPaid() { public void testOemPaid() {