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

Request enterprise networks

Browse Source 
...so they don't disconnect in the middle of the test

Test: strategically add a sleep to reproduce the failure
      apply the patch, observe the test passing with the sleep
Bug: 293844884
Change-Id: I4388e151d886461ca44185639e292ccd9795c50e
This commit is contained in:
Chalard Jean
2023-08-15 14:59:28 +09:00
parent 9597ea86f3
commit c33eafb464
1 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/unit/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -16390,6 +16390,15 @@ public class ConnectivityServiceTest {
// Other callbacks will be unregistered by tearDown() // Other callbacks will be unregistered by tearDown()
} }
private NetworkCallback requestForEnterpriseId(@NetworkCapabilities.EnterpriseId final int id) {
final NetworkCapabilities nc = new NetworkCapabilities.Builder()
.addCapability(NET_CAPABILITY_ENTERPRISE).addEnterpriseId(id).build();
final NetworkRequest req = new NetworkRequest.Builder().setCapabilities(nc).build();
final NetworkCallback cb = new TestableNetworkCallback();
mCm.requestNetwork(req, cb);
return cb;
}
/** /**
* Make sure per profile network preferences behave as expected when multiple slices with * Make sure per profile network preferences behave as expected when multiple slices with
* multiple different apps within same user profile is configured. * multiple different apps within same user profile is configured.
@@ -16397,8 +16406,6 @@ public class ConnectivityServiceTest {
@Test @Test
public void testSetPreferenceWithMultiplePreferences() public void testSetPreferenceWithMultiplePreferences()
throws Exception { throws Exception {
final InOrder inOrder = inOrder(mMockNetd);
final UserHandle testHandle = setupEnterpriseNetwork(); final UserHandle testHandle = setupEnterpriseNetwork();
mServiceContext.setWorkProfile(testHandle, true); mServiceContext.setWorkProfile(testHandle, true);
registerDefaultNetworkCallbacks(); registerDefaultNetworkCallbacks();
@@ -16436,6 +16443,12 @@ public class ConnectivityServiceTest {
final TestNetworkAgentWrapper workAgent4 = makeEnterpriseNetworkAgent(NET_ENTERPRISE_ID_4); final TestNetworkAgentWrapper workAgent4 = makeEnterpriseNetworkAgent(NET_ENTERPRISE_ID_4);
final TestNetworkAgentWrapper workAgent5 = makeEnterpriseNetworkAgent(NET_ENTERPRISE_ID_5); final TestNetworkAgentWrapper workAgent5 = makeEnterpriseNetworkAgent(NET_ENTERPRISE_ID_5);
final NetworkCallback keepupCb1 = requestForEnterpriseId(NET_ENTERPRISE_ID_1);
final NetworkCallback keepupCb2 = requestForEnterpriseId(NET_ENTERPRISE_ID_2);
final NetworkCallback keepupCb3 = requestForEnterpriseId(NET_ENTERPRISE_ID_3);
final NetworkCallback keepupCb4 = requestForEnterpriseId(NET_ENTERPRISE_ID_4);
final NetworkCallback keepupCb5 = requestForEnterpriseId(NET_ENTERPRISE_ID_5);
workAgent1.connect(true); workAgent1.connect(true);
workAgent2.connect(true); workAgent2.connect(true);
workAgent3.connect(true); workAgent3.connect(true);
@@ -16594,6 +16607,12 @@ public class ConnectivityServiceTest {
appCb4.expectAvailableCallbacksValidated(mCellAgent); appCb4.expectAvailableCallbacksValidated(mCellAgent);
mCellAgent.disconnect(); mCellAgent.disconnect();
mCm.unregisterNetworkCallback(keepupCb1);
mCm.unregisterNetworkCallback(keepupCb2);
mCm.unregisterNetworkCallback(keepupCb3);
mCm.unregisterNetworkCallback(keepupCb4);
mCm.unregisterNetworkCallback(keepupCb5);
mCm.unregisterNetworkCallback(appCb1); mCm.unregisterNetworkCallback(appCb1);
mCm.unregisterNetworkCallback(appCb2); mCm.unregisterNetworkCallback(appCb2);
mCm.unregisterNetworkCallback(appCb3); mCm.unregisterNetworkCallback(appCb3);