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

Merge "ConnectivityServiceTest: fix testNetworkInfoOfTypeNone" am: 1f0d765378 am: 9efd050236 am: b1894abbc5

Browse Source 
am: fecebf94a2

Change-Id: I7d3bfdf6d95d5db2d31439b5c3334569666864e1
This commit is contained in:
Hugo Benichi
2017-07-19 08:20:23 +00:00
committed by android-build-merger
parent 260b8cec60 fecebf94a2
commit 90217e1808
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() { private void verifyNoNetwork() {
waitForIdle();
// Test getActiveNetworkInfo() // Test getActiveNetworkInfo()
assertNull(mCm.getActiveNetworkInfo()); assertNull(mCm.getActiveNetworkInfo());
// Test getActiveNetwork() // Test getActiveNetwork()
@@ -3281,7 +3282,7 @@ public class ConnectivityServiceTest extends AndroidTestCase {
ConditionVariable broadcastCV = waitForConnectivityBroadcasts(1); ConditionVariable broadcastCV = waitForConnectivityBroadcasts(1);
verifyNoNetwork(); verifyNoNetwork();
MockNetworkAgent lowpanNetwork = new MockNetworkAgent(TRANSPORT_WIFI_AWARE); MockNetworkAgent wifiAware = new MockNetworkAgent(TRANSPORT_WIFI_AWARE);
assertNull(mCm.getActiveNetworkInfo()); assertNull(mCm.getActiveNetworkInfo());
Network[] allNetworks = mCm.getAllNetworks(); Network[] allNetworks = mCm.getAllNetworks();
@@ -3295,19 +3296,19 @@ public class ConnectivityServiceTest extends AndroidTestCase {
final TestNetworkCallback callback = new TestNetworkCallback(); final TestNetworkCallback callback = new TestNetworkCallback();
mCm.registerNetworkCallback(request, callback); mCm.registerNetworkCallback(request, callback);
// Bring up lowpan. // Bring up wifi aware network.
lowpanNetwork.connect(false, false); wifiAware.connect(false, false);
callback.expectAvailableCallbacks(lowpanNetwork); callback.expectAvailableCallbacks(wifiAware);
assertNull(mCm.getActiveNetworkInfo()); assertNull(mCm.getActiveNetworkInfo());
assertNull(mCm.getActiveNetwork()); 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. // of this test. Fix it and uncomment the assert below.
//assertEmpty(mCm.getAllNetworkInfo()); //assertEmpty(mCm.getAllNetworkInfo());
// Disconnect lowpan. // Disconnect wifi aware network.
lowpanNetwork.disconnect(); wifiAware.disconnect();
callback.expectCallback(CallbackState.LOST, lowpanNetwork); callback.expectCallbackLike((info) -> info.state == CallbackState.LOST, TIMEOUT_MS);
mCm.unregisterNetworkCallback(callback); mCm.unregisterNetworkCallback(callback);
verifyNoNetwork(); verifyNoNetwork();