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

Merge "Fix netId testing on Q and R" into sc-dev

Browse Source
This commit is contained in:
Remi NGUYEN VAN
2021-04-22 09:56:52 +00:00
committed by Android (Google) Code Review
parent bf5625913d 5ce07b2098
commit 037f39e18e
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/net/common/java/android/net/NetworkTest.java
View File

@@ -29,6 +29,7 @@ import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
import com.android.testutils.DevSdkIgnoreRule;
import com.android.testutils.DevSdkIgnoreRule.IgnoreAfter;
import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
import org.junit.Rule;
@@ -158,16 +159,22 @@ public class NetworkTest {
assertEquals(16290598925L, three.getNetworkHandle());
}
// getNetId() did not exist in Q
@Test @IgnoreUpTo(Build.VERSION_CODES.Q)
public void testGetNetId() {
assertEquals(1234, new Network(1234).getNetId());
assertEquals(2345, new Network(2345, true).getNetId());
}
@Test
public void testFromNetworkHandle() {
final Network network = new Network(1234);
assertEquals(network.getNetId(),
Network.fromNetworkHandle(network.getNetworkHandle()).getNetId());
assertEquals(network.netId, Network.fromNetworkHandle(network.getNetworkHandle()).netId);
}
// Parsing private DNS bypassing handle was not supported until S
@Test @IgnoreUpTo(Build.VERSION_CODES.R)
public void testFromNetworkHandle_S() {
public void testFromNetworkHandlePrivateDnsBypass_S() {
final Network network = new Network(1234, true);
final Network recreatedNetwork = Network.fromNetworkHandle(network.getNetworkHandle());
@@ -175,6 +182,16 @@ public class NetworkTest {
assertEquals(network.getNetIdForResolv(), recreatedNetwork.getNetIdForResolv());
}
@Test @IgnoreAfter(Build.VERSION_CODES.R)
public void testFromNetworkHandlePrivateDnsBypass_R() {
final Network network = new Network(1234, true);
final Network recreatedNetwork = Network.fromNetworkHandle(network.getNetworkHandle());
assertEquals(network.netId, recreatedNetwork.netId);
// Until R included, fromNetworkHandle would not parse the private DNS bypass flag
assertEquals(network.netId, recreatedNetwork.getNetIdForResolv());
}
@Test
public void testGetPrivateDnsBypassingCopy() {
final Network copy = mNetwork.getPrivateDnsBypassingCopy();