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

Merge "ConnectivityServiceTest: fix testNetworkInfoOfTypeNone"

Browse Source 
am: 1f0d765378

Change-Id: I4be1d2ce67871c1e01364beca886fdd3af374321
This commit is contained in:
Hugo Benichi
2017-07-19 08:04:48 +00:00
committed by android-build-merger
parent d1ce5a4ca7 1f0d765378
commit 9efd050236
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -885,6 +885,7 @@ public class ConnectivityServiceTest extends AndroidTestCase {
}
private void verifyNoNetwork() {
waitForIdle();
// Test getActiveNetworkInfo()
assertNull(mCm.getActiveNetworkInfo());
// Test getActiveNetwork()
@@ -3281,7 +3282,7 @@ public class ConnectivityServiceTest extends AndroidTestCase {
ConditionVariable broadcastCV = waitForConnectivityBroadcasts(1);
verifyNoNetwork();
MockNetworkAgent lowpanNetwork = new MockNetworkAgent(TRANSPORT_WIFI_AWARE);
MockNetworkAgent wifiAware = new MockNetworkAgent(TRANSPORT_WIFI_AWARE);
assertNull(mCm.getActiveNetworkInfo());
Network[] allNetworks = mCm.getAllNetworks();
@@ -3295,19 +3296,19 @@ public class ConnectivityServiceTest extends AndroidTestCase {
final TestNetworkCallback callback = new TestNetworkCallback();
mCm.registerNetworkCallback(request, callback);
// Bring up lowpan.
lowpanNetwork.connect(false, false);
callback.expectAvailableCallbacks(lowpanNetwork);
// Bring up wifi aware network.
wifiAware.connect(false, false);
callback.expectAvailableCallbacks(wifiAware);
assertNull(mCm.getActiveNetworkInfo());
assertNull(mCm.getActiveNetwork());
// TODO: getAllNetworkInfo is dirty and returns a non-empty array rght from the start
// TODO: getAllNetworkInfo is dirty and returns a non-empty array right from the start
// of this test. Fix it and uncomment the assert below.
//assertEmpty(mCm.getAllNetworkInfo());
// Disconnect lowpan.
lowpanNetwork.disconnect();
callback.expectCallback(CallbackState.LOST, lowpanNetwork);
// Disconnect wifi aware network.
wifiAware.disconnect();
callback.expectCallbackLike((info) -> info.state == CallbackState.LOST, TIMEOUT_MS);
mCm.unregisterNetworkCallback(callback);
verifyNoNetwork();