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

Merge "Request cell in #testExplicitlySelected"

Browse Source
This commit is contained in:
Treehugger Robot
2023-03-28 07:57:33 +00:00
committed by Gerrit Code Review
parent 853c866d67 7cf34ec1cd
commit dafaf2a08b
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3817,13 +3817,13 @@ public class ConnectivityServiceTest {
@Test @Test
public void testExplicitlySelected() throws Exception { public void testExplicitlySelected() throws Exception {
NetworkRequest request = new NetworkRequest.Builder() final NetworkRequest request = new NetworkRequest.Builder()
.clearCapabilities().addCapability(NET_CAPABILITY_INTERNET) .clearCapabilities().addCapability(NET_CAPABILITY_INTERNET)
.build(); .build();
TestNetworkCallback callback = new TestNetworkCallback(); final TestNetworkCallback callback = new TestNetworkCallback();
mCm.registerNetworkCallback(request, callback); mCm.registerNetworkCallback(request, callback);
// Bring up validated cell. // Bring up validated cell
mCellAgent = new TestNetworkAgentWrapper(TRANSPORT_CELLULAR); mCellAgent = new TestNetworkAgentWrapper(TRANSPORT_CELLULAR);
mCellAgent.connect(true); mCellAgent.connect(true);
callback.expectAvailableThenValidatedCallbacks(mCellAgent); callback.expectAvailableThenValidatedCallbacks(mCellAgent);
@@ -3881,6 +3881,12 @@ public class ConnectivityServiceTest {
assertEquals(mWiFiAgent.getNetwork(), mCm.getActiveNetwork()); assertEquals(mWiFiAgent.getNetwork(), mCm.getActiveNetwork());
expectUnvalidationCheckWillNotNotify(mWiFiAgent); expectUnvalidationCheckWillNotNotify(mWiFiAgent);
// Now request cell so it doesn't disconnect during the test
final NetworkRequest cellRequest = new NetworkRequest.Builder()
.clearCapabilities().addTransportType(TRANSPORT_CELLULAR).build();
final TestNetworkCallback cellCallback = new TestNetworkCallback();
mCm.requestNetwork(cellRequest, cellCallback);
mEthernetAgent = new TestNetworkAgentWrapper(TRANSPORT_ETHERNET); mEthernetAgent = new TestNetworkAgentWrapper(TRANSPORT_ETHERNET);
mEthernetAgent.connect(true); mEthernetAgent.connect(true);
callback.expectAvailableCallbacksUnvalidated(mEthernetAgent); callback.expectAvailableCallbacksUnvalidated(mEthernetAgent);
@@ -3922,6 +3928,7 @@ public class ConnectivityServiceTest {
callback.expect(LOST, mWiFiAgent); callback.expect(LOST, mWiFiAgent);
callback.expect(LOST, mCellAgent); callback.expect(LOST, mCellAgent);
mCm.unregisterNetworkCallback(cellCallback);
} }
private void doTestFirstEvaluation( private void doTestFirstEvaluation(