Merge "Fixed flaky unit tests" (623383df) · Commits · e / os / android_frameworks_opt_telephony

tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java

+23 −12

Original line number	Diff line number	Diff line
		@@ -655,6 +655,8 @@ public class DcTrackerTest extends TelephonyTest {
		mDct.enableApn(ApnSetting.TYPE_XCAP, DcTracker.REQUEST_TYPE_NORMAL, null);
		waitForLastHandlerAction(mDcTrackerTestHandler.getThreadHandler());

		// Data connection is running on a different thread. Have to wait.
		waitForMs(200);
		verify(mSimulatedCommandsVerifier, times(1)).setupDataCall(
		eq(AccessNetworkType.EUTRAN), any(DataProfile.class),
		eq(false), eq(false), eq(DataService.REQUEST_REASON_NORMAL), any(),
		@@ -742,8 +744,8 @@ public class DcTrackerTest extends TelephonyTest {
		mApnContext));
		waitForLastHandlerAction(mDcTrackerTestHandler.getThreadHandler());

		// Data connection is running on a different thread. Have to wait.
		waitForMs(200);

		dpCaptor = ArgumentCaptor.forClass(DataProfile.class);
		// Verify if RIL command was sent properly.
		verify(mSimulatedCommandsVerifier, times(2)).setupDataCall(
		@@ -785,8 +787,8 @@ public class DcTrackerTest extends TelephonyTest {
		mDct.sendMessage(mDct.obtainMessage(DctConstants.EVENT_DATA_ENABLED_CHANGED, ar));
		waitForLastHandlerAction(mDcTrackerTestHandler.getThreadHandler());

		// Data connection is running on a different thread. Have to wait.
		waitForMs(200);

		// expected tear down all metered DataConnections
		verify(mSimulatedCommandsVerifier, times(1)).deactivateDataCall(
		eq(DataService.REQUEST_REASON_NORMAL), anyInt(),
		@@ -837,8 +839,8 @@ public class DcTrackerTest extends TelephonyTest {
		mDct.obtainMessage(DctConstants.EVENT_DATA_ENABLED_OVERRIDE_RULES_CHANGED).sendToTarget();
		waitForLastHandlerAction(mDcTrackerTestHandler.getThreadHandler());

		// Data connection is running on a different thread. Have to wait.
		waitForMs(200);

		// expected tear down all metered DataConnections
		verify(mSimulatedCommandsVerifier, times(2)).deactivateDataCall(
		eq(DataService.REQUEST_REASON_NORMAL), anyInt(),
		@@ -851,8 +853,8 @@ public class DcTrackerTest extends TelephonyTest {
		mDct.obtainMessage(DctConstants.EVENT_DATA_ENABLED_OVERRIDE_RULES_CHANGED).sendToTarget();
		waitForLastHandlerAction(mDcTrackerTestHandler.getThreadHandler());

		// Data connection is running on a different thread. Have to wait.
		waitForMs(200);

		verify(mSimulatedCommandsVerifier, times(1)).setupDataCall(
		eq(AccessNetworkType.EUTRAN), dpCaptor.capture(),
		eq(false), eq(false), eq(DataService.REQUEST_REASON_NORMAL), any(),
		@@ -896,8 +898,8 @@ public class DcTrackerTest extends TelephonyTest {
		mDct.sendMessage(mDct.obtainMessage(DctConstants.EVENT_ROAMING_ON));
		waitForLastHandlerAction(mDcTrackerTestHandler.getThreadHandler());

		// Data connection is running on a different thread. Have to wait.
		waitForMs(200);

		// expected tear down all metered DataConnections
		verify(mSimulatedCommandsVerifier, times(1)).deactivateDataCall(
		eq(DataService.REQUEST_REASON_NORMAL), anyInt(),
		@@ -995,8 +997,8 @@ public class DcTrackerTest extends TelephonyTest {
		mDct.sendMessage(mDct.obtainMessage(DctConstants.EVENT_DATA_ENABLED_CHANGED, ar));
		waitForLastHandlerAction(mDcTrackerTestHandler.getThreadHandler());

		// Data connection is running on a different thread. Have to wait.
		waitForMs(200);

		// Validate all metered data connections have been torn down
		verify(mSimulatedCommandsVerifier, times(1)).deactivateDataCall(
		eq(DataService.REQUEST_REASON_NORMAL), anyInt(),
		@@ -1063,8 +1065,6 @@ public class DcTrackerTest extends TelephonyTest {

		sendInitializationEvents();

		waitForMs(200);

		// Assert that both APN_TYPE_SUPL & APN_TYPE_DEFAULT are connected even we only setup data
		// for APN_TYPE_SUPL
		assertEquals(DctConstants.State.CONNECTED, mDct.getState(PhoneConstants.APN_TYPE_SUPL));
		@@ -1165,6 +1165,8 @@ public class DcTrackerTest extends TelephonyTest {
		mDct.requestNetwork(nr, DcTracker.REQUEST_TYPE_NORMAL, null);
		waitForLastHandlerAction(mDcTrackerTestHandler.getThreadHandler());

		// Data connection is running on a different thread. Have to wait.
		waitForMs(200);
		verify(mSimulatedCommandsVerifier, times(1)).setupDataCall(anyInt(), any(DataProfile.class),
		eq(false), eq(false), eq(DataService.REQUEST_REASON_NORMAL), any(),
		any(Message.class));
		@@ -1191,6 +1193,8 @@ public class DcTrackerTest extends TelephonyTest {
		mDct.requestNetwork(nr, DcTracker.REQUEST_TYPE_NORMAL, null);
		waitForLastHandlerAction(mDcTrackerTestHandler.getThreadHandler());

		// Data connection is running on a different thread. Have to wait.
		waitForMs(200);
		verify(mSimulatedCommandsVerifier, times(1)).setupDataCall(anyInt(), any(DataProfile.class),
		eq(false), eq(false), eq(DataService.REQUEST_REASON_NORMAL), any(),
		any(Message.class));
		@@ -1292,8 +1296,8 @@ public class DcTrackerTest extends TelephonyTest {
		mDct.sendMessage(mDct.obtainMessage(DctConstants.EVENT_DATA_RAT_CHANGED, null));
		waitForLastHandlerAction(mDcTrackerTestHandler.getThreadHandler());

		// Data connection is running on a different thread. Have to wait.
		waitForMs(200);

		// Verify the disconnected data call due to rat change and retry manger schedule another
		// data call setup
		verify(mSimulatedCommandsVerifier, times(1)).deactivateDataCall(
		@@ -1309,8 +1313,8 @@ public class DcTrackerTest extends TelephonyTest {
		mApnContext));
		waitForLastHandlerAction(mDcTrackerTestHandler.getThreadHandler());

		// Data connection is running on a different thread. Have to wait.
		waitForMs(200);

		// Verify if RIL command was sent properly.
		verify(mSimulatedCommandsVerifier).setupDataCall(
		eq(AccessNetworkType.EUTRAN), dpCaptor.capture(),
		@@ -1414,8 +1418,8 @@ public class DcTrackerTest extends TelephonyTest {
		mDct.sendMessage(mDct.obtainMessage(DctConstants.EVENT_DATA_RAT_CHANGED, null));
		waitForLastHandlerAction(mDcTrackerTestHandler.getThreadHandler());

		// Data connection is running on a different thread. Have to wait.
		waitForMs(200);

		// Verify data connection is on
		verify(mSimulatedCommandsVerifier, times(0)).deactivateDataCall(
		eq(DataService.REQUEST_REASON_NORMAL), anyInt(),
		@@ -1578,6 +1582,8 @@ public class DcTrackerTest extends TelephonyTest {
		NetworkAgent.INVALID_NETWORK, 1, null));
		waitForLastHandlerAction(mDcTrackerTestHandler.getThreadHandler());

		// Data connection is running on a different thread. Have to wait.
		waitForMs(200);
		verify(mSimulatedCommandsVerifier, times(1)).getDataCallList(any(Message.class));
		}

		@@ -1838,6 +1844,8 @@ public class DcTrackerTest extends TelephonyTest {
		// NetCapability should switch to unmetered when fr=SUB6 and SUB6 unmetered
		mDct.sendMessage(mDct.obtainMessage(DctConstants.EVENT_TELEPHONY_DISPLAY_INFO_CHANGED));
		waitForLastHandlerAction(mDcTrackerTestHandler.getThreadHandler());
		// Data connection is running on a different thread. Have to wait.
		waitForMs(200);
		verify(mDataConnection, times(2)).onMeterednessChanged(true);

		resetDataConnection(id);
		@@ -1864,6 +1872,8 @@ public class DcTrackerTest extends TelephonyTest {
		.when(mDisplayInfoController).getTelephonyDisplayInfo();
		mDct.sendMessage(mDct.obtainMessage(DctConstants.EVENT_TELEPHONY_DISPLAY_INFO_CHANGED));
		waitForLastHandlerAction(mDcTrackerTestHandler.getThreadHandler());
		// Data connection is running on a different thread. Have to wait.
		waitForMs(200);
		verify(mDataConnection, times(1)).onMeterednessChanged(false);

		resetDataConnection(id);
		@@ -1988,8 +1998,9 @@ public class DcTrackerTest extends TelephonyTest {
		anyInt(), anyInt());
		mDct.sendMessage(mDct.obtainMessage(DctConstants.EVENT_DATA_RAT_CHANGED, null));
		waitForLastHandlerAction(mDcTrackerTestHandler.getThreadHandler());
		waitForMs(200);

		// Data connection is running on a different thread. Have to wait.
		waitForMs(200);
		// expected tear down all metered DataConnections
		verify(mSimulatedCommandsVerifier).deactivateDataCall(
		eq(DataService.REQUEST_REASON_NORMAL), anyInt(),