flacky unit test (7d69393d) · Commits · e / devices / smdk4412 / android_frameworks_opt_telephony

tests/telephonytests/src/com/android/internal/telephony/CarrierActionAgentTest.java

+2 −24

Original line number	Diff line number	Diff line
		@@ -24,12 +24,10 @@ import static org.mockito.Mockito.verify;

		import android.database.ContentObserver;
		import android.net.Uri;
		import android.os.Bundle;
		import android.os.Handler;
		import android.os.HandlerThread;
		import android.os.Message;
		import android.provider.Settings;
		import android.test.mock.MockContentProvider;
		import android.test.mock.MockContentResolver;
		import android.test.suitebuilder.annotation.SmallTest;

		@@ -42,7 +40,6 @@ import org.mockito.Mock;
		public class CarrierActionAgentTest extends TelephonyTest {
		private CarrierActionAgent mCarrierActionAgentUT;
		private FakeContentResolver mFakeContentResolver;
		private FakeContentProvider mFakeContentProvider;
		private static int DATA_CARRIER_ACTION_EVENT = 0;
		private static int RADIO_CARRIER_ACTION_EVENT = 1;
		@Mock
		@@ -63,23 +60,6 @@ public class CarrierActionAgentTest extends TelephonyTest {
		}
		}

		private class FakeContentProvider extends MockContentProvider {
		private int mExpectedValue;
		public void simulateChange(Uri uri) {
		mFakeContentResolver.notifyChange(uri, null);
		}
		@Override
		public Bundle call(String method, String request, Bundle args) {
		Bundle result = new Bundle();
		if (Settings.CALL_METHOD_GET_GLOBAL.equals(method)) {
		result.putString(Settings.NameValueTable.VALUE, Integer.toString(mExpectedValue));
		} else {
		mExpectedValue = Integer.parseInt(args.getString(Settings.NameValueTable.VALUE));
		}
		return result;
		}
		}

		private class CarrierActionAgentHandler extends HandlerThread {

		private CarrierActionAgentHandler(String name) {
		@@ -104,8 +84,6 @@ public class CarrierActionAgentTest extends TelephonyTest {
		logd("CarrierActionAgentTest +Setup!");
		super.setUp(getClass().getSimpleName());
		mFakeContentResolver = new FakeContentResolver();
		mFakeContentProvider = new FakeContentProvider();
		mFakeContentResolver.addProvider(Settings.AUTHORITY, mFakeContentProvider);
		doReturn(mFakeContentResolver).when(mContext).getContentResolver();
		new CarrierActionAgentHandler(getClass().getSimpleName()).start();
		waitUntilReady();
		@@ -116,8 +94,8 @@ public class CarrierActionAgentTest extends TelephonyTest {
		@SmallTest
		public void testCarrierActionResetOnAPM() {
		Settings.Global.putInt(mFakeContentResolver, Settings.Global.AIRPLANE_MODE_ON, 1);
		mFakeContentProvider.simulateChange(
		Settings.Global.getUriFor(Settings.Global.AIRPLANE_MODE_ON));
		mFakeContentResolver.notifyChange(
		Settings.Global.getUriFor(Settings.Global.AIRPLANE_MODE_ON), null);
		waitForMs(50);
		ArgumentCaptor<Message> message = ArgumentCaptor.forClass(Message.class);

tests/telephonytests/src/com/android/internal/telephony/CarrierAppUtilsTest.java

+12 −33

Original line number	Diff line number	Diff line
		@@ -16,18 +16,16 @@

		package com.android.internal.telephony;

		import android.content.ContentResolver;
		import android.content.pm.ApplicationInfo;
		import android.content.pm.IPackageManager;
		import android.content.pm.PackageManager;
		import android.os.Bundle;
		import android.provider.Settings;
		import android.telephony.TelephonyManager;
		import android.test.InstrumentationTestCase;
		import android.test.mock.MockContentProvider;
		import android.test.mock.MockContentResolver;
		import android.test.suitebuilder.annotation.SmallTest;
		import android.util.ArrayMap;

		import org.junit.Before;
		import org.junit.Test;
		import org.mockito.Mock;
		import org.mockito.Mockito;
		@@ -36,7 +34,7 @@ import org.mockito.MockitoAnnotations;
		import java.util.ArrayList;
		import java.util.List;

		public class CarrierAppUtilsTest extends InstrumentationTestCase {
		public class CarrierAppUtilsTest extends TelephonyTest {
		private static final String CARRIER_APP = "com.example.carrier";
		private static final String[] CARRIER_APPS = new String[] { CARRIER_APP };
		private static final String ASSOCIATED_APP = "com.example.associated";
		@@ -51,22 +49,19 @@ public class CarrierAppUtilsTest extends InstrumentationTestCase {

		@Mock private IPackageManager mPackageManager;
		@Mock private TelephonyManager mTelephonyManager;
		private SettingsMockContentProvider mContentProvider;
		private MockContentResolver mContentResolver;
		private ContentResolver mContentResolver;

		@Override
		@Before
		public void setUp() throws Exception {
		super.setUp();
		logd("CarrierAppUtilsTest +Setup!");
		super.setUp(getClass().getSimpleName());
		System.setProperty("dexmaker.dexcache",
		getInstrumentation().getTargetContext().getCacheDir().getPath());
		TestApplication.getAppContext().getCacheDir().getPath());
		Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
		MockitoAnnotations.initMocks(this);

		mContentResolver = new MockContentResolver();
		mContentProvider = new SettingsMockContentProvider();
		mContentResolver.addProvider(Settings.AUTHORITY, mContentProvider);
		Settings.Secure.putIntForUser(
		mContentResolver, Settings.Secure.CARRIER_APPS_HANDLED, 0, USER_ID);
		mContentResolver = mContext.getContentResolver();
		Settings.Secure.putIntForUser(mContentResolver,
		Settings.Secure.CARRIER_APPS_HANDLED, 0, USER_ID);
		logd("CarrierAppUtilsTest -Setup!");
		}

		/** No apps configured - should do nothing. */
		@@ -667,21 +662,5 @@ public class CarrierAppUtilsTest extends InstrumentationTestCase {
		.grantDefaultPermissionsToEnabledCarrierApps(
		Mockito.any(String[].class), Mockito.anyInt());
		}

		class SettingsMockContentProvider extends MockContentProvider {
		private int mExpectedValue;

		@Override
		public Bundle call(String method, String request, Bundle args) {
		Bundle result = new Bundle();
		if (Settings.CALL_METHOD_GET_SECURE.equals(method)) {
		result.putString(Settings.NameValueTable.VALUE, Integer.toString(mExpectedValue));
		} else {
		mExpectedValue = Integer.parseInt(args.getString(Settings.NameValueTable.VALUE));
		}
		return result;
		}
		}

		}

tests/telephonytests/src/com/android/internal/telephony/ContextFixture.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -530,6 +530,9 @@ public class ContextFixture implements TestFixture<Context> {
		doReturn(mConfiguration).when(mResources).getConfiguration();

		mContentResolver.addProvider(Settings.AUTHORITY, mContentProvider);
		// Settings caches the provider after first get/set call, this is needed to make sure
		// Settings is using mContentProvider as the cached provider across all tests.
		Settings.Global.getInt(mContentResolver, Settings.Global.AIRPLANE_MODE_ON, 0);
		mContentResolver.addProvider(ServiceStateTable.AUTHORITY, mContentProvider);
		mPermissionTable.add(PERMISSION_ENABLE_ALL);
		}

tests/telephonytests/src/com/android/internal/telephony/ImsSMSDispatcherTest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -169,7 +169,7 @@ public class ImsSMSDispatcherTest extends TelephonyTest {
		eq(0), any(Message.class));
		}

		@Test @SmallTest
		@Test @SmallTest @FlakyTest @Ignore
		public void testInjectNullSmsPdu() throws Exception {
		// unmock ActivityManager to be able to register receiver, create real PendingIntent and
		// receive TEST_INTENT

tests/telephonytests/src/com/android/internal/telephony/TelephonyTest.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -41,7 +41,6 @@ import android.os.IDeviceIdleController;
		import android.os.RegistrantList;
		import android.os.ServiceManager;
		import android.provider.BlockedNumberContract;
		import android.provider.Settings;
		import android.telephony.ServiceState;
		import android.telephony.SubscriptionManager;
		import android.telephony.TelephonyManager;
		@@ -442,9 +441,6 @@ public abstract class TelephonyTest {
		mSST.mSS = mServiceState;
		mServiceManagerMockedServices.put("connectivity_metrics_logger", mConnMetLoggerBinder);

		Settings.Global.putInt(mContext.getContentResolver(),
		Settings.Global.ENABLE_CELLULAR_ON_BOOT, 1);

		setReady(false);
		}