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

Commit 2515f472 authored by Jason Monk's avatar Jason Monk
Browse files

Make NetworkController tests more deterministic 

Test: runtest systemui
Fixes: 63386204

Change-Id: I371c6897c929e70e61a44e116c5a508f494eff0c
parent 28834a66

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java

+17 −17
Original line number Original line Diff line number Diff line
@@ -16,11 +16,21 @@ 




package com.android.systemui.statusbar.policy;

package com.android.systemui.statusbar.policy;





import static junit.framework.Assert.assertEquals;



import static org.mockito.Matchers.any;

import static org.mockito.Matchers.anyBoolean;

import static org.mockito.Matchers.anyInt;

import static org.mockito.Matchers.anyString;

import static org.mockito.Matchers.eq;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.when;



import android.content.Intent;

import android.content.Intent;

import android.net.ConnectivityManager;

import android.net.ConnectivityManager;

import android.net.NetworkCapabilities;

import android.net.NetworkCapabilities;

import android.net.wifi.WifiManager;

import android.net.wifi.WifiManager;

import android.os.Looper;

import android.provider.Settings;

import android.provider.Settings;

import android.provider.Settings.Global;

import android.provider.Settings.Global;

import android.telephony.PhoneStateListener;

import android.telephony.PhoneStateListener;
@@ -29,16 +39,18 @@ import android.telephony.SignalStrength; 
import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.telephony.TelephonyManager;

import android.testing.TestableLooper;

import android.util.Log;

import android.util.Log;



import com.android.internal.telephony.cdma.EriInfo;

import com.android.internal.telephony.cdma.EriInfo;

import com.android.settingslib.net.DataUsageController;

import com.android.settingslib.net.DataUsageController;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.statusbar.phone.SignalDrawable;

import com.android.systemui.statusbar.phone.SignalDrawable;

import com.android.systemui.statusbar.policy.DeviceProvisionedController.DeviceProvisionedListener;

import com.android.systemui.statusbar.policy.DeviceProvisionedController.DeviceProvisionedListener;

import com.android.systemui.statusbar.policy.NetworkController.IconState;

import com.android.systemui.statusbar.policy.NetworkController.IconState;

import com.android.systemui.statusbar.policy.NetworkController.SignalCallback;

import com.android.systemui.statusbar.policy.NetworkController.SignalCallback;

import com.android.systemui.statusbar.policy.NetworkControllerImpl.Config;

import com.android.systemui.statusbar.policy.NetworkControllerImpl.Config;

import com.android.systemui.statusbar.policy.NetworkControllerImpl.SubscriptionDefaults;

import com.android.systemui.statusbar.policy.NetworkControllerImpl.SubscriptionDefaults;

import com.android.systemui.SysuiTestCase;





import org.junit.Before;

import org.junit.Before;

import org.junit.Rule;

import org.junit.Rule;
@@ -46,25 +58,12 @@ import org.junit.rules.TestWatcher; 
import org.junit.runner.Description;

import org.junit.runner.Description;

import org.mockito.ArgumentCaptor;

import org.mockito.ArgumentCaptor;

import org.mockito.Mockito;

import org.mockito.Mockito;

import org.mockito.invocation.InvocationOnMock;

import org.mockito.stubbing.Answer;





import java.io.PrintWriter;

import java.io.PrintWriter;

import java.io.StringWriter;

import java.io.StringWriter;

import java.util.ArrayList;

import java.util.ArrayList;

import java.util.List;

import java.util.List;





import static junit.framework.Assert.assertEquals;



import static org.mockito.Matchers.any;

import static org.mockito.Matchers.anyBoolean;

import static org.mockito.Matchers.anyInt;

import static org.mockito.Matchers.anyString;

import static org.mockito.Matchers.eq;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.when;



public class NetworkControllerBaseTest extends SysuiTestCase {

public class NetworkControllerBaseTest extends SysuiTestCase {

    private static final String TAG = "NetworkControllerBaseTest";

    private static final String TAG = "NetworkControllerBaseTest";

    protected static final int DEFAULT_LEVEL = 2;

    protected static final int DEFAULT_LEVEL = 2;
@@ -131,11 +130,12 @@ public class NetworkControllerBaseTest extends SysuiTestCase { 
            mUserCallback = (DeviceProvisionedListener) invocation.getArguments()[0];

            mUserCallback = (DeviceProvisionedListener) invocation.getArguments()[0];

            mUserCallback.onUserSetupChanged();

            mUserCallback.onUserSetupChanged();

            mUserCallback.onDeviceProvisionedChanged();

            mUserCallback.onDeviceProvisionedChanged();

            TestableLooper.get(this).processAllMessages();

            return null;

            return null;

        }).when(mMockProvisionController).addCallback(any());

        }).when(mMockProvisionController).addCallback(any());





        mNetworkController = new NetworkControllerImpl(mContext, mMockCm, mMockTm, mMockWm, mMockSm,

        mNetworkController = new NetworkControllerImpl(mContext, mMockCm, mMockTm, mMockWm, mMockSm,

                mConfig, Looper.getMainLooper(), mCallbackHandler,

                mConfig, TestableLooper.get(this).getLooper(), mCallbackHandler,

                mock(AccessPointControllerImpl.class), mock(DataUsageController.class),

                mock(AccessPointControllerImpl.class), mock(DataUsageController.class),

                mMockSubDefaults, mMockProvisionController);

                mMockSubDefaults, mMockProvisionController);

        setupNetworkController();

        setupNetworkController();
@@ -176,7 +176,7 @@ public class NetworkControllerBaseTest extends SysuiTestCase { 
      when(mMockCm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)).thenReturn(false);

      when(mMockCm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)).thenReturn(false);

      NetworkControllerImpl networkControllerNoMobile

      NetworkControllerImpl networkControllerNoMobile

              = new NetworkControllerImpl(mContext, mMockCm, mMockTm, mMockWm, mMockSm,

              = new NetworkControllerImpl(mContext, mMockCm, mMockTm, mMockWm, mMockSm,

                        mConfig, mContext.getMainLooper(), mCallbackHandler,

                        mConfig, TestableLooper.get(this).getLooper(), mCallbackHandler,

                        mock(AccessPointControllerImpl.class),

                        mock(AccessPointControllerImpl.class),

                        mock(DataUsageController.class), mMockSubDefaults,

                        mock(DataUsageController.class), mMockSubDefaults,

                        mock(DeviceProvisionedController.class));

                        mock(DeviceProvisionedController.class));

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java

+6 −1
Original line number Original line Diff line number Diff line
@@ -9,6 +9,9 @@ import android.os.Looper; 
import android.support.test.runner.AndroidJUnit4;

import android.support.test.runner.AndroidJUnit4;

import android.telephony.TelephonyManager;

import android.telephony.TelephonyManager;

import android.test.suitebuilder.annotation.SmallTest;

import android.test.suitebuilder.annotation.SmallTest;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;

import android.testing.TestableLooper.RunWithLooper;





import com.android.settingslib.net.DataUsageController;

import com.android.settingslib.net.DataUsageController;
@@ -16,7 +19,8 @@ import org.junit.Test; 
import org.junit.runner.RunWith;

import org.junit.runner.RunWith;





@SmallTest

@SmallTest

@RunWith(AndroidJUnit4.class)

@RunWith(AndroidTestingRunner.class)

@RunWithLooper

public class NetworkControllerDataTest extends NetworkControllerBaseTest {

public class NetworkControllerDataTest extends NetworkControllerBaseTest {





    @Test

    @Test
@@ -126,6 +130,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { 
        setConnectivity(NetworkCapabilities.TRANSPORT_CELLULAR, false, false);

        setConnectivity(NetworkCapabilities.TRANSPORT_CELLULAR, false, false);

        when(mMockProvisionController.isUserSetup(anyInt())).thenReturn(false);

        when(mMockProvisionController.isUserSetup(anyInt())).thenReturn(false);

        mUserCallback.onUserSetupChanged();

        mUserCallback.onUserSetupChanged();

        TestableLooper.get(this).processAllMessages();





        // Don't show the X until the device is setup.

        // Don't show the X until the device is setup.

        verifyDataIndicators(0, 0);

        verifyDataIndicators(0, 0);

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerEthernetTest.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -3,6 +3,8 @@ package com.android.systemui.statusbar.policy; 
import android.net.NetworkCapabilities;

import android.net.NetworkCapabilities;

import android.support.test.runner.AndroidJUnit4;

import android.support.test.runner.AndroidJUnit4;

import android.test.suitebuilder.annotation.SmallTest;

import android.test.suitebuilder.annotation.SmallTest;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper.RunWithLooper;





import com.android.systemui.statusbar.policy.NetworkController.IconState;

import com.android.systemui.statusbar.policy.NetworkController.IconState;
@@ -14,7 +16,8 @@ import org.mockito.Mockito; 
import static junit.framework.Assert.assertEquals;

import static junit.framework.Assert.assertEquals;





@SmallTest

@SmallTest

@RunWith(AndroidJUnit4.class)

@RunWith(AndroidTestingRunner.class)

@RunWithLooper

public class NetworkControllerEthernetTest extends NetworkControllerBaseTest {

public class NetworkControllerEthernetTest extends NetworkControllerBaseTest {





    @Test

    @Test

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -25,6 +25,8 @@ import android.telephony.SignalStrength; 
import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionInfo;

import android.telephony.TelephonyManager;

import android.telephony.TelephonyManager;

import android.test.suitebuilder.annotation.SmallTest;

import android.test.suitebuilder.annotation.SmallTest;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper.RunWithLooper;





import com.android.internal.telephony.PhoneConstants;

import com.android.internal.telephony.PhoneConstants;

import com.android.internal.telephony.TelephonyIntents;

import com.android.internal.telephony.TelephonyIntents;
@@ -46,7 +48,8 @@ import static junit.framework.Assert.assertFalse; 
import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.mock;





@SmallTest

@SmallTest

@RunWith(AndroidJUnit4.class)

@RunWith(AndroidTestingRunner.class)

@RunWithLooper

public class NetworkControllerSignalTest extends NetworkControllerBaseTest {

public class NetworkControllerSignalTest extends NetworkControllerBaseTest {





    @Test

    @Test

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerWifiTest.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -7,6 +7,8 @@ import android.net.wifi.WifiInfo; 
import android.net.wifi.WifiManager;

import android.net.wifi.WifiManager;

import android.support.test.runner.AndroidJUnit4;

import android.support.test.runner.AndroidJUnit4;

import android.test.suitebuilder.annotation.SmallTest;

import android.test.suitebuilder.annotation.SmallTest;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper.RunWithLooper;





import com.android.systemui.statusbar.policy.NetworkController.IconState;

import com.android.systemui.statusbar.policy.NetworkController.IconState;
@@ -21,7 +23,8 @@ import static org.mockito.Matchers.any; 
import static org.mockito.Matchers.anyBoolean;

import static org.mockito.Matchers.anyBoolean;





@SmallTest

@SmallTest

@RunWith(AndroidJUnit4.class)

@RunWith(AndroidTestingRunner.class)

@RunWithLooper

public class NetworkControllerWifiTest extends NetworkControllerBaseTest {

public class NetworkControllerWifiTest extends NetworkControllerBaseTest {

    // These match the constants in WifiManager and need to be kept up to date.

    // These match the constants in WifiManager and need to be kept up to date.

    private static final int MIN_RSSI = -100;

    private static final int MIN_RSSI = -100;