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

Commit beafc363 authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

Minor tweaks to WifiDetailPreferenceControllerTest. 

Add makeNetworkCapabilities and updateNetworkCapabilities
methods, and use them. These are not very useful in the current
code but we introduce in their own CL to limit test changes in an
upcoming CL that will make use them to test new code.

Bug: 62209358
Test: make -j64 RunSettingsRoboTests
Change-Id: I67269e1add40ecb3c2b693548e8bf29ae776a79f
parent 0187221b

tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java

+16 −11
Original line number Diff line number Diff line
@@ -445,6 +445,17 @@ public class WifiDetailPreferenceControllerTest { 
        mCallbackCaptor.getValue().onLinkPropertiesChanged(mockNetwork, new LinkProperties(lp));

    }



    private void updateNetworkCapabilities(NetworkCapabilities nc) {

        mCallbackCaptor.getValue().onCapabilitiesChanged(mockNetwork, new NetworkCapabilities(nc));

    }



    private NetworkCapabilities makeNetworkCapabilities() {

        NetworkCapabilities nc = new NetworkCapabilities();

        nc.clearAll();

        nc.addTransportType(NetworkCapabilities.TRANSPORT_WIFI);

        return nc;

    }



    private void verifyDisplayedIpv6Addresses(InOrder inOrder, LinkAddress... addresses) {

        String text = Arrays.stream(addresses)

                .map(address -> asString(address))
@@ -589,7 +600,7 @@ public class WifiDetailPreferenceControllerTest { 
    }



    @Test

    public void networkDisconnectdState_shouldFinishActivity() {

    public void networkDisconnectedState_shouldFinishActivity() {

        mController.onResume();



        when(mockConnectivityManager.getNetworkInfo(any(Network.class))).thenReturn(null);
@@ -644,22 +655,16 @@ public class WifiDetailPreferenceControllerTest { 


        inOrder.verify(mockSignInButton).setVisibility(View.INVISIBLE);



        NetworkCapabilities nc = new NetworkCapabilities();

        nc.clearAll();

        nc.addTransportType(NetworkCapabilities.TRANSPORT_WIFI);



        NetworkCallback callback = mCallbackCaptor.getValue();

        callback.onCapabilitiesChanged(mockNetwork, nc);

        NetworkCapabilities nc = makeNetworkCapabilities();

        updateNetworkCapabilities(nc);

        inOrder.verify(mockSignInButton).setVisibility(View.INVISIBLE);



        nc = new NetworkCapabilities(nc);

        nc.addCapability(NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL);

        callback.onCapabilitiesChanged(mockNetwork, nc);

        updateNetworkCapabilities(nc);

        inOrder.verify(mockSignInButton).setVisibility(View.VISIBLE);



        nc = new NetworkCapabilities(nc);

        nc.removeCapability(NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL);

        callback.onCapabilitiesChanged(mockNetwork, nc);

        updateNetworkCapabilities(nc);

        inOrder.verify(mockSignInButton).setVisibility(View.INVISIBLE);

    }