Merge "SysUI: Add basic test coverage for signal levels" into lmp-mr1-dev (53e52e52) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java

+15 −14

Original line number	Diff line number	Diff line
		@@ -177,12 +177,21 @@ public class NetworkControllerImpl extends BroadcastReceiver
		* Construct this controller object and register for updates.
		*/
		public NetworkControllerImpl(Context context) {
		this(context, (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE),
		(TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE),
		(WifiManager) context.getSystemService(Context.WIFI_SERVICE));
		registerListeners();
		}

		@VisibleForTesting
		NetworkControllerImpl(Context context, ConnectivityManager connectivityManager,
		TelephonyManager telephonyManager, WifiManager wifiManager) {
		mContext = context;
		final Resources res = context.getResources();

		mConnectivityManager =
		(ConnectivityManager)mContext.getSystemService(Context.CONNECTIVITY_SERVICE);
		mHasMobileDataFeature = getCM().isNetworkSupported(ConnectivityManager.TYPE_MOBILE);
		mConnectivityManager = connectivityManager;
		mHasMobileDataFeature =
		mConnectivityManager.isNetworkSupported(ConnectivityManager.TYPE_MOBILE);

		mShowPhoneRSSIForData = res.getBoolean(R.bool.config_showPhoneRSSIForData);
		mShowAtLeastThreeGees = res.getBoolean(R.bool.config_showMin3G);
		@@ -203,7 +212,7 @@ public class NetworkControllerImpl extends BroadcastReceiver
		mNetworkName = mNetworkNameDefault;

		// wifi
		mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
		mWifiManager = wifiManager;
		Handler handler = new WifiHandler();
		mWifiChannel = new AsyncChannel();
		Messenger wifiMessenger = mWifiManager.getWifiServiceMessenger();
		@@ -211,8 +220,6 @@ public class NetworkControllerImpl extends BroadcastReceiver
		mWifiChannel.connect(mContext, handler, wifiMessenger);
		}

		registerListeners();

		// AIRPLANE_MODE_CHANGED is sent at boot; we've probably already missed it
		updateAirplaneMode();

		@@ -227,13 +234,7 @@ public class NetworkControllerImpl extends BroadcastReceiver
		});
		}

		@VisibleForTesting
		protected ConnectivityManager getCM() {
		return mConnectivityManager;
		}

		@VisibleForTesting
		protected void registerListeners() {
		private void registerListeners() {
		mPhone.listen(mPhoneStateListener,
		PhoneStateListener.LISTEN_SERVICE_STATE
		\| PhoneStateListener.LISTEN_SIGNAL_STRENGTHS
		@@ -1085,7 +1086,7 @@ public class NetworkControllerImpl extends BroadcastReceiver
		Log.d(TAG, "updateConnectivity: intent=" + intent);
		}

		final NetworkInfo info = getCM().getActiveNetworkInfo();
		final NetworkInfo info = mConnectivityManager.getActiveNetworkInfo();

		// Are we connected at all, by any interface?
		mConnected = info != null && info.isConnected();

packages/SystemUI/tests/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@ LOCAL_MODULE_TAGS := tests

		LOCAL_SRC_FILES := $(call all-java-files-under, src)

		LOCAL_JAVA_LIBRARIES := android.test.runner
		LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common

		LOCAL_PACKAGE_NAME := SystemUITests
		LOCAL_INSTRUMENTATION_FOR := SystemUI

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

+88 −27

Original line number	Diff line number	Diff line
		@@ -4,16 +4,19 @@ package com.android.systemui.statusbar.policy;
		import static org.mockito.Mockito.mock;
		import static org.mockito.Mockito.when;

		import android.content.Context;
		import android.content.Intent;
		import android.net.ConnectivityManager;
		import android.net.NetworkInfo;
		import android.net.wifi.WifiManager;
		import android.telephony.PhoneStateListener;
		import android.telephony.ServiceState;
		import android.telephony.SignalStrength;
		import android.telephony.TelephonyManager;
		import android.test.AndroidTestCase;
		import android.util.Log;

		import com.android.internal.telephony.cdma.EriInfo;
		import com.android.systemui.statusbar.policy.NetworkController.NetworkSignalChangedCallback;
		import com.android.systemui.statusbar.policy.NetworkControllerImpl.SignalCluster;

		import org.mockito.ArgumentCaptor;
		@@ -24,13 +27,23 @@ import java.io.StringWriter;

		public class NetworkControllerBaseTest extends AndroidTestCase {
		private static final String TAG = "NetworkControllerBaseTest";
		protected static final int DEFAULT_LEVEL = 2;
		protected static final int DEFAULT_SIGNAL_STRENGTH =
		TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH[1][DEFAULT_LEVEL];
		protected static final int DEFAULT_QS_SIGNAL_STRENGTH =
		TelephonyIcons.QS_TELEPHONY_SIGNAL_STRENGTH[1][DEFAULT_LEVEL];
		protected static final int DEFAULT_ICON = TelephonyIcons.ICON_3G;
		protected static final int DEFAULT_QS_ICON = TelephonyIcons.QS_ICON_3G;

		protected NetworkControllerImpl mNetworkController;
		protected PhoneStateListener mPhoneStateListener;
		protected SignalCluster mSignalCluster;
		protected NetworkSignalChangedCallback mNetworkSignalChangedCallback;
		private SignalStrength mSignalStrength;
		private ServiceState mServiceState;
		private ConnectivityManager mMockCM;
		protected ConnectivityManager mMockCm;
		protected WifiManager mMockWm;
		protected TelephonyManager mMockTm;

		@Override
		protected void setUp() throws Exception {
		@@ -39,17 +52,24 @@ public class NetworkControllerBaseTest extends AndroidTestCase {
		System.setProperty("dexmaker.dexcache", mContext.getCacheDir().getPath());
		Thread.currentThread().setContextClassLoader(getClass().getClassLoader());

		mMockCM = mock(ConnectivityManager.class);
		when(mMockCM.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)).thenReturn(true);
		mMockWm = mock(WifiManager.class);
		mMockTm = mock(TelephonyManager.class);
		mMockCm = mock(ConnectivityManager.class);
		when(mMockCm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)).thenReturn(true);

		// TODO: Move away from fake, use spy if possible after MSIM refactor.
		mNetworkController = new FakeNetworkControllerImpl(mContext);

		mPhoneStateListener = mNetworkController.mPhoneStateListener;
		mSignalStrength = mock(SignalStrength.class);
		mServiceState = mock(ServiceState.class);
		mSignalCluster = mock(SignalCluster.class);
		mNetworkSignalChangedCallback = mock(NetworkSignalChangedCallback.class);

		mNetworkController = new NetworkControllerImpl(mContext, mMockCm, mMockTm, mMockWm);
		setupNetworkController();
		}

		protected void setupNetworkController() {
		mPhoneStateListener = mNetworkController.mPhoneStateListener;
		mNetworkController.addSignalCluster(mSignalCluster);
		mNetworkController.addNetworkSignalChangedCallback(mNetworkSignalChangedCallback);
		}

		@Override
		@@ -62,13 +82,24 @@ public class NetworkControllerBaseTest extends AndroidTestCase {
		super.tearDown();
		}

		// 2 Bars 3G GSM.
		public void setupDefaultSignal() {
		setIsGsm(true);
		setVoiceRegState(ServiceState.STATE_IN_SERVICE);
		setGsmRoaming(false);
		setLevel(DEFAULT_LEVEL);
		updateDataConnectionState(TelephonyManager.DATA_CONNECTED,
		TelephonyManager.NETWORK_TYPE_UMTS);
		setConnectivity(100, ConnectivityManager.TYPE_MOBILE, true);
		}

		public void setConnectivity(int inetCondition, int networkType, boolean isConnected) {
		Intent i = new Intent(ConnectivityManager.INET_CONDITION_ACTION);
		NetworkInfo networkInfo = mock(NetworkInfo.class);
		when(networkInfo.isConnected()).thenReturn(isConnected);
		when(networkInfo.getType()).thenReturn(networkType);
		when(networkInfo.getTypeName()).thenReturn("");
		when(mMockCM.getActiveNetworkInfo()).thenReturn(networkInfo);
		when(mMockCm.getActiveNetworkInfo()).thenReturn(networkInfo);

		i.putExtra(ConnectivityManager.EXTRA_INET_CONDITION, inetCondition);
		mNetworkController.onReceive(mContext, i);
		@@ -79,11 +110,24 @@ public class NetworkControllerBaseTest extends AndroidTestCase {
		updateServiceState();
		}

		public void setCdmaRoaming(boolean isRoaming) {
		when(mServiceState.getCdmaEriIconIndex()).thenReturn(isRoaming ?
		EriInfo.ROAMING_INDICATOR_ON : EriInfo.ROAMING_INDICATOR_OFF);
		when(mServiceState.getCdmaEriIconMode()).thenReturn(isRoaming ?
		EriInfo.ROAMING_ICON_MODE_NORMAL : -1);
		updateServiceState();
		}

		public void setVoiceRegState(int voiceRegState) {
		when(mServiceState.getVoiceRegState()).thenReturn(voiceRegState);
		updateServiceState();
		}

		public void setDataRegState(int dataRegState) {
		when(mServiceState.getDataRegState()).thenReturn(dataRegState);
		updateServiceState();
		}

		public void setIsEmergencyOnly(boolean isEmergency) {
		when(mServiceState.isEmergencyOnly()).thenReturn(isEmergency);
		updateServiceState();
		@@ -131,32 +175,49 @@ public class NetworkControllerBaseTest extends AndroidTestCase {
		mPhoneStateListener.onDataActivity(dataActivity);
		}

		protected void verifyLastMobileDataIndicators(boolean visible, int icon) {
		protected void verifyLastQsMobileDataIndicators(boolean visible, int icon, int typeIcon,
		boolean dataIn, boolean dataOut, boolean noSim) {
		ArgumentCaptor<Integer> iconArg = ArgumentCaptor.forClass(Integer.class);
		ArgumentCaptor<Integer> typeIconArg = ArgumentCaptor.forClass(Integer.class);
		ArgumentCaptor<Boolean> visibleArg = ArgumentCaptor.forClass(Boolean.class);
		ArgumentCaptor<Boolean> dataInArg = ArgumentCaptor.forClass(Boolean.class);
		ArgumentCaptor<Boolean> dataOutArg = ArgumentCaptor.forClass(Boolean.class);
		ArgumentCaptor<Boolean> noSimArg = ArgumentCaptor.forClass(Boolean.class);

		// TODO: Verify all fields.
		Mockito.verify(mSignalCluster, Mockito.atLeastOnce()).setMobileDataIndicators(
		visibleArg.capture(), iconArg.capture(),
		ArgumentCaptor.forClass(Integer.class).capture(),
		Mockito.verify(mNetworkSignalChangedCallback, Mockito.atLeastOnce())
		.onMobileDataSignalChanged(visibleArg.capture(), iconArg.capture(),
		ArgumentCaptor.forClass(String.class).capture(),
		typeIconArg.capture(),
		dataInArg.capture(),
		dataOutArg.capture(),
		ArgumentCaptor.forClass(String.class).capture(),
		ArgumentCaptor.forClass(String.class).capture(),
		noSimArg.capture(),
		ArgumentCaptor.forClass(Boolean.class).capture());

		assertEquals(icon, (int) iconArg.getValue());
		assertEquals(visible, (boolean) visibleArg.getValue());
		assertEquals("Visibility in, quick settings", visible, (boolean) visibleArg.getValue());
		assertEquals("Signal icon in, quick settings", icon, (int) iconArg.getValue());
		assertEquals("Data icon in, quick settings", typeIcon, (int) typeIconArg.getValue());
		assertEquals("Data direction in, in quick settings", dataIn,
		(boolean) dataInArg.getValue());
		assertEquals("Data direction out, in quick settings", dataOut,
		(boolean) dataOutArg.getValue());
		assertEquals("Sim state in quick settings", noSim, (boolean) noSimArg.getValue());
		}

		private class FakeNetworkControllerImpl extends NetworkControllerImpl {
		public FakeNetworkControllerImpl(Context context) {
		super(context);
		}
		protected void verifyLastMobileDataIndicators(boolean visible, int icon, int typeIcon) {
		ArgumentCaptor<Integer> iconArg = ArgumentCaptor.forClass(Integer.class);
		ArgumentCaptor<Integer> typeIconArg = ArgumentCaptor.forClass(Integer.class);
		ArgumentCaptor<Boolean> visibleArg = ArgumentCaptor.forClass(Boolean.class);

		@Override
		public ConnectivityManager getCM() {
		return mMockCM;
		}
		// TODO: Verify all fields.
		Mockito.verify(mSignalCluster, Mockito.atLeastOnce()).setMobileDataIndicators(
		visibleArg.capture(), iconArg.capture(), typeIconArg.capture(),
		ArgumentCaptor.forClass(String.class).capture(),
		ArgumentCaptor.forClass(String.class).capture(),
		ArgumentCaptor.forClass(Boolean.class).capture());

		public void registerListeners() {};
		assertEquals("Signal icon in status bar", icon, (int) iconArg.getValue());
		assertEquals("Data icon in status bar", typeIcon, (int) typeIconArg.getValue());
		assertEquals("Visibility in status bar", visible, (boolean) visibleArg.getValue());
		}
		}

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

0 → 100644

+99 −0

Original line number	Diff line number	Diff line
		package com.android.systemui.statusbar.policy;

		import android.telephony.TelephonyManager;

		// WARNING: Many of these tests may fail with config showMin3G.
		// TODO: Maybe fix the above.
		public class NetworkControllerDataTest extends NetworkControllerBaseTest {

		public void test3gDataIcon() {
		setupDefaultSignal();

		verifyDataIndicators(TelephonyIcons.DATA_3G[1][0 /* No direction */],
		TelephonyIcons.QS_DATA_3G[1]);
		}

		public void testRoamingDataIcon() {
		setupDefaultSignal();
		setGsmRoaming(true);

		verifyLastMobileDataIndicators(true,
		TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH_ROAMING[1][DEFAULT_LEVEL],
		TelephonyIcons.ROAMING_ICON);
		verifyLastQsMobileDataIndicators(true,
		TelephonyIcons.QS_TELEPHONY_SIGNAL_STRENGTH[1][DEFAULT_LEVEL],
		TelephonyIcons.QS_DATA_R[1], false, false, false);
		}

		public void test2gDataIcon() {
		setupDefaultSignal();
		updateDataConnectionState(TelephonyManager.DATA_CONNECTED,
		TelephonyManager.NETWORK_TYPE_GSM);

		verifyDataIndicators(TelephonyIcons.DATA_G[1][0 /* No direction */],
		TelephonyIcons.QS_DATA_G[1]);
		}

		public void testCdmaDataIcon() {
		setupDefaultSignal();
		updateDataConnectionState(TelephonyManager.DATA_CONNECTED,
		TelephonyManager.NETWORK_TYPE_CDMA);

		verifyDataIndicators(TelephonyIcons.DATA_1X[1][0 /* No direction */],
		TelephonyIcons.QS_DATA_1X[1]);
		}

		public void testEdgeDataIcon() {
		setupDefaultSignal();
		updateDataConnectionState(TelephonyManager.DATA_CONNECTED,
		TelephonyManager.NETWORK_TYPE_EDGE);

		verifyDataIndicators(TelephonyIcons.DATA_E[1][0 /* No direction */],
		TelephonyIcons.QS_DATA_E[1]);
		}

		public void testLteDataIcon() {
		setupDefaultSignal();
		updateDataConnectionState(TelephonyManager.DATA_CONNECTED,
		TelephonyManager.NETWORK_TYPE_LTE);

		// WARNING: May fail depending on config.
		verifyDataIndicators(TelephonyIcons.DATA_LTE[1][0 /* No direction */],
		TelephonyIcons.QS_DATA_LTE[1]);
		}

		public void testHspaDataIcon() {
		setupDefaultSignal();
		updateDataConnectionState(TelephonyManager.DATA_CONNECTED,
		TelephonyManager.NETWORK_TYPE_HSPA);

		// WARNING: May fail depending on config.
		verifyDataIndicators(TelephonyIcons.DATA_H[1][0 /* No direction */],
		TelephonyIcons.QS_DATA_H[1]);
		}

		public void testDataActivity() {
		setupDefaultSignal();

		testDataActivity(TelephonyManager.DATA_ACTIVITY_NONE, false, false);
		testDataActivity(TelephonyManager.DATA_ACTIVITY_IN, true, false);
		testDataActivity(TelephonyManager.DATA_ACTIVITY_OUT, false, true);
		testDataActivity(TelephonyManager.DATA_ACTIVITY_INOUT, true, true);
		}

		private void testDataActivity(int direction, boolean in, boolean out) {
		updateDataActivity(direction);

		verifyLastMobileDataIndicators(true, DEFAULT_SIGNAL_STRENGTH, DEFAULT_ICON);
		verifyLastQsMobileDataIndicators(true, DEFAULT_QS_SIGNAL_STRENGTH,
		DEFAULT_QS_ICON, in, out, false);

		}

		private void verifyDataIndicators(int dataIcon, int qsDataIcon) {
		verifyLastMobileDataIndicators(true, DEFAULT_SIGNAL_STRENGTH, dataIcon);
		verifyLastQsMobileDataIndicators(true, DEFAULT_QS_SIGNAL_STRENGTH, qsDataIcon, false,
		false, false);
		}

		}

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

+109 −20

Original line number	Diff line number	Diff line
		@@ -5,33 +5,122 @@ import android.telephony.ServiceState;
		import android.telephony.SignalStrength;
		import android.telephony.TelephonyManager;

		import com.android.systemui.R;

		import org.mockito.Mockito;

		public class NetworkControllerSignalTest extends NetworkControllerBaseTest {

		public void testNoIconWithoutMobile() {
		// Turn off mobile network support.
		Mockito.when(mMockCm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)).thenReturn(false);
		// Create a new NetworkController as this is currently handled in constructor.
		mNetworkController = new NetworkControllerImpl(mContext, mMockCm, mMockTm, mMockWm);
		setupNetworkController();

		verifyLastMobileDataIndicators(false, 0, 0);
		}

		public void testSignalStrength() {
		int testStrength = SignalStrength.SIGNAL_STRENGTH_MODERATE;
		setIsGsm(true);
		setVoiceRegState(ServiceState.STATE_IN_SERVICE);
		setGsmRoaming(false);
		for (int testStrength = SignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN;
		testStrength <= SignalStrength.SIGNAL_STRENGTH_GREAT; testStrength++) {
		setupDefaultSignal();
		setLevel(testStrength);
		updateDataConnectionState(TelephonyManager.DATA_CONNECTED,
		TelephonyManager.NETWORK_TYPE_UMTS);
		setConnectivity(100, ConnectivityManager.TYPE_MOBILE, true);

		verifyLastMobileDataIndicators(true,
		TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH[1][testStrength]);
		TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH[1][testStrength],
		DEFAULT_ICON);

		// Verify low inet number indexing.
		setConnectivity(10, ConnectivityManager.TYPE_MOBILE, true);
		verifyLastMobileDataIndicators(true,
		TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH[0][testStrength], 0);
		}
		}

		public void testCdmaSignalStrength() {
		for (int testStrength = SignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN;
		testStrength <= SignalStrength.SIGNAL_STRENGTH_GREAT; testStrength++) {
		setupDefaultSignal();
		setCdma();
		setLevel(testStrength);

		verifyLastMobileDataIndicators(true,
		TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH[1][testStrength],
		TelephonyIcons.DATA_1X[1][0 /* No direction */]);
		}
		}

		public void testSignalRoaming() {
		int testStrength = SignalStrength.SIGNAL_STRENGTH_MODERATE;
		setIsGsm(true);
		setVoiceRegState(ServiceState.STATE_IN_SERVICE);
		for (int testStrength = SignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN;
		testStrength <= SignalStrength.SIGNAL_STRENGTH_GREAT; testStrength++) {
		setupDefaultSignal();
		setGsmRoaming(true);
		setLevel(testStrength);
		updateDataConnectionState(TelephonyManager.DATA_CONNECTED,
		TelephonyManager.NETWORK_TYPE_UMTS);
		setConnectivity(100, ConnectivityManager.TYPE_MOBILE, true);

		verifyLastMobileDataIndicators(true,
		TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH_ROAMING[1][testStrength]);
		TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH_ROAMING[1][testStrength],
		TelephonyIcons.ROAMING_ICON);
		}
		}

		public void testCdmaSignalRoaming() {
		for (int testStrength = SignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN;
		testStrength <= SignalStrength.SIGNAL_STRENGTH_GREAT; testStrength++) {
		setupDefaultSignal();
		setCdma();
		setCdmaRoaming(true);
		setLevel(testStrength);

		verifyLastMobileDataIndicators(true,
		TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH_ROAMING[1][testStrength],
		TelephonyIcons.ROAMING_ICON);
		}
		}

		public void testQsSignalStrength() {
		for (int testStrength = SignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN;
		testStrength <= SignalStrength.SIGNAL_STRENGTH_GREAT; testStrength++) {
		setupDefaultSignal();
		setLevel(testStrength);

		verifyLastQsMobileDataIndicators(true,
		TelephonyIcons.QS_TELEPHONY_SIGNAL_STRENGTH[1][testStrength],
		DEFAULT_QS_ICON, false, false, false);
		}
		}

		public void testCdmaQsSignalStrength() {
		for (int testStrength = SignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN;
		testStrength <= SignalStrength.SIGNAL_STRENGTH_GREAT; testStrength++) {
		setupDefaultSignal();
		setCdma();
		setLevel(testStrength);

		verifyLastQsMobileDataIndicators(true,
		TelephonyIcons.QS_TELEPHONY_SIGNAL_STRENGTH[1][testStrength],
		TelephonyIcons.QS_ICON_1X, false, false, false);
		}
		}

		public void testNoRoamingWithoutSignal() {
		setupDefaultSignal();
		setCdma();
		setCdmaRoaming(true);
		setVoiceRegState(ServiceState.STATE_OUT_OF_SERVICE);
		setDataRegState(ServiceState.STATE_OUT_OF_SERVICE);

		// This exposes the bug in b/18034542, and should be switched to the commented out
		// verification below (and pass), once the bug is fixed.
		verifyLastMobileDataIndicators(true, R.drawable.stat_sys_signal_null,
		TelephonyIcons.ROAMING_ICON);
		//verifyLastMobileDataIndicators(true, R.drawable.stat_sys_signal_null, 0 /* No Icon */);
		}

		private void setCdma() {
		setIsGsm(false);
		updateDataConnectionState(TelephonyManager.DATA_CONNECTED,
		TelephonyManager.NETWORK_TYPE_CDMA);
		setCdmaRoaming(false);
		}
		}