Merge "Fixed unit tests" into tm-dev (c6e50f7c) · Commits · e / os / android_frameworks_opt_telephony

tests/telephonytests/src/com/android/internal/telephony/data/DataNetworkControllerTest.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -1241,6 +1241,11 @@ public class DataNetworkControllerTest extends TelephonyTest {
		@Test
		public void testRoamingDataChanged() throws Exception {
		doReturn(true).when(mServiceState).getDataRoaming();

		// Roaming data disabled
		mDataNetworkControllerUT.getDataSettingsManager().setDataRoamingEnabled(false);
		processAllMessages();

		serviceStateChanged(TelephonyManager.NETWORK_TYPE_LTE,
		NetworkRegistrationInfo.REGISTRATION_STATE_ROAMING);
		mDataNetworkControllerUT.addNetworkRequest(
		@@ -1370,6 +1375,9 @@ public class DataNetworkControllerTest extends TelephonyTest {
		public void testMmsAlwaysAllowedRoamingDisabled() throws Exception {
		// Data roaming disabled
		doReturn(true).when(mServiceState).getDataRoaming();
		mDataNetworkControllerUT.getDataSettingsManager().setDataRoamingEnabled(false);
		processAllMessages();

		// Device is roaming
		serviceStateChanged(TelephonyManager.NETWORK_TYPE_LTE,
		NetworkRegistrationInfo.REGISTRATION_STATE_ROAMING);
		@@ -1420,6 +1428,9 @@ public class DataNetworkControllerTest extends TelephonyTest {
		public void testUnmeteredRequestDataRoamingDisabled() throws Exception {
		// Data roaming disabled
		doReturn(true).when(mServiceState).getDataRoaming();
		mDataNetworkControllerUT.getDataSettingsManager().setDataRoamingEnabled(false);
		processAllMessages();

		// MMS is unmetered
		mCarrierConfig.putStringArray(
		CarrierConfigManager.KEY_CARRIER_METERED_ROAMING_APN_TYPES_STRINGS,