Merge "Fix EuiccControllerTest's dependency on activity manager internals." (7ea982ee) · Commits · e / devices / smdk4412 / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/euicc/EuiccController.java

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -395,7 +395,9 @@ public class EuiccController extends IEuiccController.Stub {
	});		});
	}		}

	void sendResult(PendingIntent callbackIntent, int resultCode, Intent extrasIntent) {		/** Dispatch the given callback intent with the given result code and data. */
			@VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE)
			public void sendResult(PendingIntent callbackIntent, int resultCode, Intent extrasIntent) {
	try {		try {
	callbackIntent.send(mContext, resultCode, extrasIntent);		callbackIntent.send(mContext, resultCode, extrasIntent);
	} catch (PendingIntent.CanceledException e) {		} catch (PendingIntent.CanceledException e) {

tests/telephonytests/src/com/android/internal/telephony/euicc/EuiccControllerTest.java

+19 −8

Original line number	Original line	Diff line number	Diff line
	@@ -52,7 +52,6 @@ import org.junit.After;
	import org.junit.Before;		import org.junit.Before;
	import org.junit.Test;		import org.junit.Test;
	import org.junit.runner.RunWith;		import org.junit.runner.RunWith;
	import org.mockito.ArgumentCaptor;
	import org.mockito.Mock;		import org.mockito.Mock;
	import org.mockito.Mockito;		import org.mockito.Mockito;
	import org.mockito.invocation.InvocationOnMock;		import org.mockito.invocation.InvocationOnMock;
	@@ -89,9 +88,15 @@ public class EuiccControllerTest extends TelephonyTest {
	private TestEuiccController mController;		private TestEuiccController mController;

	private static class TestEuiccController extends EuiccController {		private static class TestEuiccController extends EuiccController {
			// Captured arguments to addResolutionIntent
	private String mResolutionAction;		private String mResolutionAction;
	private EuiccOperation mOp;		private EuiccOperation mOp;

			// Captured arguments to sendResult.
			private PendingIntent mCallbackIntent;
			private int mResultCode;
			private Intent mExtrasIntent;

	TestEuiccController(Context context, EuiccConnector connector) {		TestEuiccController(Context context, EuiccConnector connector) {
	super(context, connector);		super(context, connector);
	}		}
	@@ -102,6 +107,14 @@ public class EuiccControllerTest extends TelephonyTest {
	mResolutionAction = resolutionAction;		mResolutionAction = resolutionAction;
	mOp = op;		mOp = op;
	}		}

			@Override
			public void sendResult(PendingIntent callbackIntent, int resultCode, Intent extrasIntent) {
			assertNull("sendResult called twice unexpectedly", mCallbackIntent);
			mCallbackIntent = callbackIntent;
			mResultCode = resultCode;
			mExtrasIntent = extrasIntent;
			}
	}		}

	@Before		@Before
	@@ -420,17 +433,15 @@ public class EuiccControllerTest extends TelephonyTest {

	private Intent verifyIntentSent(int resultCode, int detailedCode)		private Intent verifyIntentSent(int resultCode, int detailedCode)
	throws RemoteException {		throws RemoteException {
	ArgumentCaptor<Intent> intentCapture = ArgumentCaptor.forClass(Intent.class);		assertNotNull(mController.mCallbackIntent);
	verify(mIActivityManager).sendIntentSender(		assertEquals(resultCode, mController.mResultCode);
	any(), eq(resultCode), intentCapture.capture(), any(), any(), any(), any());		if (mController.mExtrasIntent == null) {
	Intent capturedIntent = intentCapture.getValue();
	if (capturedIntent == null) {
	assertEquals(0, detailedCode);		assertEquals(0, detailedCode);
	} else {		} else {
	assertEquals(detailedCode,		assertEquals(detailedCode,
	capturedIntent.getIntExtra(		mController.mExtrasIntent.getIntExtra(
	EuiccManager.EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE, 0));		EuiccManager.EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE, 0));
	}		}
	return capturedIntent;		return mController.mExtrasIntent;
	}		}
	}		}