Merge "Some more unit tests for ImsPhone." into nyc-dev (6dea04ab) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/imsphone/ImsPhone.java

+4 −6

Original line number	Diff line number	Diff line
		@@ -816,8 +816,7 @@ public class ImsPhone extends ImsPhoneBase {
		return 0;
		}

		/* package */
		void getCallBarring(String facility, Message onComplete) {
		public void getCallBarring(String facility, Message onComplete) {
		if (DBG) Rlog.d(LOG_TAG, "getCallBarring facility=" + facility);
		Message resp;
		resp = obtainMessage(EVENT_GET_CALL_BARRING_DONE, onComplete);
		@@ -830,8 +829,8 @@ public class ImsPhone extends ImsPhoneBase {
		}
		}

		/* package */
		void setCallBarring(String facility, boolean lockState, String password, Message onComplete) {
		public void setCallBarring(String facility, boolean lockState, String password, Message
		onComplete) {
		if (DBG) Rlog.d(LOG_TAG, "setCallBarring facility=" + facility
		+ ", lockState=" + lockState);
		Message resp;
		@@ -863,8 +862,7 @@ public class ImsPhone extends ImsPhoneBase {
		mmi.sendUssd(ussdMessge);
		}

		/* package */
		void sendUSSD(String ussdString, Message response) {
		public void sendUSSD(String ussdString, Message response) {
		mCT.sendUSSD(ussdString, response);
		}

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -995,8 +995,7 @@ public class ImsPhoneCallTracker extends CallTracker {
		}
		}

		/* package */
		void cancelUSSD() {
		public void cancelUSSD() {
		if (mUssdSession == null) return;

		try {

tests/telephonytests/src/com/android/internal/telephony/imsphone/ImsPhoneTest.java

+50 −1

Original line number	Diff line number	Diff line
		@@ -270,6 +270,8 @@ public class ImsPhoneTest extends TelephonyTest {
		@Test
		@SmallTest
		public void testGettersAndPassThroughs() throws Exception {
		Message msg = mTestHandler.obtainMessage();

		assertNotNull(mImsPhoneUT.getServiceState());
		assertEquals(mImsCT, mImsPhoneUT.getCallTracker());

		@@ -332,6 +334,13 @@ public class ImsPhoneTest extends TelephonyTest {
		assertEquals(PhoneConstants.State.IDLE, mImsPhoneUT.getState());
		doReturn(PhoneConstants.State.RINGING).when(mImsCT).getState();
		assertEquals(PhoneConstants.State.RINGING, mImsPhoneUT.getState());

		mImsPhoneUT.sendUSSD("1234", msg);
		verify(mImsCT).sendUSSD("1234", msg);

		mImsPhoneUT.cancelUSSD();
		verify(mImsCT).cancelUSSD();

		}

		@Test
		@@ -443,4 +452,44 @@ public class ImsPhoneTest extends TelephonyTest {
		eq(ImsUtInterface.CDIV_CF_UNCONDITIONAL), eq("1234"),
		eq(CommandsInterface.SERVICE_CLASS_VOICE), eq(0), eq(msg));
		}

		@Test
		@SmallTest
		public void testCallWaiting() throws Exception {
		Message msg = mTestHandler.obtainMessage();
		mImsPhoneUT.getCallWaiting(msg);

		ArgumentCaptor<Message> messageArgumentCaptor = ArgumentCaptor.forClass(Message.class);
		verify(mImsUtInterface).queryCallWaiting(messageArgumentCaptor.capture());
		assertEquals(msg, messageArgumentCaptor.getValue().obj);

		mImsPhoneUT.setCallWaiting(true, msg);
		verify(mImsUtInterface).updateCallWaiting(eq(true),
		eq(CommandsInterface.SERVICE_CLASS_VOICE), messageArgumentCaptor.capture());
		assertEquals(msg, messageArgumentCaptor.getValue().obj);
		}

		@Test
		@SmallTest
		public void testCellBarring() throws Exception {
		Message msg = mTestHandler.obtainMessage();
		mImsPhoneUT.getCallBarring(CommandsInterface.CB_FACILITY_BAOC, msg);

		ArgumentCaptor<Message> messageArgumentCaptor = ArgumentCaptor.forClass(Message.class);
		verify(mImsUtInterface).queryCallBarring(eq(ImsUtInterface.CB_BAOC),
		messageArgumentCaptor.capture());
		assertEquals(msg, messageArgumentCaptor.getValue().obj);

		mImsPhoneUT.setCallBarring(CommandsInterface.CB_FACILITY_BAOIC, true, "abc", msg);
		verify(mImsUtInterface).updateCallBarring(eq(ImsUtInterface.CB_BOIC),
		eq(CommandsInterface.CF_ACTION_ENABLE), messageArgumentCaptor.capture(),
		(String[]) eq(null));
		assertEquals(msg, messageArgumentCaptor.getValue().obj);

		mImsPhoneUT.setCallBarring(CommandsInterface.CB_FACILITY_BAOICxH, false, "abc", msg);
		verify(mImsUtInterface).updateCallBarring(eq(ImsUtInterface.CB_BOIC_EXHC),
		eq(CommandsInterface.CF_ACTION_DISABLE), messageArgumentCaptor.capture(),
		(String[])eq(null));
		assertEquals(msg, messageArgumentCaptor.getValue().obj);
		}
		}