Merge "Move away from deprecated FakeFeatureFactory.setupForTest()" (2b081bce) · Commits · e / os / android_packages_apps_Settings

tests/robotests/src/com/android/settings/DeviceAdminAddTest.java

+6 −10

Original line number	Diff line number	Diff line
		@@ -16,6 +16,10 @@

		package com.android.settings;

		import static org.mockito.Matchers.any;
		import static org.mockito.Matchers.eq;
		import static org.mockito.Mockito.verify;

		import android.content.Context;

		import com.android.internal.logging.nano.MetricsProto;
		@@ -25,30 +29,22 @@ import com.android.settings.testutils.SettingsRobolectricTestRunner;
		import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.Answers;
		import org.mockito.Mock;
		import org.mockito.MockitoAnnotations;
		import org.robolectric.Robolectric;
		import org.robolectric.annotation.Config;

		import static org.mockito.Matchers.any;
		import static org.mockito.Matchers.eq;
		import static org.mockito.Mockito.verify;

		@RunWith(SettingsRobolectricTestRunner.class)
		@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
		public class DeviceAdminAddTest {

		@Mock(answer = Answers.RETURNS_DEEP_STUBS)
		private Context mContext;
		private FakeFeatureFactory mFeatureFactory;
		private DeviceAdminAdd mDeviceAdminAdd;

		@Before
		public void setUp() {
		MockitoAnnotations.initMocks(this);
		FakeFeatureFactory.setupForTest(mContext);
		mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);

		mFeatureFactory = FakeFeatureFactory.setupForTest();
		mDeviceAdminAdd = Robolectric.buildActivity(DeviceAdminAdd.class).get();
		}

tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java

+1 −5

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package com.android.settings.accessibility;

		import static com.google.common.truth.Truth.assertThat;

		import static org.mockito.Mockito.doReturn;
		import static org.mockito.Mockito.spy;
		import static org.mockito.Mockito.when;
		@@ -29,7 +28,6 @@ import android.os.UserManager;
		import com.android.settings.TestConfig;
		import com.android.settings.testutils.FakeFeatureFactory;
		import com.android.settings.testutils.SettingsRobolectricTestRunner;
		import com.android.settingslib.wrapper.PackageManagerWrapper;

		import org.junit.Before;
		import org.junit.Test;
		@@ -54,15 +52,13 @@ public class ShortcutServicePickerFragmentTest {
		private Activity mActivity;
		@Mock
		private UserManager mUserManager;
		@Mock
		private PackageManagerWrapper mPackageManager;

		private ShortcutServicePickerFragment mFragment;

		@Before
		public void setUp() {
		MockitoAnnotations.initMocks(this);
		FakeFeatureFactory.setupForTest(mActivity);
		FakeFeatureFactory.setupForTest();
		when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);

		mFragment = spy(new ShortcutServicePickerFragment());

tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java

+9 −13

Original line number	Diff line number	Diff line
		@@ -15,6 +15,15 @@
		*/
		package com.android.settings.accounts;

		import static com.google.common.truth.Truth.assertThat;
		import static org.mockito.Answers.RETURNS_DEEP_STUBS;
		import static org.mockito.Matchers.any;
		import static org.mockito.Matchers.anyInt;
		import static org.mockito.Mockito.mock;
		import static org.mockito.Mockito.spy;
		import static org.mockito.Mockito.when;
		import static org.robolectric.Shadows.shadowOf;

		import android.accounts.Account;
		import android.accounts.AccountManager;
		import android.app.Activity;
		@@ -30,7 +39,6 @@ import android.support.v7.preference.PreferenceScreen;
		import com.android.internal.logging.nano.MetricsProto;
		import com.android.settings.TestConfig;
		import com.android.settings.dashboard.DashboardFeatureProviderImpl;
		import com.android.settings.testutils.FakeFeatureFactory;
		import com.android.settings.testutils.SettingsRobolectricTestRunner;
		import com.android.settingslib.drawer.CategoryKey;
		import com.android.settingslib.drawer.Tile;
		@@ -45,15 +53,6 @@ import org.robolectric.annotation.Config;
		import org.robolectric.shadows.ShadowApplication;
		import org.robolectric.util.ReflectionHelpers;

		import static com.google.common.truth.Truth.assertThat;
		import static org.mockito.Answers.RETURNS_DEEP_STUBS;
		import static org.mockito.Matchers.any;
		import static org.mockito.Matchers.anyInt;
		import static org.mockito.Mockito.mock;
		import static org.mockito.Mockito.spy;
		import static org.mockito.Mockito.when;
		import static org.robolectric.Shadows.shadowOf;

		@RunWith(SettingsRobolectricTestRunner.class)
		@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
		public class AccountDetailDashboardFragmentTest {
		@@ -127,9 +126,6 @@ public class AccountDetailDashboardFragmentTest {

		@Test
		public void refreshDashboardTiles_HasAccountType_shouldAddAccountNameToIntent() {
		FakeFeatureFactory.setupForTest(mContext);
		final FakeFeatureFactory featureFactory =
		(FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
		final DashboardFeatureProviderImpl dashboardFeatureProvider =
		new DashboardFeatureProviderImpl(mContext);
		final PackageManager packageManager = mock(PackageManager.class);

tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -80,7 +80,7 @@ public class AccountHeaderPreferenceControllerTest {
		@Before
		public void setUp() {
		MockitoAnnotations.initMocks(this);
		FakeFeatureFactory.setupForTest(mContext);
		FakeFeatureFactory.setupForTest();
		mHeaderPreference = new LayoutPreference(
		RuntimeEnvironment.application, R.layout.settings_entity_header);
		doReturn(mContext).when(mActivity).getApplicationContext();

tests/robotests/src/com/android/settings/applications/AppInfoDashboardFragmentTest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -100,7 +100,7 @@ public final class AppInfoDashboardFragmentTest {
		@Before
		public void setUp() {
		MockitoAnnotations.initMocks(this);
		mFeatureFactory = FakeFeatureFactory.setupForTest(mContext);
		mFeatureFactory = FakeFeatureFactory.setupForTest();
		mShadowContext = RuntimeEnvironment.application;
		mAppDetail = spy(new AppInfoDashboardFragment());
		doReturn(mActivity).when(mAppDetail).getActivity();