Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1894abb authored by Hugo Benichi's avatar Hugo Benichi Committed by android-build-merger
Browse files

Merge "ConnectivityServiceTest: fix testNetworkInfoOfTypeNone" am: 24a2adfa 

am: f6883504

Change-Id: I432f419d1c8f93136a76cbadfd32018294b3e3d7
parents 04b48078 f6883504

tests/net/java/com/android/server/ConnectivityServiceTest.java

+9 −8
Original line number Diff line number Diff line
@@ -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();