Snap for 9284490 from 0a57f9f44b36de1506e2533cc9ed95853bc67226 to tm-qpr2-release (e319632f) · Commits · e / devices / smdk4412 / android_frameworks_opt_telephony

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

+32 −3

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ import java.util.Arrays;

		public class DataCallResponseTest extends AndroidTestCase {
		public static final String FAKE_DNN = "FAKE_DNN";
		public static final String FAKE_DNN_2 = "FAKE_DNN_2";
		// 97a498e3fc925c9489860333d06e4e470a454e5445525052495345.
		// [OsAppId.ANDROID_OS_ID, "ENTERPRISE", 1]
		public static final byte[] FAKE_OS_APP_ID = {-105, -92, -104, -29, -4, -110, 92,
		@@ -82,7 +83,7 @@ public class DataCallResponseTest extends AndroidTestCase {
		}

		@SmallTest
		public void testEquals() {
		public void testEqualsAndHashCode() {
		DataCallResponse response = new DataCallResponse.Builder()
		.setCause(0)
		.setRetryDurationMillis(-1L)
		@@ -123,6 +124,7 @@ public class DataCallResponseTest extends AndroidTestCase {

		assertEquals(response, response);
		assertEquals(response, response1);
		assertEquals(response.hashCode(), response1.hashCode());

		DataCallResponse response2 = new DataCallResponse.Builder()
		.setCause(1)
		@@ -141,12 +143,39 @@ public class DataCallResponseTest extends AndroidTestCase {
		InetAddresses.parseNumericAddress(FAKE_PCSCF_ADDRESS)))
		.setMtuV4(1441)
		.setMtuV6(1440)
		.setTrafficDescriptors(
		Arrays.asList(new TrafficDescriptor("FAKE_DNN_2", FAKE_OS_APP_ID_2)))
		.setTrafficDescriptors(Arrays.asList(
		new TrafficDescriptor(FAKE_DNN, FAKE_OS_APP_ID),
		new TrafficDescriptor(FAKE_DNN_2, FAKE_OS_APP_ID_2)))
		.build();

		assertNotSame(response1, response2);
		assertNotSame(response1, null);
		assertNotSame(response1, new String[1]);
		assertNotSame(response1.hashCode(), response2.hashCode());

		DataCallResponse response3 = new DataCallResponse.Builder()
		.setCause(1)
		.setRetryDurationMillis(-1L)
		.setId(1)
		.setLinkStatus(3)
		.setProtocolType(ApnSetting.PROTOCOL_IP)
		.setInterfaceName(FAKE_IFNAME)
		.setAddresses(Arrays.asList(
		new LinkAddress(InetAddresses.parseNumericAddress(FAKE_ADDRESS), 0)))
		.setDnsAddresses(Arrays.asList(InetAddresses.parseNumericAddress(FAKE_DNS),
		InetAddresses.parseNumericAddress(FAKE_DNS)))
		.setGatewayAddresses(Arrays.asList(InetAddresses.parseNumericAddress(FAKE_GATEWAY)))
		.setPcscfAddresses(Arrays.asList(
		InetAddresses.parseNumericAddress(FAKE_PCSCF_ADDRESS),
		InetAddresses.parseNumericAddress(FAKE_PCSCF_ADDRESS)))
		.setMtuV4(1441)
		.setMtuV6(1440)
		.setTrafficDescriptors(Arrays.asList(
		new TrafficDescriptor(FAKE_DNN_2, FAKE_OS_APP_ID_2),
		new TrafficDescriptor(FAKE_DNN, FAKE_OS_APP_ID)))
		.build();

		assertEquals(response2, response3);
		assertEquals(response2.hashCode(), response3.hashCode());
		}
		}

tests/telephonytests/src/com/android/internal/telephony/metrics/VoiceCallSessionStatsTest.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -81,7 +81,6 @@ import com.android.internal.telephony.uicc.UiccSlot;

		import org.junit.After;
		import org.junit.Before;
		import org.junit.Ignore;
		import org.junit.Test;
		import org.mockito.ArgumentCaptor;

		@@ -909,7 +908,6 @@ public class VoiceCallSessionStatsTest extends TelephonyTest {

		@Test
		@SmallTest
		@Ignore("b/256234604")
		public void singleImsCall_ratSwitchToUnknown() {
		setServiceState(mServiceState, TelephonyManager.NETWORK_TYPE_LTE);
		doReturn(true).when(mImsConnection0).isIncoming();
		@@ -923,6 +921,7 @@ public class VoiceCallSessionStatsTest extends TelephonyTest {
		VOICE_CALL_SESSION__DIRECTION__CALL_DIRECTION_MT,
		TelephonyManager.NETWORK_TYPE_LTE,
		ImsReasonInfo.CODE_USER_TERMINATED);
		expectedCall.setupDuration = 1;
		expectedCall.setupDurationMillis = 80;
		expectedCall.setupFailed = false;
		expectedCall.codecBitmask = 1L << AudioCodec.AUDIO_CODEC_AMR;