Merge "Added unit test cases for DataConnection" into nyc-dev (b4030827) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/dataconnection/DataConnection.java

+3 −4

Original line number	Diff line number	Diff line
		@@ -125,9 +125,9 @@ public class DataConnection extends StateMachine {
		/**
		* Used internally for saving disconnecting parameters.
		*/
		static class DisconnectParams {
		public static class DisconnectParams {
		int mTag;
		ApnContext mApnContext;
		public ApnContext mApnContext;
		String mReason;
		Message mOnCompletedMsg;

		@@ -162,7 +162,6 @@ public class DataConnection extends StateMachine {
		private NetworkInfo mNetworkInfo;
		private NetworkAgent mNetworkAgent;

		//***** Package visible variables
		int mTag;
		public int mCid;
		public HashMap<ApnContext, ConnectionParams> mApnContexts = null;
		@@ -236,7 +235,7 @@ public class DataConnection extends StateMachine {
		* @param id the connection id
		* @return DataConnection that was created.
		*/
		static DataConnection makeDataConnection(Phone phone, int id,
		public static DataConnection makeDataConnection(Phone phone, int id,
		DcTracker dct, DcTesterFailBringUpAll failBringUpAll,
		DcController dcc) {
		DataConnection dc = new DataConnection(phone,

src/java/com/android/internal/telephony/dataconnection/DcFailBringUp.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ import com.android.internal.telephony.RILConstants;
		* saves the parameters from a action_fail_bringup intent. See
		* {@link DataConnection#doOnConnect} and {@see DcTesterFailBringUpAll} for more info.
		*/
		class DcFailBringUp {
		public class DcFailBringUp {
		private static final String LOG_TAG = "DcFailBringUp";
		private static final boolean DBG = true;

		@@ -62,7 +62,7 @@ class DcFailBringUp {
		}
		}

		void saveParameters(int counter, int failCause, int suggestedRetryTime) {
		public void saveParameters(int counter, int failCause, int suggestedRetryTime) {
		mCounter = counter;
		mFailCause = DcFailCause.fromInt(failCause);
		mSuggestedRetryTime = suggestedRetryTime;

src/java/com/android/internal/telephony/dataconnection/DcTesterFailBringUpAll.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -98,7 +98,7 @@ public class DcTesterFailBringUpAll {
		}
		}

		DcFailBringUp getDcFailBringUp() {
		public DcFailBringUp getDcFailBringUp() {
		return mFailBringUp;
		}

src/java/com/android/internal/telephony/test/SimulatedCommands.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -1105,7 +1105,10 @@ public class SimulatedCommands extends BaseCommands
		}

		@Override
		public void deactivateDataCall(int cid, int reason, Message result) {unimplemented(result);}
		public void deactivateDataCall(int cid, int reason, Message result) {
		SimulatedCommandsVerifier.getInstance().deactivateDataCall(cid, reason, result);
		resultSuccess(result, null);
		}

		@Override
		public void setPreferredNetworkType(int networkType , Message result) {

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

0 → 100644

+200 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2016 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.internal.telephony.dataconnection;

		import android.os.Handler;
		import android.os.HandlerThread;
		import android.os.Message;
		import android.telephony.ServiceState;
		import android.test.suitebuilder.annotation.SmallTest;

		import com.android.internal.telephony.PhoneConstants;
		import com.android.internal.telephony.RILConstants;
		import com.android.internal.telephony.TelephonyTest;
		import com.android.internal.telephony.dataconnection.DataConnection.ConnectionParams;
		import com.android.internal.telephony.dataconnection.DataConnection.DisconnectParams;
		import com.android.internal.util.IState;
		import com.android.internal.util.StateMachine;

		import org.junit.After;
		import org.junit.Before;
		import org.junit.Test;
		import org.mockito.Mock;

		import java.lang.reflect.Method;

		import static com.android.internal.telephony.TelephonyTestUtils.waitForMs;
		import static org.junit.Assert.assertEquals;
		import static org.mockito.Matchers.any;
		import static org.mockito.Matchers.eq;
		import static org.mockito.Mockito.doReturn;
		import static org.mockito.Mockito.times;
		import static org.mockito.Mockito.verify;

		public class DataConnectionTest extends TelephonyTest {

		@Mock
		DcTesterFailBringUpAll mDcTesterFailBringUpAll;
		@Mock
		ConnectionParams mCp;
		@Mock
		DisconnectParams mDcp;
		@Mock
		ApnContext mApnContext;
		@Mock
		DcFailBringUp mDcFailBringUp;

		private DataConnection mDc;
		private DcController mDcc;

		private ApnSetting mApn1 = new ApnSetting(
		2163, // id
		"44010", // numeric
		"sp-mode", // name
		"spmode.ne.jp", // apn
		"", // proxy
		"", // port
		"", // mmsc
		"", // mmsproxy
		"", // mmsport
		"", // user
		"", // password
		-1, // authtype
		new String[]{"default", "supl"}, // types
		"IP", // protocol
		"IP", // roaming_protocol
		true, // carrier_enabled
		0, // bearer
		0, // bearer_bitmask
		0, // profile_id
		false, // modem_cognitive
		0, // max_conns
		0, // wait_time
		0, // max_conns_time
		0, // mtu
		"", // mvno_type
		""); // mnvo_match_data

		private class DataConnectionTestHandler extends HandlerThread {

		private DataConnectionTestHandler(String name) {
		super(name);
		}

		@Override
		public void onLooperPrepared() {
		Handler h = new Handler();

		mDcc = DcController.makeDcc(mPhone, mDcTracker, h);
		mDc = DataConnection.makeDataConnection(mPhone, 0, mDcTracker, mDcTesterFailBringUpAll,
		mDcc);

		setReady(true);
		}
		}

		@Before
		public void setUp() throws Exception {
		logd("+Setup!");
		super.setUp(getClass().getSimpleName());

		doReturn("fake.action_detached").when(mPhone).getActionDetached();
		replaceInstance(ConnectionParams.class, "mApnContext", mCp, mApnContext);
		replaceInstance(ConnectionParams.class, "mRilRat", mCp,
		ServiceState.RIL_RADIO_TECHNOLOGY_UMTS);
		doReturn(mApn1).when(mApnContext).getApnSetting();
		doReturn(PhoneConstants.APN_TYPE_DEFAULT).when(mApnContext).getApnType();

		mDcFailBringUp.saveParameters(0, 0, -2);
		doReturn(mDcFailBringUp).when(mDcTesterFailBringUpAll).getDcFailBringUp();

		mContextFixture.putStringArrayResource(com.android.internal.R.array.
		config_mobile_tcp_buffers, new String[]{
		"umts:131072,262144,1452032,4096,16384,399360",
		"hspa:131072,262144,2441216,4096,16384,399360",
		"hsupa:131072,262144,2441216,4096,16384,399360",
		"hsdpa:131072,262144,2441216,4096,16384,399360",
		"hspap:131072,262144,2441216,4096,16384,399360",
		"edge:16384,32768,131072,4096,16384,65536",
		"gprs:4096,8192,24576,4096,8192,24576",
		"1xrtt:16384,32768,131070,4096,16384,102400",
		"evdo:131072,262144,1048576,4096,16384,524288",
		"lte:524288,1048576,8388608,262144,524288,4194304"});


		mDcp.mApnContext = mApnContext;

		new DataConnectionTestHandler(getClass().getSimpleName()).start();

		waitUntilReady();
		logd("-Setup!");
		}

		@After
		public void tearDown() throws Exception {
		logd("tearDown");
		mDc = null;
		mDcc = null;
		super.tearDown();
		}

		private IState getCurrentState() throws Exception{
		Method method = StateMachine.class.getDeclaredMethod("getCurrentState");
		method.setAccessible(true);
		return (IState) method.invoke(mDc);
		}

		@Test
		@SmallTest
		public void testSanity() throws Exception {
		assertEquals("DcInactiveState", getCurrentState().getName());
		}

		@Test
		@SmallTest
		public void testConnectEvent() throws Exception {
		testSanity();

		mDc.sendMessage(DataConnection.EVENT_CONNECT, mCp);
		waitForMs(100);

		verify(mCT, times(1)).registerForVoiceCallStarted(any(Handler.class),
		eq(DataConnection.EVENT_DATA_CONNECTION_VOICE_CALL_STARTED), eq(null));
		verify(mCT, times(1)).registerForVoiceCallEnded(any(Handler.class),
		eq(DataConnection.EVENT_DATA_CONNECTION_VOICE_CALL_ENDED), eq(null));

		verify(mSimulatedCommandsVerifier, times(1)).setupDataCall(
		eq(ServiceState.RIL_RADIO_TECHNOLOGY_UMTS), eq(0), eq("spmode.ne.jp"),
		eq(""), eq(""), eq(0), eq("IP"), any(Message.class));

		assertEquals("DcActiveState", getCurrentState().getName());
		}

		@Test
		@SmallTest
		public void testDisconnectEvent() throws Exception {
		testConnectEvent();

		mDc.sendMessage(DataConnection.EVENT_DISCONNECT, mDcp);
		waitForMs(100);

		verify(mSimulatedCommandsVerifier, times(1)).deactivateDataCall(eq(1),
		eq(RILConstants.DEACTIVATE_REASON_NONE), any(Message.class));

		assertEquals("DcInactiveState", getCurrentState().getName());
		}
		}
		No newline at end of file