From a6fe35a8412267cb8f26d580b829c3c37f0bf93f Mon Sep 17 00:00:00 2001 From: Hugo Benichi Date: Wed, 19 Jul 2017 10:10:52 +0900 Subject: [PATCH] ConnectivityServiceTest: fix testNetworkInfoOfTypeNone This patch fixes a couple of flakyness issues with testNetworkInfoOfTypeNone. It also fixes some typos and naming issues. Bug: 62918393, 62918393 Test: runtest frameworks-net Change-Id: I1c56557ab113d3ef57dbc06a6e882634d03c5b09 --- .../android/server/ConnectivityServiceTest.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java index 9d4a2b033e..11e36bd377 100644 --- a/tests/net/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java @@ -881,6 +881,7 @@ public class ConnectivityServiceTest extends AndroidTestCase { } private void verifyNoNetwork() { + waitForIdle(); // Test getActiveNetworkInfo() assertNull(mCm.getActiveNetworkInfo()); // Test getActiveNetwork() @@ -3277,7 +3278,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(); @@ -3291,19 +3292,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();