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

Commit 395c2cc1 authored by Sundeep Ghuman's avatar Sundeep Ghuman Committed by android-build-merger
Browse files

Merge "Fix race condition / test flakiness." into oc-dr1-dev am: 0c8e5b6d am: 850ec9b2 

am: 6911eb38

Change-Id: I3b92831ece6dade82d334ad96d69937a520a79a2
parents 6860b955 6911eb38

packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java

+9 −3
Original line number Diff line number Diff line
@@ -346,7 +346,10 @@ public class WifiTrackerTest { 


        Intent intent = new Intent(WifiManager.NETWORK_STATE_CHANGED_ACTION);

        intent.putExtra(WifiManager.EXTRA_NETWORK_INFO, networkInfo);

        return createTrackerWithImmediateBroadcastsAndInjectInitialScanResults(intent);

        WifiTracker tracker =

                createTrackerWithImmediateBroadcastsAndInjectInitialScanResults(intent);

        assertThat(tracker.isConnected()).isTrue();

        return tracker;

    }



    private void waitForHandlersToProcessCurrentlyEnqueuedMessages(WifiTracker tracker)
@@ -860,23 +863,26 @@ public class WifiTrackerTest { 
        intent.putExtra(WifiManager.EXTRA_NETWORK_INFO, networkInfo);

        tracker.mReceiver.onReceive(mContext, intent);



        waitForHandlersToProcessCurrentlyEnqueuedMessages(tracker);

        verify(mockWifiListener, times(1)).onConnectedChanged();

    }



    @Test

    public void onConnectedChangedCallback_shouldNBeInvokedWhenStateChanges() throws Exception {

    public void onConnectedChangedCallback_shouldBeInvokedWhenStateChanges() throws Exception {

        WifiTracker tracker = createTrackerWithScanResultsAndAccessPoint1Connected();

        verify(mockWifiListener, times(1)).onConnectedChanged();



        NetworkInfo networkInfo = new NetworkInfo(

                ConnectivityManager.TYPE_WIFI, 0, "Type Wifi", "subtype");

        networkInfo.setDetailedState(

                NetworkInfo.DetailedState.DISCONNECTED, "dicconnected", "test");

                NetworkInfo.DetailedState.DISCONNECTED, "disconnected", "test");



        Intent intent = new Intent(WifiManager.NETWORK_STATE_CHANGED_ACTION);

        intent.putExtra(WifiManager.EXTRA_NETWORK_INFO, networkInfo);

        tracker.mReceiver.onReceive(mContext, intent);



        waitForHandlersToProcessCurrentlyEnqueuedMessages(tracker);

        assertThat(tracker.isConnected()).isFalse();

        verify(mockWifiListener, times(2)).onConnectedChanged();

    }

}