From 802b92259374c63fc14e863350c59b8301b063e9 Mon Sep 17 00:00:00 2001 From: Eric Rahm Date: Thu, 13 Jul 2023 12:05:20 +0000 Subject: [PATCH] Revert "Test Fix SettingRobolectricTest Fail" This reverts commit 818f77cd1f659fee8d2885002b69180774757149. Reason for revert: Underlying issue fixed in ag/23454315. Bug: b/275023433 Test: atest SettingsGlobalRoboTests Change-Id: I1af272efd00b3c5bd35310512f5712d5d1c7d834 --- .../settings/AllInOneTetherSettingsTest.java | 2 - .../settings/MainClearConfirmTest.java | 5 +- .../com/android/settings/MainClearTest.java | 7 +-- .../settings/ResetNetworkConfirmTest.java | 11 +++-- .../android/settings/ResetNetworkTest.java | 5 +- .../RestrictedListPreferenceTest.java | 4 +- .../settings/SettingsDumpServiceTest.java | 2 - .../HearingAidDialogFragmentTest.java | 4 +- .../HearingAidPairingDialogFragmentTest.java | 4 +- .../accessibility/HearingAidUtilsTest.java | 4 +- ...hNotificationPreferenceControllerTest.java | 6 +-- .../TextReadingPreferenceFragmentTest.java | 5 +- ...etoothDevicesPreferenceControllerTest.java | 5 +- .../AccountSyncPreferenceControllerTest.java | 4 +- ...ChooseAccountPreferenceControllerTest.java | 4 +- ...EmergencyInfoPreferenceControllerTest.java | 4 +- ...RemoveAccountPreferenceControllerTest.java | 5 +- .../AppBatteryPreferenceControllerTest.java | 2 - .../appinfo/AppInfoDashboardFragmentTest.java | 2 - .../AppMemoryPreferenceControllerTest.java | 3 -- .../AppSettingPreferenceControllerTest.java | 6 --- ...pShortcutPreferenceControllerBaseTest.java | 6 +-- .../InstantAppButtonDialogFragmentTest.java | 5 +- ...DefaultAssistPreferenceControllerTest.java | 2 - .../premiumsms/PremiumSmsControllerTest.java | 2 - ...miumSmsScreenPreferenceControllerTest.java | 2 - .../EnabledVrListenersControllerTest.java | 2 - ...istenerScreenPreferenceControllerTest.java | 2 - ...ActiveUnlockRequireBiometricSetupTest.java | 5 +- ...ettingsFooterPreferenceControllerTest.java | 2 - .../FingerprintEnrollFindSensorTest.java | 12 ++--- .../SetupFingerprintEnrollFindSensorTest.java | 5 +- .../SetupFingerprintEnrollFinishTest.java | 4 +- .../BluetoothDeviceDetailsFragmentTest.java | 5 +- .../BluetoothFindBroadcastsFragmentTest.java | 6 +-- ...ailableMediaDeviceGroupControllerTest.java | 6 +-- ...nectedDevicesPreferenceControllerTest.java | 2 - .../UsbDetailsFunctionsControllerTest.java | 2 - .../settings/core/CategoryMixinTest.java | 7 ++- .../core/InstrumentedActivityTest.java | 5 +- .../PreferenceControllerListHelperTest.java | 3 -- .../core/PreferenceXmlParserUtilsTest.java | 2 - .../dashboard/DashboardFragmentTest.java | 2 - .../settings/datausage/AppDataUsageTest.java | 2 - .../ChartDataUsagePreferenceTest.java | 5 +- .../settings/datausage/DataUsageListTest.java | 2 - .../BaseTimeZonePreferenceControllerTest.java | 7 +-- .../FixedOffsetPreferenceControllerTest.java | 5 +- .../RegionPreferenceControllerTest.java | 7 +-- .../timezone/RegionSearchPickerTest.java | 4 +- .../RegionZonePreferenceControllerTest.java | 5 +- ...raLaserSensorPreferenceControllerTest.java | 2 - ...orTemperaturePreferenceControllerTest.java | 2 - .../DevelopmentMemtagPageTest.java | 1 - ...lopmentMemtagPreferenceControllerTest.java | 2 - ...velopmentSettingsDisabledActivityTest.java | 4 +- ...RebootWithMtePreferenceControllerTest.java | 2 - ...ityPatchLevelPreferenceControllerTest.java | 5 +- .../legal/ModuleLicensePreferenceTest.java | 5 +- ...rAttributionsPreferenceControllerTest.java | 2 - ...splayAlwaysOnPreferenceControllerTest.java | 3 -- ...ightnessLevelPreferenceControllerTest.java | 5 +- ...rivialPrivacyPreferenceControllerTest.java | 3 -- ...SmartAutoRotatePreferenceFragmentTest.java | 2 - ...pLevelDisplayPreferenceControllerTest.java | 2 - ...ActionDisabledByAdminDialogHelperTest.java | 4 +- ...geDeviceAdminPreferenceControllerTest.java | 2 - .../FlashlightHandleActivityTest.java | 2 - .../SettingsHomepageActivityTest.java | 2 - .../ContextualCardManagerTest.java | 3 -- ...BackgroundDataConditionControllerTest.java | 4 +- .../WorkModeConditionControllerTest.java | 4 +- ...uggestionContextualCardControllerTest.java | 2 - .../SliceContextualCardControllerTest.java | 1 - ...ameControllerPreferenceControllerTest.java | 2 - .../InputMethodAndSubtypeEnablerTest.java | 4 +- .../KeyboardLayoutPickerControllerTest.java | 2 - ...rtualKeyboardPreferenceControllerTest.java | 2 - .../LanguageAndInputSettingsTest.java | 2 - ...PhoneLanguagePreferenceControllerTest.java | 2 - .../language/PointerSpeedControllerTest.java | 36 +++++++------- .../LocaleDialogFragmentTest.java | 4 +- ...ectedServicesPreferenceControllerTest.java | 3 -- ...ationServicesPreferenceControllerTest.java | 2 - .../MobileNetworkSummaryControllerTest.java | 2 + .../PrivateDnsPreferenceControllerTest.java | 3 -- ...ChargingSoundPreferenceControllerTest.java | 2 - .../MediaVolumePreferenceControllerTest.java | 2 - ...ationRingtonePreferenceControllerTest.java | 2 - .../RedactionInterstitialTest.java | 2 - ...reenLockSoundPreferenceControllerTest.java | 2 - .../TouchSoundPreferenceControllerTest.java | 2 - .../password/ChooseLockPatternTest.java | 2 - .../ChooseLockSettingsHelperTest.java | 20 +++----- .../password/ConfirmLockPasswordTest.java | 3 -- .../password/ConfirmLockPatternTest.java | 8 +-- .../password/SetupChooseLockGenericTest.java | 6 +-- .../password/SetupChooseLockPasswordTest.java | 8 +-- .../password/SetupChooseLockPatternTest.java | 12 +---- .../password/SetupSkipDialogTest.java | 4 +- .../android/settings/password/TestUtils.java | 7 +-- .../search/BaseSearchIndexProviderTest.java | 3 -- .../search/SearchFeatureProviderImplTest.java | 7 +-- .../SettingsSearchIndexablesProviderTest.java | 2 - ...ryptionStatusPreferenceControllerTest.java | 2 - .../MemtagPreferenceControllerTest.java | 2 - ...ScreenPinningPreferenceControllerTest.java | 2 - .../ShowPasswordPreferenceControllerTest.java | 2 - .../PinPrivacyPreferenceControllerTest.java | 2 - ...geTrustAgentsPreferenceControllerTest.java | 2 - ...rustAgentListPreferenceControllerTest.java | 3 -- .../slices/SettingsSliceProviderTest.java | 4 +- .../slices/SliceDataConverterTest.java | 2 - .../SupportPreferenceControllerTest.java | 4 +- .../settings/survey/SurveyMixinTest.java | 4 +- ...lSystemUpdatePreferenceControllerTest.java | 2 - .../system/ResetPreferenceControllerTest.java | 2 - .../SystemUpdatePreferenceControllerTest.java | 2 - .../ContrastPreferenceControllerTest.java | 2 - ...outToDockUserPreferenceControllerTest.java | 3 -- .../users/UserDetailsSettingsTest.java | 2 - .../settings/users/UserSettingsTest.java | 2 - .../utils/ActivityControllerWrapper.java | 49 ------------------- .../WallpaperSuggestionActivityTest.java | 11 ++--- ...WallpaperTypePreferenceControllerTest.java | 4 +- .../widget/EntityHeaderControllerTest.java | 2 - .../widget/SeekBarPreferenceTest.java | 3 -- .../SettingsMainSwitchPreferenceTest.java | 2 - .../settings/widget/VideoPreferenceTest.java | 2 - .../wifi/ConfigureWifiSettingsTest.java | 3 -- .../NetworkRequestDialogActivityTest.java | 7 +-- .../NetworkRequestDialogFragmentTest.java | 10 ++-- .../settings/wifi/WifiDialogActivityTest.java | 16 ++---- .../wifi/WifiNoInternetDialogTest.java | 10 ++-- ...PrimarySwitchPreferenceControllerTest.java | 2 - .../wifi/WifiScanModeActivityTest.java | 8 ++- .../AddAppNetworksFragmentTest.java | 4 +- .../WifiCallingDisclaimerFragmentTest.java | 4 +- .../dpp/WifiDppConfiguratorActivityTest.java | 9 ++-- .../wifi/dpp/WifiDppEnrolleeActivityTest.java | 13 ++--- .../wifi/p2p/WifiP2pSettingsTest.java | 4 +- .../SavedAccessPointsWifiSettings2Test.java | 4 +- 142 files changed, 130 insertions(+), 523 deletions(-) delete mode 100644 tests/robotests/src/com/android/settings/utils/ActivityControllerWrapper.java diff --git a/tests/robotests/src/com/android/settings/AllInOneTetherSettingsTest.java b/tests/robotests/src/com/android/settings/AllInOneTetherSettingsTest.java index f4a20feb28f..f2a55c1d935 100644 --- a/tests/robotests/src/com/android/settings/AllInOneTetherSettingsTest.java +++ b/tests/robotests/src/com/android/settings/AllInOneTetherSettingsTest.java @@ -52,7 +52,6 @@ import com.android.settings.wifi.tether.WifiTetherSecurityPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -186,7 +185,6 @@ public class AllInOneTetherSettingsTest { .getPreferenceControllers(mContext)).isNotEmpty(); } - @Ignore @Test public void createPreferenceControllers_hasAutoOffPreference() { assertThat(mAllInOneTetherSettings.createPreferenceControllers(mContext) diff --git a/tests/robotests/src/com/android/settings/MainClearConfirmTest.java b/tests/robotests/src/com/android/settings/MainClearConfirmTest.java index 43fe9cacf7e..b866c964f03 100644 --- a/tests/robotests/src/com/android/settings/MainClearConfirmTest.java +++ b/tests/robotests/src/com/android/settings/MainClearConfirmTest.java @@ -31,8 +31,6 @@ import android.widget.TextView; import androidx.fragment.app.FragmentActivity; -import com.android.settings.utils.ActivityControllerWrapper; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -66,8 +64,7 @@ public class MainClearConfirmTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - mActivity = spy((FragmentActivity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(FragmentActivity.class)).get()); + mActivity = Robolectric.setupActivity(FragmentActivity.class); mMainClearConfirm = spy(new MainClearConfirm()); } diff --git a/tests/robotests/src/com/android/settings/MainClearTest.java b/tests/robotests/src/com/android/settings/MainClearTest.java index d782e6df1a6..dc17ddac831 100644 --- a/tests/robotests/src/com/android/settings/MainClearTest.java +++ b/tests/robotests/src/com/android/settings/MainClearTest.java @@ -52,12 +52,10 @@ import androidx.fragment.app.FragmentActivity; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settings.testutils.shadow.ShadowUtils; -import com.android.settings.utils.ActivityControllerWrapper; import com.android.settingslib.development.DevelopmentSettingsEnabler; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; @@ -113,8 +111,7 @@ public class MainClearTest { @Override boolean showAnySubscriptionInfo(Context context) { return true; } }); - mActivity = spy((FragmentActivity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(FragmentActivity.class)).get()); + mActivity = Robolectric.setupActivity(FragmentActivity.class); mShadowActivity = Shadows.shadowOf(mActivity); UserManager userManager = mActivity.getSystemService(UserManager.class); mShadowUserManager = Shadow.extract(userManager); @@ -151,7 +148,6 @@ public class MainClearTest { .isTrue(); } - @Ignore @Test public void testShowFinalConfirmation_eraseEsimVisible_eraseEsimUnchecked() { final Context context = mock(Context.class); @@ -237,7 +233,6 @@ public class MainClearTest { assertThat(mMainClear.showWipeEuicc()).isTrue(); } - @Ignore @Test public void testShowWipeEuicc_developerMode_unprovisioned() { prepareEuiccState( diff --git a/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java b/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java index 34012d3ea44..9ade7763315 100644 --- a/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java +++ b/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java @@ -18,8 +18,14 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import android.content.Context; +import android.os.Looper; import android.view.LayoutInflater; import android.widget.TextView; @@ -27,10 +33,10 @@ import androidx.fragment.app.FragmentActivity; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import com.android.settings.testutils.shadow.ShadowRecoverySystem; -import com.android.settings.utils.ActivityControllerWrapper; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -57,8 +63,7 @@ public class ResetNetworkConfirmTest { MockitoAnnotations.initMocks(this); mResetNetworkConfirm = new ResetNetworkConfirm(); - mActivity = spy((FragmentActivity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(FragmentActivity.class)).get()); + mActivity = spy(Robolectric.setupActivity(FragmentActivity.class)); mResetNetworkConfirm.mActivity = mActivity; } diff --git a/tests/robotests/src/com/android/settings/ResetNetworkTest.java b/tests/robotests/src/com/android/settings/ResetNetworkTest.java index 0689e4a5da6..0c2c7e8a5f7 100644 --- a/tests/robotests/src/com/android/settings/ResetNetworkTest.java +++ b/tests/robotests/src/com/android/settings/ResetNetworkTest.java @@ -27,8 +27,6 @@ import android.content.Intent; import android.view.View; import android.widget.CheckBox; -import com.android.settings.utils.ActivityControllerWrapper; - import org.junit.Before; import org.junit.Ignore; import org.junit.Test; @@ -43,8 +41,7 @@ public class ResetNetworkTest { @Before public void setUp() { - mActivity = (Activity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(Activity.class)).get(); + mActivity = Robolectric.setupActivity(Activity.class); mResetNetwork = spy(new ResetNetwork()); when(mResetNetwork.getContext()).thenReturn(mActivity); mResetNetwork.mEsimContainer = new View(mActivity); diff --git a/tests/robotests/src/com/android/settings/RestrictedListPreferenceTest.java b/tests/robotests/src/com/android/settings/RestrictedListPreferenceTest.java index 232933ce2d1..9660b9db4cf 100644 --- a/tests/robotests/src/com/android/settings/RestrictedListPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/RestrictedListPreferenceTest.java @@ -30,7 +30,6 @@ import android.os.Bundle; import android.util.AttributeSet; import com.android.settings.testutils.shadow.ShadowUserManager; -import com.android.settings.utils.ActivityControllerWrapper; import com.android.settingslib.RestrictedPreferenceHelper; import org.junit.Before; @@ -59,8 +58,7 @@ public class RestrictedListPreferenceTest { @Before public void setUp() { - mActivity = (Activity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(Activity.class)).get(); + mActivity = Robolectric.setupActivity(Activity.class); mShadowKeyguardManager = Shadows.shadowOf(application.getSystemService(KeyguardManager.class)); mMockHelper = mock(RestrictedPreferenceHelper.class); diff --git a/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java b/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java index 2e5c14498d4..9d8841fb55a 100644 --- a/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java +++ b/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java @@ -34,7 +34,6 @@ import com.android.settings.fuelgauge.batterytip.AnomalyConfigJobService; import org.json.JSONException; import org.json.JSONObject; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -100,7 +99,6 @@ public class SettingsDumpServiceTest { ANOMALY_VERSION); } - @Ignore @Test public void testDump_printServiceAsKey() { mResolveInfo.activityInfo = new ActivityInfo(); diff --git a/tests/robotests/src/com/android/settings/accessibility/HearingAidDialogFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/HearingAidDialogFragmentTest.java index 7a0853fa58d..adfd5733547 100644 --- a/tests/robotests/src/com/android/settings/accessibility/HearingAidDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/HearingAidDialogFragmentTest.java @@ -34,7 +34,6 @@ import androidx.fragment.app.FragmentActivity; import com.android.settings.SettingsActivity; import com.android.settings.bluetooth.BluetoothPairingDetail; import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; -import com.android.settings.utils.ActivityControllerWrapper; import org.junit.Before; import org.junit.Rule; @@ -65,8 +64,7 @@ public class HearingAidDialogFragmentTest { @Before public void setUpTestFragment() { mFragment = spy(HearingAidDialogFragment.newInstance()); - mActivity = (FragmentActivity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(FragmentActivity.class)).get(); + mActivity = Robolectric.setupActivity(FragmentActivity.class); when(mFragment.getActivity()).thenReturn(mActivity); } diff --git a/tests/robotests/src/com/android/settings/accessibility/HearingAidPairingDialogFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/HearingAidPairingDialogFragmentTest.java index e632f97cca7..6c1de594bf1 100644 --- a/tests/robotests/src/com/android/settings/accessibility/HearingAidPairingDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/HearingAidPairingDialogFragmentTest.java @@ -45,7 +45,6 @@ import com.android.settings.bluetooth.HearingAidPairingDialogFragment; import com.android.settings.bluetooth.Utils; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import com.android.settings.testutils.shadow.ShadowBluetoothUtils; -import com.android.settings.utils.ActivityControllerWrapper; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; import com.android.settingslib.bluetooth.HearingAidInfo; @@ -171,8 +170,7 @@ public class HearingAidPairingDialogFragmentTest { private void setupDialog(int launchPage) { mFragment = spy( HearingAidPairingDialogFragment.newInstance(TEST_DEVICE_ADDRESS, launchPage)); - mActivity = (FragmentActivity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(FragmentActivity.class)).get(); + mActivity = Robolectric.setupActivity(FragmentActivity.class); mFragmentManager = mActivity.getSupportFragmentManager(); when(mFragment.getActivity()).thenReturn(mActivity); doReturn(mFragmentManager).when(mFragment).getParentFragmentManager(); diff --git a/tests/robotests/src/com/android/settings/accessibility/HearingAidUtilsTest.java b/tests/robotests/src/com/android/settings/accessibility/HearingAidUtilsTest.java index 986308723df..6d45af2b380 100644 --- a/tests/robotests/src/com/android/settings/accessibility/HearingAidUtilsTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/HearingAidUtilsTest.java @@ -35,7 +35,6 @@ import com.android.settings.bluetooth.Utils; import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import com.android.settings.testutils.shadow.ShadowBluetoothUtils; -import com.android.settings.utils.ActivityControllerWrapper; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; import com.android.settingslib.bluetooth.CsipSetCoordinatorProfile; @@ -92,8 +91,7 @@ public class HearingAidUtilsTest { @Before public void setUp() { setupEnvironment(); - final FragmentActivity mActivity = (FragmentActivity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(FragmentActivity.class)).get(); + final FragmentActivity mActivity = Robolectric.setupActivity(FragmentActivity.class); shadowMainLooper().idle(); mFragmentManager = mActivity.getSupportFragmentManager(); ShadowAlertDialogCompat.reset(); diff --git a/tests/robotests/src/com/android/settings/accessibility/ScreenFlashNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/ScreenFlashNotificationPreferenceControllerTest.java index 8160fabbb7c..95a9438b5ba 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ScreenFlashNotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/ScreenFlashNotificationPreferenceControllerTest.java @@ -40,7 +40,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.utils.ActivityControllerWrapper; import org.junit.After; import org.junit.Before; @@ -91,10 +90,7 @@ public class ScreenFlashNotificationPreferenceControllerTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - FragmentActivity fragmentActivity = (FragmentActivity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(FragmentActivity.class)).get(); - - + FragmentActivity fragmentActivity = Robolectric.setupActivity(FragmentActivity.class); Context context = fragmentActivity.getApplicationContext(); ShadowScreenFlashNotificationColorDialogFragment.setInstance(mDialogFragment); ShadowFlashNotificationsUtils.setColorDescriptionText(COLOR_DESCRIPTION_TEXT); diff --git a/tests/robotests/src/com/android/settings/accessibility/TextReadingPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/TextReadingPreferenceFragmentTest.java index 1d5370f1f34..8212ba2d31b 100644 --- a/tests/robotests/src/com/android/settings/accessibility/TextReadingPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/TextReadingPreferenceFragmentTest.java @@ -40,7 +40,6 @@ import com.android.settings.R; import com.android.settings.accessibility.AccessibilityDialogUtils.DialogEnums; import com.android.settings.accessibility.TextReadingResetController.ResetStateListener; import com.android.settings.testutils.XmlTestUtils; -import com.android.settings.utils.ActivityControllerWrapper; import org.junit.Before; import org.junit.Rule; @@ -83,9 +82,7 @@ public class TextReadingPreferenceFragmentTest { when(mFragment.getPreferenceManager()).thenReturn(mPreferenceManager); when(mFragment.getPreferenceManager().getContext()).thenReturn(mContext); when(mFragment.getContext()).thenReturn(mContext); - when(mFragment.getActivity()).thenReturn((FragmentActivity) - ActivityControllerWrapper.setup(Robolectric.buildActivity( - FragmentActivity.class)).get()); + when(mFragment.getActivity()).thenReturn(Robolectric.setupActivity(FragmentActivity.class)); // Avoid a NPE is happened in ShadowWindowManagerGlobal doReturn(mock(DisplaySizeData.class)).when(mFragment).createDisplaySizeData(mContext); diff --git a/tests/robotests/src/com/android/settings/accessibility/ViewAllBluetoothDevicesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/ViewAllBluetoothDevicesPreferenceControllerTest.java index 2c59354a48d..6c9fbfc1f8c 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ViewAllBluetoothDevicesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/ViewAllBluetoothDevicesPreferenceControllerTest.java @@ -30,8 +30,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.test.core.app.ApplicationProvider; -import com.android.settings.utils.ActivityControllerWrapper; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -66,8 +64,7 @@ public class ViewAllBluetoothDevicesPreferenceControllerTest { @Before public void setUp() { - mActivity = (FragmentActivity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(FragmentActivity.class)).get(); + mActivity = Robolectric.setupActivity(FragmentActivity.class); when(mFragment.getContext()).thenReturn(mContext); when(mFragment.getActivity()).thenReturn(mActivity); diff --git a/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java index e760e624b0f..1084102c2c4 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java @@ -36,7 +36,6 @@ import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.testutils.shadow.ShadowAccountManager; import com.android.settings.testutils.shadow.ShadowContentResolver; -import com.android.settings.utils.ActivityControllerWrapper; import org.junit.After; import org.junit.Before; @@ -63,8 +62,7 @@ public class AccountSyncPreferenceControllerTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - mActivity = (Activity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(Activity.class)).get(); + mActivity = Robolectric.setupActivity(Activity.class); ShadowApplication.getInstance().setSystemService(Context.ACCOUNT_SERVICE, mAccountManager); when(mAccountManager.getAuthenticatorTypesAsUser(anyInt())).thenReturn( diff --git a/tests/robotests/src/com/android/settings/accounts/ChooseAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/ChooseAccountPreferenceControllerTest.java index 5c4af0d78cb..783eebe0da1 100644 --- a/tests/robotests/src/com/android/settings/accounts/ChooseAccountPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/ChooseAccountPreferenceControllerTest.java @@ -41,7 +41,6 @@ import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.shadow.ShadowAccountManager; import com.android.settings.testutils.shadow.ShadowContentResolver; import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal; -import com.android.settings.utils.ActivityControllerWrapper; import org.junit.After; import org.junit.Before; @@ -69,8 +68,7 @@ public class ChooseAccountPreferenceControllerTest { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; mController = spy(new ChooseAccountPreferenceController(mContext, "controller_key")); - mActivity = (FragmentActivity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(FragmentActivity.class)).get(); + mActivity = Robolectric.setupActivity(FragmentActivity.class); mPreferenceManager = new PreferenceManager(mContext); mPreferenceScreen = mPreferenceManager.createPreferenceScreen(mContext); } diff --git a/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java index 7433d7a92b4..ece7ea9d699 100644 --- a/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java @@ -40,7 +40,6 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.shadow.ShadowAccountManager; import com.android.settings.testutils.shadow.ShadowContentResolver; -import com.android.settings.utils.ActivityControllerWrapper; import com.android.settingslib.search.SearchIndexableRaw; import org.junit.After; @@ -76,8 +75,7 @@ public class EmergencyInfoPreferenceControllerTest { doReturn(mock(DevicePolicyManager.class)).when(mContext) .getSystemService(Context.DEVICE_POLICY_SERVICE); mController = new EmergencyInfoPreferenceController(mContext, "test_key"); - mPreference = new Preference((Context) ActivityControllerWrapper.setup( - Robolectric.buildActivity(Activity.class)).get()); + mPreference = new Preference(Robolectric.setupActivity(Activity.class)); mPreference.setKey(mController.getPreferenceKey()); when(mScreen.findPreference(mPreference.getKey())).thenReturn(mPreference); when(mContext.getResources().getBoolean(R.bool.config_show_emergency_info_in_device_info)) diff --git a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java index 8d8f0c17278..2052f46e8e2 100644 --- a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java @@ -53,7 +53,6 @@ import com.android.settings.testutils.shadow.ShadowContentResolver; import com.android.settings.testutils.shadow.ShadowDevicePolicyManager; import com.android.settings.testutils.shadow.ShadowFragment; import com.android.settings.testutils.shadow.ShadowUserManager; -import com.android.settings.utils.ActivityControllerWrapper; import com.android.settings.widget.RestrictedButton; import com.android.settingslib.widget.LayoutPreference; @@ -113,8 +112,8 @@ public class RemoveAccountPreferenceControllerTest { when(mAccountManager.getAuthenticatorTypesAsUser(anyInt())) .thenReturn(new AuthenticatorDescription[0]); when(mAccountManager.getAccountsAsUser(anyInt())).thenReturn(new Account[0]); - mController = new RemoveAccountPreferenceController((Context) ActivityControllerWrapper - .setup(Robolectric.buildActivity(Activity.class)).get(), mFragment); + mController = new RemoveAccountPreferenceController( + Robolectric.setupActivity(Activity.class), mFragment); } @After diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java index 5ca7415fc77..638dabdfb42 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java @@ -43,7 +43,6 @@ import com.android.settings.fuelgauge.batteryusage.BatteryDiffEntry; import com.android.settingslib.applications.ApplicationsState; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -117,7 +116,6 @@ public class AppBatteryPreferenceControllerTest { assertThat(mController.isAvailable()).isTrue(); } - @Ignore @Test @Config(qualifiers = "mcc999") public void testAppBattery_ifDisabled_shouldNotBeShown() { diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java index 87e4a8fd4f6..4fdf5607019 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java @@ -56,7 +56,6 @@ import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Answers; @@ -156,7 +155,6 @@ public final class AppInfoDashboardFragmentTest { verify(menu.findItem(UNINSTALL_UPDATES), times(1)).setVisible(true); } - @Ignore @Test @Config(qualifiers = "mcc999") public void onPrepareOptionsMenu_setUpdateMenuVisible_ifDisabledByDevice_shouldBeFalse() { diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java index e948b7e561f..cc789c6f696 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java @@ -37,7 +37,6 @@ import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.shadow.ShadowUserManager; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; @@ -80,7 +79,6 @@ public class AppMemoryPreferenceControllerTest { when(mFragment.getActivity()).thenReturn(mActivity); } - @Ignore @Test @Config(qualifiers = "mcc999") public void getAvailabilityStatus_developmentSettingsEnabled_shouldReturnAvailable() { @@ -109,7 +107,6 @@ public class AppMemoryPreferenceControllerTest { .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE); } - @Ignore @Test @Config(qualifiers = "mcc999") public void getAvailabilityStatus_developmentSettingsDisabled_shouldReturnDisabled() { diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppSettingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppSettingPreferenceControllerTest.java index 2482945553b..bda1e612a21 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppSettingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppSettingPreferenceControllerTest.java @@ -26,7 +26,6 @@ import android.content.pm.ResolveInfo; import androidx.preference.Preference; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -67,14 +66,12 @@ public class AppSettingPreferenceControllerTest { mPreference.setKey(mController.getPreferenceKey()); } - @Ignore @Test public void getAvailabilityStatus_noAppSetting_shouldNotBeAvailable() { assertThat(mController.isAvailable()) .isFalse(); } - @Ignore @Test public void getAvailabilityStatus_noPackageName_shouldNotBeAvailable() { mController.setPackageName(null); @@ -83,7 +80,6 @@ public class AppSettingPreferenceControllerTest { .isFalse(); } - @Ignore @Test public void getAvailabilityStatus_hasAppSetting_shouldBeAvailable() { final ResolveInfo info = new ResolveInfo(); @@ -97,13 +93,11 @@ public class AppSettingPreferenceControllerTest { .isTrue(); } - @Ignore @Test public void clickPreference_noAppSetting_shouldDoNothing() { assertThat(mController.handlePreferenceTreeClick(mPreference)).isFalse(); } - @Ignore @Test public void clickPreference_hasAppSetting_shouldLaunchIntent() { final ResolveInfo info = new ResolveInfo(); diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java index dde5914897a..74c0bb5e007 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java @@ -33,10 +33,8 @@ import android.os.UserManager; import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.utils.ActivityControllerWrapper; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; @@ -76,8 +74,7 @@ public class DefaultAppShortcutPreferenceControllerBaseTest { MockitoAnnotations.initMocks(this); ShadowApplication shadowApplication = ShadowApplication.getInstance(); shadowApplication.setSystemService(Context.ROLE_SERVICE, mRoleManager); - mActivity = (Activity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(Activity.class)).get(); + mActivity = Robolectric.setupActivity(Activity.class); mShadowUserManager = shadowOf(mActivity.getSystemService(UserManager.class)); mController = new TestRolePreferenceController(mActivity); when(mPreference.getKey()).thenReturn(mController.getPreferenceKey()); @@ -104,7 +101,6 @@ public class DefaultAppShortcutPreferenceControllerBaseTest { DefaultAppShortcutPreferenceControllerBase.UNSUPPORTED_ON_DEVICE); } - @Ignore @Test public void getAvailabilityStatus_noCallbackForIsRoleNotVisible_shouldReturnUnsupported() { diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragmentTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragmentTest.java index d035a6409f2..85be59e29e1 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragmentTest.java @@ -35,7 +35,6 @@ import androidx.fragment.app.FragmentActivity; import com.android.settings.R; import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; -import com.android.settings.utils.ActivityControllerWrapper; import org.junit.Before; import org.junit.Test; @@ -58,9 +57,7 @@ public class InstantAppButtonDialogFragmentTest { @Before public void setUp() { - final FragmentActivity activity = (FragmentActivity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(FragmentActivity.class)).get(); - + final FragmentActivity activity = Robolectric.setupActivity(FragmentActivity.class); mContext = spy(RuntimeEnvironment.application); mFragment = InstantAppButtonDialogFragment.newInstance(TEST_PACKAGE); mFragment.show(activity.getSupportFragmentManager(), "InstantAppButtonDialogFragment"); diff --git a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java index 88377b8367f..178a26f8453 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java @@ -44,7 +44,6 @@ import com.android.settings.testutils.shadow.ShadowSecureSettings; import com.android.settingslib.applications.DefaultAppInfo; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -83,7 +82,6 @@ public class DefaultAssistPreferenceControllerTest { assertThat(mController.isAvailable()).isTrue(); } - @Ignore @Test @Config(qualifiers = "mcc999") public void testAssistAndVoiceInput_ifDisabled_shouldNotBeShown() { diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsControllerTest.java index 523112ce0c9..ed4cbd1f042 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsControllerTest.java @@ -29,7 +29,6 @@ import android.content.res.Resources; import com.android.settings.R; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; @@ -61,7 +60,6 @@ public class PremiumSmsControllerTest { assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE); } - @Ignore @Test @Config(qualifiers = "mcc999") public void getAvailability_disabledByCarrier_returnUnavailable() { diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsScreenPreferenceControllerTest.java index 37c3cc2d120..5982413ac31 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsScreenPreferenceControllerTest.java @@ -29,7 +29,6 @@ import android.content.res.Resources; import com.android.settings.R; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; @@ -61,7 +60,6 @@ public class PremiumSmsScreenPreferenceControllerTest { assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE); } - @Ignore @Test @Config(qualifiers = "mcc999") public void getAvailability_disabledByCarrier_returnUnavailable() { diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/EnabledVrListenersControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/EnabledVrListenersControllerTest.java index 8c4df32bece..df5dfc9e76f 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/EnabledVrListenersControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/EnabledVrListenersControllerTest.java @@ -24,7 +24,6 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; @@ -61,7 +60,6 @@ public class EnabledVrListenersControllerTest { assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE); } - @Ignore @Test @Config(qualifiers = "mcc999") public void getAvailability_disabled_unavailable() { diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerScreenPreferenceControllerTest.java index cf4e334e87e..1e5e235e1cf 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerScreenPreferenceControllerTest.java @@ -26,7 +26,6 @@ import android.content.Context; import com.android.settings.testutils.shadow.ShadowActivityManager; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; @@ -62,7 +61,6 @@ public class VrListenerScreenPreferenceControllerTest { assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE); } - @Ignore @Test @Config(qualifiers = "mcc999") public void getAvailability_disabled_unavailable() { diff --git a/tests/robotests/src/com/android/settings/biometrics/activeunlock/ActiveUnlockRequireBiometricSetupTest.java b/tests/robotests/src/com/android/settings/biometrics/activeunlock/ActiveUnlockRequireBiometricSetupTest.java index 4ae1ecf033f..d3bbf247ae8 100644 --- a/tests/robotests/src/com/android/settings/biometrics/activeunlock/ActiveUnlockRequireBiometricSetupTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/activeunlock/ActiveUnlockRequireBiometricSetupTest.java @@ -29,7 +29,6 @@ import android.content.ComponentName; import com.android.settings.R; import com.android.settings.biometrics.BiometricEnrollActivity; -import com.android.settings.utils.ActivityControllerWrapper; import com.google.android.setupcompat.PartnerCustomizationLayout; import com.google.android.setupcompat.template.FooterBarMixin; @@ -50,8 +49,8 @@ public class ActiveUnlockRequireBiometricSetupTest { @Before public void setUp() { - mActivity = (ActiveUnlockRequireBiometricSetup) ActivityControllerWrapper.setup( - Robolectric.buildActivity(ActiveUnlockRequireBiometricSetup.class)).get(); + mActivity = Robolectric.buildActivity( + ActiveUnlockRequireBiometricSetup.class).setup().get(); mLayout = mActivity.findViewById(R.id.setup_wizard_layout); } diff --git a/tests/robotests/src/com/android/settings/biometrics/face/FaceSettingsFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/biometrics/face/FaceSettingsFooterPreferenceControllerTest.java index f34616f258d..9de2fc2dcb8 100644 --- a/tests/robotests/src/com/android/settings/biometrics/face/FaceSettingsFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/face/FaceSettingsFooterPreferenceControllerTest.java @@ -41,7 +41,6 @@ import com.android.settings.R; import com.android.settingslib.widget.FooterPreference; import org.junit.Before; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -57,7 +56,6 @@ import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; -@Ignore @RunWith(RobolectricTestRunner.class) public class FaceSettingsFooterPreferenceControllerTest { @Rule diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java index 198bfd79ccb..87271535a25 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java @@ -57,7 +57,6 @@ import com.android.settings.biometrics.BiometricEnrollBase; import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.shadow.ShadowUtils; -import com.android.settings.utils.ActivityControllerWrapper; import com.google.android.setupcompat.PartnerCustomizationLayout; import com.google.android.setupcompat.template.FooterBarMixin; @@ -120,7 +119,7 @@ public class FingerprintEnrollFindSensorTest { props.add(newFingerprintSensorPropertiesInternal(TYPE_REAR)); doReturn(props).when(mFingerprintManager).getSensorPropertiesInternal(); - ActivityControllerWrapper.setup(mActivityController); + mActivityController.setup(); } private void setupActivity_onUdfpsDevice() { @@ -128,7 +127,7 @@ public class FingerprintEnrollFindSensorTest { props.add(newFingerprintSensorPropertiesInternal(TYPE_UDFPS_OPTICAL)); doReturn(props).when(mFingerprintManager).getSensorPropertiesInternal(); - ActivityControllerWrapper.setup(mActivityController); + mActivityController.setup(); } private void setupActivity_onSfpsDevice() { @@ -136,7 +135,7 @@ public class FingerprintEnrollFindSensorTest { props.add(newFingerprintSensorPropertiesInternal(TYPE_POWER_BUTTON)); doReturn(props).when(mFingerprintManager).getSensorPropertiesInternal(); - ActivityControllerWrapper.setup(mActivityController); + mActivityController.setup(); } private FingerprintSensorPropertiesInternal newFingerprintSensorPropertiesInternal( @@ -592,7 +591,7 @@ public class FingerprintEnrollFindSensorTest { private void gotEnrollingResult_resumeActivityAndVerifyResultThenForward( int testActivityResult) { // resume activity - mActivityController.start().resume(); + mActivityController.start().resume().visible(); verifyNoSidecar(); // onActivityResult from Enrolling activity shall be forward back @@ -612,8 +611,7 @@ public class FingerprintEnrollFindSensorTest { int testActivityResult, @NonNull Bundle savedInstance) { // Rebuild activity and use savedInstance to restore. buildActivity(); - ActivityControllerWrapper.setup(mActivityController, savedInstance); - //mActivityController.setup(savedInstance); + mActivityController.setup(savedInstance); verifyNoSidecar(); // onActivityResult from Enrolling activity shall be forward back diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensorTest.java index d5500ade87e..ae580d59a44 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensorTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensorTest.java @@ -31,7 +31,6 @@ import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; import com.android.settings.testutils.shadow.ShadowUtils; -import com.android.settings.utils.ActivityControllerWrapper; import com.google.android.setupcompat.PartnerCustomizationLayout; import com.google.android.setupcompat.template.FooterBarMixin; @@ -67,8 +66,8 @@ public class SetupFingerprintEnrollFindSensorTest { final Intent intent = new Intent() // Set the challenge token so the confirm screen will not be shown .putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, new byte[0]); - mActivity = (SetupFingerprintEnrollFindSensor) ActivityControllerWrapper.setup( - Robolectric.buildActivity(SetupFingerprintEnrollFindSensor.class, intent)).get(); + mActivity = Robolectric.buildActivity(SetupFingerprintEnrollFindSensor.class, + intent).setup().get(); mTheme = mActivity.getTheme(); } diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinishTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinishTest.java index ea9cb849590..e238a0e4739 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinishTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinishTest.java @@ -30,7 +30,6 @@ import android.hardware.fingerprint.FingerprintManager; import com.android.settings.R; import com.android.settings.testutils.shadow.ShadowFingerprintManager; -import com.android.settings.utils.ActivityControllerWrapper; import com.google.android.setupcompat.PartnerCustomizationLayout; import com.google.android.setupcompat.template.FooterBarMixin; @@ -55,8 +54,7 @@ public class SetupFingerprintEnrollFinishTest { @Before public void setUp() { - mActivity = (FingerprintEnrollFinish) ActivityControllerWrapper.setup( - Robolectric.buildActivity(FingerprintEnrollFinish.class)).get(); + mActivity = Robolectric.buildActivity(FingerprintEnrollFinish.class).setup().get(); mLayout = mActivity.findViewById(R.id.setup_wizard_layout); Shadows.shadowOf(application.getPackageManager()) .setSystemFeature(PackageManager.FEATURE_FINGERPRINT, true); diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java index 89e682c2d05..8ac56dce306 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java @@ -46,7 +46,6 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.utils.ActivityControllerWrapper; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.LocalBluetoothManager; @@ -231,9 +230,7 @@ public class BluetoothDeviceDetailsFragmentTest { doReturn(mPreferenceScreen).when(fragment).getPreferenceScreen(); doReturn(mUserManager).when(fragment).getUserManager(); - mActivity = spy((FragmentActivity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(FragmentActivity.class)).get()); - + mActivity = spy(Robolectric.setupActivity(FragmentActivity.class)); doReturn(mActivity).when(fragment).getActivity(); doReturn(mContext).when(fragment).getContext(); diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothFindBroadcastsFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothFindBroadcastsFragmentTest.java index 046a90c48d5..f3f2b098447 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothFindBroadcastsFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothFindBroadcastsFragmentTest.java @@ -36,7 +36,6 @@ import androidx.fragment.app.FragmentTransaction; import androidx.preference.PreferenceCategory; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.utils.ActivityControllerWrapper; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcastAssistant; import com.android.settingslib.bluetooth.LocalBluetoothManager; @@ -91,10 +90,7 @@ public class BluetoothFindBroadcastsFragmentTest { doReturn(mCachedDevice).when(mFragment).getCachedDevice(any()); doReturn(mBroadcastAssistant).when(mFragment).getLeBroadcastAssistant(); doReturn(mPreferenceCategroy).when(mFragment).findPreference(any()); - - mActivity = (FragmentActivity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(FragmentActivity.class)).get(); - + mActivity = Robolectric.setupActivity(FragmentActivity.class); when(mFragment.getActivity()).thenReturn(mActivity); FragmentManager fragmentManager = mock(FragmentManager.class); diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java index 17ab5577886..abc01fa3282 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java @@ -49,7 +49,6 @@ import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; import com.android.settings.testutils.shadow.ShadowAudioManager; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import com.android.settings.testutils.shadow.ShadowBluetoothUtils; -import com.android.settings.utils.ActivityControllerWrapper; import com.android.settingslib.bluetooth.BluetoothCallback; import com.android.settingslib.bluetooth.BluetoothEventManager; import com.android.settingslib.bluetooth.CachedBluetoothDevice; @@ -114,10 +113,7 @@ public class AvailableMediaDeviceGroupControllerTest { mPreference = new Preference(mContext); mPreference.setKey(PREFERENCE_KEY_1); mPreferenceGroup = spy(new PreferenceScreen(mContext, null)); - - final FragmentActivity mActivity = (FragmentActivity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(FragmentActivity.class)).get(); - + final FragmentActivity mActivity = Robolectric.setupActivity(FragmentActivity.class); when(mPreferenceGroup.getPreferenceManager()).thenReturn(mPreferenceManager); doReturn(mContext).when(mDashboardFragment).getContext(); doReturn(mPackageManager).when(mContext).getPackageManager(); diff --git a/tests/robotests/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceControllerTest.java index eea561ac547..66f314df30f 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceControllerTest.java @@ -24,7 +24,6 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; @@ -48,7 +47,6 @@ public class TopLevelConnectedDevicesPreferenceControllerTest { assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE); } - @Ignore @Test @Config(qualifiers = "mcc999") public void getAvailabilityStatus_unsupportedWhenSet() { diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java index 42c994a5ece..8257b434d2f 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java @@ -44,7 +44,6 @@ import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.widget.SelectorWithWidgetPreference; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -223,7 +222,6 @@ public class UsbDetailsFunctionsControllerTest { assertThat(prefs.get(3).isChecked()).isFalse(); } - @Ignore @Test public void onClickNone_mtpEnabled_shouldDisableMtp() { when(mUsbBackend.areFunctionsSupported(anyLong())).thenReturn(true); diff --git a/tests/robotests/src/com/android/settings/core/CategoryMixinTest.java b/tests/robotests/src/com/android/settings/core/CategoryMixinTest.java index d8f4a90382e..30400399585 100644 --- a/tests/robotests/src/com/android/settings/core/CategoryMixinTest.java +++ b/tests/robotests/src/com/android/settings/core/CategoryMixinTest.java @@ -31,7 +31,6 @@ import android.util.ArraySet; import androidx.appcompat.app.AppCompatActivity; import com.android.settings.core.CategoryMixin.CategoryListener; -import com.android.settings.utils.ActivityControllerWrapper; import org.junit.Before; import org.junit.Test; @@ -54,7 +53,7 @@ public class CategoryMixinTest { @Test public void resumeActivity_shouldRegisterReceiver() { - ActivityControllerWrapper.setup(mActivityController); + mActivityController.setup(); final TestActivity activity = mActivityController.get(); assertThat(activity.getRegisteredReceivers()).isNotEmpty(); @@ -62,7 +61,7 @@ public class CategoryMixinTest { @Test public void pauseActivity_shouldUnregisterReceiver() { - ActivityControllerWrapper.setup(mActivityController).pause(); + mActivityController.setup().pause(); final TestActivity activity = mActivityController.get(); assertThat(activity.getRegisteredReceivers()).isEmpty(); @@ -70,7 +69,7 @@ public class CategoryMixinTest { @Test public void onCategoriesChanged_listenerAdded_shouldNotifyChanged() { - ActivityControllerWrapper.setup(mActivityController).pause(); + mActivityController.setup().pause(); final CategoryMixin categoryMixin = mActivityController.get().getCategoryMixin(); final CategoryListener listener = mock(CategoryListener.class); categoryMixin.addCategoryListener(listener); diff --git a/tests/robotests/src/com/android/settings/core/InstrumentedActivityTest.java b/tests/robotests/src/com/android/settings/core/InstrumentedActivityTest.java index 2f6940f5c49..d74fab3ca4b 100644 --- a/tests/robotests/src/com/android/settings/core/InstrumentedActivityTest.java +++ b/tests/robotests/src/com/android/settings/core/InstrumentedActivityTest.java @@ -16,8 +16,6 @@ package com.android.settings.core; -import com.android.settings.utils.ActivityControllerWrapper; - import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; @@ -33,8 +31,7 @@ public class InstrumentedActivityTest { */ @Test public void canInstantiate() { - ActivityControllerWrapper.setup( - Robolectric.buildActivity(InstrumentedActivityTestable.class)).get(); + Robolectric.buildActivity(InstrumentedActivityTestable.class).setup().get(); } public static class InstrumentedActivityTestable extends InstrumentedActivity { diff --git a/tests/robotests/src/com/android/settings/core/PreferenceControllerListHelperTest.java b/tests/robotests/src/com/android/settings/core/PreferenceControllerListHelperTest.java index 34eab02c6a7..68dfb7952ce 100644 --- a/tests/robotests/src/com/android/settings/core/PreferenceControllerListHelperTest.java +++ b/tests/robotests/src/com/android/settings/core/PreferenceControllerListHelperTest.java @@ -25,7 +25,6 @@ import com.android.settings.slices.FakePreferenceController; import com.android.settingslib.core.AbstractPreferenceController; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; @@ -45,7 +44,6 @@ public class PreferenceControllerListHelperTest { mContext = RuntimeEnvironment.application; } - @Ignore @Test @Config(qualifiers = "mcc999") public void getControllers_shouldReturnAList() { @@ -59,7 +57,6 @@ public class PreferenceControllerListHelperTest { } } - @Ignore @Test @Config(qualifiers = "mcc998") public void getControllers_partialFailure_shouldReturnTheRest() { diff --git a/tests/robotests/src/com/android/settings/core/PreferenceXmlParserUtilsTest.java b/tests/robotests/src/com/android/settings/core/PreferenceXmlParserUtilsTest.java index b1aa3214463..f489123e6fe 100644 --- a/tests/robotests/src/com/android/settings/core/PreferenceXmlParserUtilsTest.java +++ b/tests/robotests/src/com/android/settings/core/PreferenceXmlParserUtilsTest.java @@ -34,7 +34,6 @@ import com.android.settings.R; import com.android.settings.core.PreferenceXmlParserUtils.MetadataFlag; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; @@ -51,7 +50,6 @@ import java.util.List; * If changing a preference file breaks a test in this test file, please replace its reference * with another preference with a matching replacement attribute. */ -@Ignore @RunWith(RobolectricTestRunner.class) public class PreferenceXmlParserUtilsTest { diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java index ecaf36fa161..cfbdd75a1bd 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java @@ -66,7 +66,6 @@ import com.android.settingslib.drawer.ProviderTile; import com.android.settingslib.drawer.Tile; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -236,7 +235,6 @@ public class DashboardFragmentTest { verify(mTestFragment.mScreen, never()).addPreference(nullable(Preference.class)); } - @Ignore @Test @Config(qualifiers = "mcc999") public void displayTilesAsPreference_shouldNotAddSuppressedTiles() { diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java index fa61a33ab35..6a1c0a69de5 100644 --- a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java +++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java @@ -67,7 +67,6 @@ import com.android.settingslib.net.UidDetailProvider; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Answers; @@ -83,7 +82,6 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; -@Ignore @RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowEntityHeaderController.class, ShadowRestrictedLockUtilsInternal.class}) public class AppDataUsageTest { diff --git a/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java index aee91f357f9..aab67be1de9 100644 --- a/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java @@ -31,7 +31,6 @@ import androidx.preference.PreferenceViewHolder; import com.android.settings.R; import com.android.settings.datausage.ChartDataUsagePreference.DataUsageSummaryNode; -import com.android.settings.utils.ActivityControllerWrapper; import com.android.settings.widget.UsageView; import com.android.settingslib.net.NetworkCycleChartData; import com.android.settingslib.net.NetworkCycleData; @@ -65,8 +64,8 @@ public class ChartDataUsagePreferenceTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - mActivity = spy((Activity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(Activity.class)).get()); + + mActivity = spy(Robolectric.setupActivity(Activity.class)); mPreference = new ChartDataUsagePreference(mActivity, null /* attrs */); LayoutInflater inflater = LayoutInflater.from(mActivity); View view = inflater.inflate(mPreference.getLayoutResource(), null /* root */, diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java index 762fbf8bacc..4640efea447 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java @@ -54,7 +54,6 @@ import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin; import com.android.settingslib.net.NetworkCycleChartData; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; @@ -71,7 +70,6 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; -@Ignore @RunWith(RobolectricTestRunner.class) public class DataUsageListTest { diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceControllerTest.java index d9524387c95..865c2eba383 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceControllerTest.java @@ -18,15 +18,11 @@ package com.android.settings.datetime.timezone; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.spy; - import android.app.Activity; import android.content.Context; import androidx.preference.Preference; -import com.android.settings.utils.ActivityControllerWrapper; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -40,8 +36,7 @@ public class BaseTimeZonePreferenceControllerTest { @Before public void setUp() { - mActivity = spy((Activity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(Activity.class)).get()); + mActivity = Robolectric.setupActivity(Activity.class); } @Test diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPreferenceControllerTest.java index 5b6d8bd95dd..4a6f92f2a21 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPreferenceControllerTest.java @@ -23,8 +23,6 @@ import android.icu.util.TimeZone; import androidx.preference.Preference; -import com.android.settings.utils.ActivityControllerWrapper; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -38,8 +36,7 @@ public class FixedOffsetPreferenceControllerTest { @Before public void setUp() { - mActivity = (Activity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(Activity.class)).get(); + mActivity = Robolectric.setupActivity(Activity.class); } @Test diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/RegionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/RegionPreferenceControllerTest.java index 6689a1fe5ad..ea0be2458d6 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/RegionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/RegionPreferenceControllerTest.java @@ -18,14 +18,10 @@ package com.android.settings.datetime.timezone; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.spy; - import android.app.Activity; import androidx.preference.Preference; -import com.android.settings.utils.ActivityControllerWrapper; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -39,8 +35,7 @@ public class RegionPreferenceControllerTest { @Before public void setUp() { - mActivity = spy((Activity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(Activity.class)).get()); + mActivity = Robolectric.setupActivity(Activity.class); } @Test diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java index 69d46eaed4c..78055cf23dc 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java @@ -33,7 +33,6 @@ import com.android.settings.datetime.timezone.BaseTimeZoneAdapter.AdapterItem; import com.android.settings.datetime.timezone.BaseTimeZoneAdapter.ItemViewHolder; import com.android.settings.datetime.timezone.RegionSearchPicker.RegionItem; import com.android.settings.datetime.timezone.model.TimeZoneData; -import com.android.settings.utils.ActivityControllerWrapper; import org.junit.Test; import org.junit.runner.RunWith; @@ -143,8 +142,7 @@ public class RegionSearchPickerTest { @Implements(Fragment.class) public static class ShadowFragment { - private FragmentActivity mActivity = (FragmentActivity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(FragmentActivity.class)).get(); + private FragmentActivity mActivity = Robolectric.setupActivity(FragmentActivity.class); @Implementation public final FragmentActivity getActivity() { diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePreferenceControllerTest.java index f0cb6e80fe3..6d1bf6698eb 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePreferenceControllerTest.java @@ -23,8 +23,6 @@ import android.icu.util.TimeZone; import androidx.preference.Preference; -import com.android.settings.utils.ActivityControllerWrapper; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -38,8 +36,7 @@ public class RegionZonePreferenceControllerTest { @Before public void setUp() { - mActivity = (Activity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(Activity.class)).get(); + mActivity = Robolectric.setupActivity(Activity.class); } @Test diff --git a/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java index 9268a72b1ec..d469c7193b3 100644 --- a/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java @@ -32,7 +32,6 @@ import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -60,7 +59,6 @@ public class CameraLaserSensorPreferenceControllerTest { mController.displayPreference(mScreen); } - @Ignore @Test @Config(qualifiers = "mcc999") public void isAvailable_withConfigNoShow_shouldReturnFalse() { diff --git a/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java index f0e829224be..cf84618a6f4 100644 --- a/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java @@ -31,7 +31,6 @@ import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -100,7 +99,6 @@ public class CoolColorTemperaturePreferenceControllerTest { verify(mPreference).setChecked(false); } - @Ignore @Test @Config(qualifiers = "mcc999") public void isAvailable_shouldBeFalse() { diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentMemtagPageTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentMemtagPageTest.java index 052f705263e..2d4ce432010 100644 --- a/tests/robotests/src/com/android/settings/development/DevelopmentMemtagPageTest.java +++ b/tests/robotests/src/com/android/settings/development/DevelopmentMemtagPageTest.java @@ -24,7 +24,6 @@ import android.content.Context; import com.android.settings.R; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentMemtagPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentMemtagPreferenceControllerTest.java index 18cacc665ce..d4af47040b9 100644 --- a/tests/robotests/src/com/android/settings/development/DevelopmentMemtagPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DevelopmentMemtagPreferenceControllerTest.java @@ -38,7 +38,6 @@ import com.android.settingslib.RestrictedSwitchPreference; import com.android.settingslib.testutils.shadow.ShadowInteractionJankMonitor; import org.junit.Before; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -47,7 +46,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowSystemProperties; -@Ignore @RunWith(RobolectricTestRunner.class) @Config( shadows = { diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDisabledActivityTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDisabledActivityTest.java index ccfd68b6575..6b4068d1d8c 100644 --- a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDisabledActivityTest.java +++ b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDisabledActivityTest.java @@ -21,7 +21,6 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import com.android.settings.R; -import com.android.settings.utils.ActivityControllerWrapper; import org.junit.Test; import org.junit.runner.RunWith; @@ -35,8 +34,7 @@ public class DevelopmentSettingsDisabledActivityTest { @Test public void launchActivity_shouldShowToast() { - ActivityControllerWrapper.setup( - Robolectric.buildActivity(DevelopmentSettingsDisabledActivity.class)).get(); + Robolectric.setupActivity(DevelopmentSettingsDisabledActivity.class); final Context context = RuntimeEnvironment.application; assertThat(ShadowToast.getTextOfLatestToast()) diff --git a/tests/robotests/src/com/android/settings/development/RebootWithMtePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/RebootWithMtePreferenceControllerTest.java index ad7d48ec2ef..f1e7d3f2530 100644 --- a/tests/robotests/src/com/android/settings/development/RebootWithMtePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/RebootWithMtePreferenceControllerTest.java @@ -27,7 +27,6 @@ import androidx.preference.Preference; import androidx.test.core.app.ApplicationProvider; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -60,7 +59,6 @@ public class RebootWithMtePreferenceControllerTest { assertFalse(mController.isAvailable()); } - @Ignore @Test public void onAvailable_sysPropEnabled() { SystemProperties.set("ro.arm64.memtag.bootctl_supported", "1"); diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelPreferenceControllerTest.java index 9da9e20c0c5..ccc91e60c8a 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelPreferenceControllerTest.java @@ -35,8 +35,6 @@ import android.os.Build; import androidx.preference.Preference; -import com.android.settings.utils.ActivityControllerWrapper; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -60,8 +58,7 @@ public class SecurityPatchLevelPreferenceControllerTest { @Before public void setup() { MockitoAnnotations.initMocks(this); - mContext = spy((Context) ActivityControllerWrapper.setup( - Robolectric.buildActivity(Activity.class)).get()); + mContext = spy(Robolectric.setupActivity(Activity.class)); } @Test diff --git a/tests/robotests/src/com/android/settings/deviceinfo/legal/ModuleLicensePreferenceTest.java b/tests/robotests/src/com/android/settings/deviceinfo/legal/ModuleLicensePreferenceTest.java index 304c5a591a0..08eec9e824f 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/legal/ModuleLicensePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/legal/ModuleLicensePreferenceTest.java @@ -23,8 +23,6 @@ import android.content.Context; import android.content.Intent; import android.content.pm.ModuleInfo; -import com.android.settings.utils.ActivityControllerWrapper; - import org.junit.Before; import org.junit.Ignore; import org.junit.Test; @@ -44,8 +42,7 @@ public class ModuleLicensePreferenceTest { @Before public void setup() { MockitoAnnotations.initMocks(this); - mContext = (Context) ActivityControllerWrapper.setup( - Robolectric.buildActivity(Activity.class)).get(); + mContext = Robolectric.setupActivity(Activity.class); mModuleInfo = new ModuleInfo(); mModuleInfo.setPackageName(PACKAGE_NAME); mModuleInfo.setName(NAME); diff --git a/tests/robotests/src/com/android/settings/deviceinfo/legal/WallpaperAttributionsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/legal/WallpaperAttributionsPreferenceControllerTest.java index 7831207da99..c06f069e2d5 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/legal/WallpaperAttributionsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/legal/WallpaperAttributionsPreferenceControllerTest.java @@ -22,7 +22,6 @@ import android.content.Context; import com.android.settings.core.BasePreferenceController; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; @@ -49,7 +48,6 @@ public class WallpaperAttributionsPreferenceControllerTest { .isEqualTo(BasePreferenceController.AVAILABLE); } - @Ignore @Test @Config(qualifiers = "mcc999") public void getAvailabilityStatus_ifNotVisible_false() { diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java index 5d8d46bd0ef..3ad14e53940 100644 --- a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java @@ -36,7 +36,6 @@ import com.android.internal.R; import com.android.settings.testutils.shadow.ShadowSecureSettings; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -140,7 +139,6 @@ public class AmbientDisplayAlwaysOnPreferenceControllerTest { assertThat(controller.isSliceable()).isTrue(); } - @Ignore @Test public void isSliceableIncorrectKey_returnsFalse() { final AmbientDisplayAlwaysOnPreferenceController controller = @@ -148,7 +146,6 @@ public class AmbientDisplayAlwaysOnPreferenceControllerTest { assertThat(controller.isSliceable()).isFalse(); } - @Ignore @Test public void isPublicSlice_returnTrue() { assertThat(mController.isPublicSlice()).isTrue(); diff --git a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java index 1076d15b8fe..bbc9cf32b03 100644 --- a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java @@ -40,7 +40,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.core.SettingsBaseActivity; -import com.android.settings.utils.ActivityControllerWrapper; import com.android.settingslib.transition.SettingsTransitionHelper; import org.junit.Before; @@ -166,9 +165,7 @@ public class BrightnessLevelPreferenceControllerTest { @Test public void handlePreferenceTreeClick_transitionTypeNone_shouldPassToNextActivity() { - final Activity activity = (Activity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(Activity.class)).get(); - + final Activity activity = Robolectric.setupActivity(Activity.class); final BrightnessLevelPreferenceController controller = new BrightnessLevelPreferenceController(activity, null); final ShadowActivity shadowActivity = shadowOf(activity); diff --git a/tests/robotests/src/com/android/settings/display/ControlsTrivialPrivacyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ControlsTrivialPrivacyPreferenceControllerTest.java index f276af0ed96..a82e1f1c5ae 100644 --- a/tests/robotests/src/com/android/settings/display/ControlsTrivialPrivacyPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/ControlsTrivialPrivacyPreferenceControllerTest.java @@ -44,7 +44,6 @@ import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -147,7 +146,6 @@ public class ControlsTrivialPrivacyPreferenceControllerTest { verify(mPreference, atLeastOnce()).setSummary(mController.getSummary()); } - @Ignore @Test public void updateStateWithCustomizableLockScreenQuickAffordancesEnabled() { setCustomizableLockScreenQuickAffordancesEnabled(true); @@ -168,7 +166,6 @@ public class ControlsTrivialPrivacyPreferenceControllerTest { BasePreferenceController.DISABLED_DEPENDENT_SETTING); } - @Ignore @Test public void getAvailabilityStatusWithCustomizableLockScreenQuickAffordancesEnabled() { setCustomizableLockScreenQuickAffordancesEnabled(true); diff --git a/tests/robotests/src/com/android/settings/display/SmartAutoRotatePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/display/SmartAutoRotatePreferenceFragmentTest.java index 01bb338318c..bdff55e6200 100644 --- a/tests/robotests/src/com/android/settings/display/SmartAutoRotatePreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/display/SmartAutoRotatePreferenceFragmentTest.java @@ -50,7 +50,6 @@ import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.devicestate.DeviceStateRotationLockSettingsManager; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -177,7 +176,6 @@ public class SmartAutoRotatePreferenceFragmentTest { assertThat(preferenceControllers).isEmpty(); } - @Ignore @Test public void createPreferenceControllers_settableDeviceStates_returnsDeviceStateControllers() { enableDeviceStateSettableRotationStates(new String[]{"0:1", "1:1"}, diff --git a/tests/robotests/src/com/android/settings/display/TopLevelDisplayPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/TopLevelDisplayPreferenceControllerTest.java index 2ba0557a577..a5149b9e25e 100644 --- a/tests/robotests/src/com/android/settings/display/TopLevelDisplayPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/TopLevelDisplayPreferenceControllerTest.java @@ -26,7 +26,6 @@ import static org.mockito.Mockito.spy; import android.content.Context; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; @@ -51,7 +50,6 @@ public class TopLevelDisplayPreferenceControllerTest { assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE); } - @Ignore @Test @Config(qualifiers = "mcc999") public void getAvailabilityStatus_unsupportedWhenSet() { diff --git a/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java b/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java index 8ae2a8da915..6db008de223 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java @@ -45,7 +45,6 @@ import com.android.settings.testutils.CustomActivity; import com.android.settings.testutils.shadow.ShadowActivity; import com.android.settings.testutils.shadow.ShadowDevicePolicyManager; import com.android.settings.testutils.shadow.ShadowUserManager; -import com.android.settings.utils.ActivityControllerWrapper; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import org.junit.Before; @@ -78,8 +77,7 @@ public class ActionDisabledByAdminDialogHelperTest { @Before public void setUp() { - mActivity = (CustomActivity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(CustomActivity.class)).get(); + mActivity = Robolectric.setupActivity(CustomActivity.class); mActivityShadow = Shadow.extract(mActivity); mHelper = new ActionDisabledByAdminDialogHelper(mActivity); } diff --git a/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java index e91f56fcb95..a2a0de45657 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java @@ -31,7 +31,6 @@ import com.android.settings.testutils.FakeFeatureFactory; import com.android.settingslib.utils.StringUtil; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -84,7 +83,6 @@ public class ManageDeviceAdminPreferenceControllerTest { assertThat(mController.isAvailable()).isTrue(); } - @Ignore @Test @Config(qualifiers = "mcc999") public void isAvailable_whenNotVisible_isFalse() { diff --git a/tests/robotests/src/com/android/settings/flashlight/FlashlightHandleActivityTest.java b/tests/robotests/src/com/android/settings/flashlight/FlashlightHandleActivityTest.java index a7bd21caa67..b0517cbfb41 100644 --- a/tests/robotests/src/com/android/settings/flashlight/FlashlightHandleActivityTest.java +++ b/tests/robotests/src/com/android/settings/flashlight/FlashlightHandleActivityTest.java @@ -23,7 +23,6 @@ import android.content.Context; import com.android.settingslib.search.SearchIndexableRaw; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; @@ -50,7 +49,6 @@ public class FlashlightHandleActivityTest { assertThat(data).isEmpty(); } - @Ignore @Test @Config(qualifiers = "mcc999") public void getRawDataToIndex_sliceSupported_returnData() { diff --git a/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java b/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java index 6bb8cd68194..c281dca8bc4 100644 --- a/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java +++ b/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java @@ -55,7 +55,6 @@ import com.android.settingslib.core.lifecycle.HideNonSystemOverlayMixin; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; @@ -106,7 +105,6 @@ public class SettingsHomepageActivityTest { assertThat(avatarView.getVisibility()).isNotEqualTo(View.VISIBLE); } - @Ignore @Test @Config(qualifiers = "mcc999") public void launch_configEnabled_shouldShowAvatar() { diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardManagerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardManagerTest.java index f3c3e12c77e..f18d94f828b 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardManagerTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardManagerTest.java @@ -61,7 +61,6 @@ import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -152,7 +151,6 @@ public class ContextualCardManagerTest { assertThat(actual).containsExactlyElementsIn(expected); } - @Ignore @Test @Config(qualifiers = "mcc999") public void loadContextualCards_restartLoaderNotNeeded_shouldInitLoader() { @@ -162,7 +160,6 @@ public class ContextualCardManagerTest { any(ContextualCardManager.CardContentLoaderCallbacks.class)); } - @Ignore @Test @Config(qualifiers = "mcc999") public void loadContextualCards_restartLoaderNeeded_shouldRestartLoaderAndSetIsFirstLaunch() { diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/BackgroundDataConditionControllerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/BackgroundDataConditionControllerTest.java index 1413be38f6b..aa4e11f8e64 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/BackgroundDataConditionControllerTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/BackgroundDataConditionControllerTest.java @@ -25,7 +25,6 @@ import android.content.Context; import android.net.NetworkPolicyManager; import com.android.settings.Settings; -import com.android.settings.utils.ActivityControllerWrapper; import org.junit.Before; import org.junit.Test; @@ -53,8 +52,7 @@ public class BackgroundDataConditionControllerTest { MockitoAnnotations.initMocks(this); ShadowApplication.getInstance().setSystemService(Context.NETWORK_POLICY_SERVICE, mNetworkPolicyManager); - mActivity = (Activity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(Activity.class)).get(); + mActivity = Robolectric.setupActivity(Activity.class); mController = new BackgroundDataConditionController(mActivity, mConditionManager); } diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/WorkModeConditionControllerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/WorkModeConditionControllerTest.java index aedd60184aa..299780c86ad 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/WorkModeConditionControllerTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/WorkModeConditionControllerTest.java @@ -24,7 +24,6 @@ import android.app.Activity; import android.content.ComponentName; import com.android.settings.Settings; -import com.android.settings.utils.ActivityControllerWrapper; import org.junit.Before; import org.junit.Test; @@ -47,8 +46,7 @@ public class WorkModeConditionControllerTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - mActivity = spy((Activity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(Activity.class)).get()); + mActivity = spy(Robolectric.setupActivity(Activity.class)); mController = new WorkModeConditionController(mActivity, mConditionManager); } diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardControllerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardControllerTest.java index 582c4a1813e..502a62bde90 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardControllerTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardControllerTest.java @@ -34,7 +34,6 @@ import com.android.settings.testutils.FakeFeatureFactory; import com.android.settingslib.suggestions.SuggestionController; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -69,7 +68,6 @@ public class LegacySuggestionContextualCardControllerTest { assertThat(controller.mSuggestionController).isNotNull(); } - @Ignore @Test @Config(qualifiers = "mcc999") public void init_configOff_shouldNotCreateSuggestionController() { diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardControllerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardControllerTest.java index b8b2aa80c2e..8c2526074db 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardControllerTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardControllerTest.java @@ -144,7 +144,6 @@ public class SliceContextualCardControllerTest { .isEqualTo(ContextualCardFeedbackDialog.class.getName()); } - @Ignore @Test @Config(qualifiers = "mcc999") public void isFeedbackEnabled_hasFeedbackEmail_debug_returnTrue() { diff --git a/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java index ea4675dcfa9..ae5afd22a9b 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java @@ -32,7 +32,6 @@ import android.hardware.input.InputManager; import android.view.InputDevice; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Answers; @@ -111,7 +110,6 @@ public class GameControllerPreferenceControllerTest { assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE); } - @Ignore @Test @Config(qualifiers = "mcc999") public void getAvailabilityStatus_ifDisabled_shouldReturnDisabled() { diff --git a/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerTest.java b/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerTest.java index 5d67955016e..2d4af3cce0c 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerTest.java @@ -27,7 +27,6 @@ import android.os.Bundle; import androidx.fragment.app.FragmentActivity; import com.android.settings.R; -import com.android.settings.utils.ActivityControllerWrapper; import org.junit.Before; import org.junit.Test; @@ -49,8 +48,7 @@ public class InputMethodAndSubtypeEnablerTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - mActivity = (FragmentActivity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(FragmentActivity.class)).get(); + mActivity = Robolectric.setupActivity(FragmentActivity.class); mFragment = spy(new InputMethodAndSubtypeEnabler()); when(mFragment.getActivity()).thenReturn(mActivity); } diff --git a/tests/robotests/src/com/android/settings/inputmethod/KeyboardLayoutPickerControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/KeyboardLayoutPickerControllerTest.java index 7840bfde319..734f610b264 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/KeyboardLayoutPickerControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/KeyboardLayoutPickerControllerTest.java @@ -39,7 +39,6 @@ import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.shadow.ShadowInputDevice; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -50,7 +49,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; -@Ignore @RunWith(RobolectricTestRunner.class) public class KeyboardLayoutPickerControllerTest { diff --git a/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java index 0a5be27730d..dd6da3b20de 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java @@ -34,7 +34,6 @@ import androidx.core.text.BidiFormatter; import androidx.preference.Preference; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -78,7 +77,6 @@ public class VirtualKeyboardPreferenceControllerTest { assertThat(mController.isAvailable()).isTrue(); } - @Ignore @Test @Config(qualifiers = "mcc999") public void testVirtualKeyboard_ifDisabled_shouldNotBeShown() { diff --git a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java index e2c39ecdede..4429dd764df 100644 --- a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java +++ b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java @@ -45,7 +45,6 @@ import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Answers; @@ -115,7 +114,6 @@ public class LanguageAndInputSettingsTest { assertThat(controllers.isEmpty()).isFalse(); } - @Ignore @Test public void testNonIndexableKeys_existInXmlLayout() { final Context context = spy(RuntimeEnvironment.application); diff --git a/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java index 8a362cded1c..aa4c32ee28c 100644 --- a/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java @@ -31,7 +31,6 @@ import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.FakeFeatureFactory; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -94,7 +93,6 @@ public class PhoneLanguagePreferenceControllerTest { .isEqualTo(BasePreferenceController.CONDITIONALLY_UNAVAILABLE); } - @Ignore @Test @Config(qualifiers = "mcc999") public void testIsAvailable_ifDisabled_shouldReturnFalse() { diff --git a/tests/robotests/src/com/android/settings/language/PointerSpeedControllerTest.java b/tests/robotests/src/com/android/settings/language/PointerSpeedControllerTest.java index 9a3fe551cb2..a917a6d6143 100644 --- a/tests/robotests/src/com/android/settings/language/PointerSpeedControllerTest.java +++ b/tests/robotests/src/com/android/settings/language/PointerSpeedControllerTest.java @@ -23,7 +23,6 @@ import static org.mockito.Mockito.spy; import android.content.Context; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; @@ -34,25 +33,24 @@ import org.robolectric.annotation.Config; @RunWith(RobolectricTestRunner.class) public class PointerSpeedControllerTest { - private Context mContext; - private PointerSpeedController mController; + private Context mContext; + private PointerSpeedController mController; - @Before - public void setUp() { - MockitoAnnotations.initMocks(this); - mContext = spy(RuntimeEnvironment.application.getApplicationContext()); - mController = new PointerSpeedController(mContext); - } + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + mContext = spy(RuntimeEnvironment.application.getApplicationContext()); + mController = new PointerSpeedController(mContext); + } - @Test - public void testDeviceAdministrators_byDefault_shouldBeShown() { - assertThat(mController.isAvailable()).isTrue(); - } + @Test + public void testDeviceAdministrators_byDefault_shouldBeShown() { + assertThat(mController.isAvailable()).isTrue(); + } - @Ignore - @Test - @Config(qualifiers = "mcc999") - public void testDeviceAdministrators_ifDisabled_shouldNotBeShown() { - assertThat(mController.isAvailable()).isFalse(); - } + @Test + @Config(qualifiers = "mcc999") + public void testDeviceAdministrators_ifDisabled_shouldNotBeShown() { + assertThat(mController.isAvailable()).isFalse(); + } } \ No newline at end of file diff --git a/tests/robotests/src/com/android/settings/localepicker/LocaleDialogFragmentTest.java b/tests/robotests/src/com/android/settings/localepicker/LocaleDialogFragmentTest.java index bb22012854a..c8637c8f108 100644 --- a/tests/robotests/src/com/android/settings/localepicker/LocaleDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/localepicker/LocaleDialogFragmentTest.java @@ -36,7 +36,6 @@ import androidx.fragment.app.FragmentTransaction; import com.android.internal.app.LocaleStore; import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; -import com.android.settings.utils.ActivityControllerWrapper; import org.junit.Before; import org.junit.Test; @@ -65,8 +64,7 @@ public class LocaleDialogFragmentTest { public void setUp() throws Exception { MockitoAnnotations.initMocks(this); - mActivity = (FragmentActivity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(FragmentActivity.class)).get(); + mActivity = Robolectric.setupActivity(FragmentActivity.class); mDialogFragment = LocaleDialogFragment.newInstance(); LocaleStore.LocaleInfo localeInfo = LocaleStore.getLocaleInfo(Locale.ENGLISH); Bundle args = new Bundle(); diff --git a/tests/robotests/src/com/android/settings/location/LocationInjectedServicesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationInjectedServicesPreferenceControllerTest.java index 49caa7054f0..bed3346ffba 100644 --- a/tests/robotests/src/com/android/settings/location/LocationInjectedServicesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationInjectedServicesPreferenceControllerTest.java @@ -44,7 +44,6 @@ import com.android.settings.widget.RestrictedAppPreference; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Answers; @@ -115,7 +114,6 @@ public class LocationInjectedServicesPreferenceControllerTest { verify(mContext).unregisterReceiver(mController.mInjectedSettingsReceiver); } - @Ignore @Test public void workProfileDisallowShareLocationOn_getParentUserLocationServicesOnly() { final int fakeWorkProfileId = 123; @@ -168,7 +166,6 @@ public class LocationInjectedServicesPreferenceControllerTest { verify(mSettingsInjector).reloadStatusMessages(); } - @Ignore @Test public void withUserRestriction_shouldDisableLocationAccuracy() { final List preferences = new ArrayList<>(); diff --git a/tests/robotests/src/com/android/settings/location/LocationServicesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationServicesPreferenceControllerTest.java index dacb7cf60e2..f5868c2f8ec 100644 --- a/tests/robotests/src/com/android/settings/location/LocationServicesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationServicesPreferenceControllerTest.java @@ -23,7 +23,6 @@ import static org.mockito.Mockito.spy; import android.content.Context; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -50,7 +49,6 @@ public class LocationServicesPreferenceControllerTest { assertThat(mController.isAvailable()).isTrue(); } - @Ignore @Test @Config(qualifiers = "mcc999") public void testLocationScanning_ifDisabled_shouldNotBeShown() { diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java index 8d6d2d9bc4e..bf866b2f0e0 100644 --- a/tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java @@ -44,6 +44,8 @@ import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceScreen; import com.android.settings.Settings.MobileNetworkActivity; +import com.android.settings.network.helper.SubscriptionAnnotation; +import com.android.settings.network.helper.SubscriptionGrouping; import com.android.settings.widget.AddPreference; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java index b5c821805f3..775ac47a82a 100644 --- a/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java @@ -67,7 +67,6 @@ import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; @@ -174,7 +173,6 @@ public class PrivateDnsPreferenceControllerTest { assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE); } - @Ignore @Test @Config(qualifiers = "mcc999") public void getAvailabilityStatus_unsupportedWhenSet() { @@ -296,7 +294,6 @@ public class PrivateDnsPreferenceControllerTest { com.android.settingslib.R.string.private_dns_mode_opportunistic)); } - @Ignore @Test public void isEnabled_canBeDisabledByAdmin() { final int userId = UserHandle.myUserId(); diff --git a/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java index 1c864c9f558..0131bc50dfa 100644 --- a/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java @@ -31,7 +31,6 @@ import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -76,7 +75,6 @@ public class ChargingSoundPreferenceControllerTest { assertThat(mController.isAvailable()).isTrue(); } - @Ignore @Test @Config(qualifiers = "mcc999") public void isAvailable_whenNotVisible_isFalse() { diff --git a/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java index 982316acad7..ed934733ea5 100644 --- a/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java @@ -42,7 +42,6 @@ import com.android.settingslib.media.MediaDevice; import com.android.settingslib.media.MediaOutputConstants; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -89,7 +88,6 @@ public class MediaVolumePreferenceControllerTest { assertThat(mController.isAvailable()).isTrue(); } - @Ignore @Test @Config(qualifiers = "mcc999") public void isAvailable_whenNotVisible_isFalse() { diff --git a/tests/robotests/src/com/android/settings/notification/NotificationRingtonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationRingtonePreferenceControllerTest.java index 783a36b0160..1aecad51242 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationRingtonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationRingtonePreferenceControllerTest.java @@ -21,7 +21,6 @@ import static com.google.common.truth.Truth.assertThat; import android.media.RingtoneManager; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; @@ -45,7 +44,6 @@ public class NotificationRingtonePreferenceControllerTest { assertThat(mController.isAvailable()).isTrue(); } - @Ignore @Test @Config(qualifiers = "mcc999") public void isAvailable_whenNotVisible_isFalse() { diff --git a/tests/robotests/src/com/android/settings/notification/RedactionInterstitialTest.java b/tests/robotests/src/com/android/settings/notification/RedactionInterstitialTest.java index 2668e6d39cc..9d475b84524 100644 --- a/tests/robotests/src/com/android/settings/notification/RedactionInterstitialTest.java +++ b/tests/robotests/src/com/android/settings/notification/RedactionInterstitialTest.java @@ -27,7 +27,6 @@ import com.android.settings.testutils.shadow.ShadowUtils; import org.junit.After; import org.junit.Assert; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; @@ -36,7 +35,6 @@ import org.robolectric.annotation.Config; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowUserManager; -@Ignore @RunWith(RobolectricTestRunner.class) @Config(shadows = { ShadowUtils.class, diff --git a/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java index e0b7e148c79..0a1ce1fabf4 100644 --- a/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java @@ -31,7 +31,6 @@ import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -76,7 +75,6 @@ public class ScreenLockSoundPreferenceControllerTest { assertThat(mController.isAvailable()).isTrue(); } - @Ignore @Test @Config(qualifiers = "mcc999") public void isAvailable_whenNotVisible_isFalse() { diff --git a/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java index 53359cb98ea..09fdada1a02 100644 --- a/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java @@ -32,7 +32,6 @@ import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -80,7 +79,6 @@ public class TouchSoundPreferenceControllerTest { assertThat(mController.isAvailable()).isTrue(); } - @Ignore @Test @Config(qualifiers = "mcc999") public void isAvailable_whenNotVisible_isFalse() { diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java index 301a6db8ecd..7715c62b55b 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java @@ -39,14 +39,12 @@ import com.android.settings.testutils.shadow.ShadowUtils; import com.google.android.setupdesign.GlifLayout; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -@Ignore @RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowUtils.class) public class ChooseLockPatternTest { diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java index de55435dd68..fcab7976752 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java @@ -24,7 +24,6 @@ import android.os.UserHandle; import com.android.internal.widget.LockPatternUtils; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settings.testutils.shadow.ShadowUtils; -import com.android.settings.utils.ActivityControllerWrapper; import com.google.android.setupcompat.util.WizardManagerHelper; import com.google.android.setupdesign.util.ThemeHelper; @@ -44,8 +43,7 @@ public class ChooseLockSettingsHelperTest { @Test public void testLaunchConfirmationActivityWithExternal() { - final Activity activity = (Activity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(Activity.class)).get(); + final Activity activity = Robolectric.setupActivity(Activity.class); ChooseLockSettingsHelper.Builder builder = new ChooseLockSettingsHelper.Builder(activity); builder.setRequestCode(100) @@ -130,8 +128,7 @@ public class ChooseLockSettingsHelperTest { @Test public void launchConfirmPattern_ForceVerify_shouldLaunchInternalActivity() { - final Activity activity = (Activity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(Activity.class)).get(); + final Activity activity = Robolectric.setupActivity(Activity.class); ChooseLockSettingsHelper.Builder builder = new ChooseLockSettingsHelper.Builder(activity); builder.setRequestCode(100) @@ -151,8 +148,7 @@ public class ChooseLockSettingsHelperTest { @Test public void launchConfirmPassword_ForceVerify_shouldLaunchInternalActivity() { - final Activity activity = (Activity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(Activity.class)).get(); + final Activity activity = Robolectric.setupActivity(Activity.class); ChooseLockSettingsHelper.Builder builder = new ChooseLockSettingsHelper.Builder(activity); builder.setRequestCode(100) @@ -172,8 +168,7 @@ public class ChooseLockSettingsHelperTest { @Test public void launchConfirmPassword_remoteValidation_passwordLockType() throws Exception { - final Activity activity = (Activity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(Activity.class)).get(); + Activity activity = Robolectric.setupActivity(Activity.class); ShadowActivity shadowActivity = Shadows.shadowOf(activity); RemoteLockscreenValidationSession request = createRemoteLockscreenValidationSession( KeyguardManager.PASSWORD, VALID_REMAINING_ATTEMPTS); @@ -202,9 +197,7 @@ public class ChooseLockSettingsHelperTest { @Test public void launchConfirmPassword_remoteValidation_pinLockType() throws Exception { - Activity activity = (Activity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(Activity.class)).get(); - + Activity activity = Robolectric.setupActivity(Activity.class); ShadowActivity shadowActivity = Shadows.shadowOf(activity); RemoteLockscreenValidationSession request = createRemoteLockscreenValidationSession( KeyguardManager.PIN, VALID_REMAINING_ATTEMPTS); @@ -233,8 +226,7 @@ public class ChooseLockSettingsHelperTest { @Test public void launchConfirmPattern_remoteValidation_patternLockType() throws Exception { - Activity activity = (Activity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(Activity.class)).get(); + Activity activity = Robolectric.setupActivity(Activity.class); ShadowActivity shadowActivity = Shadows.shadowOf(activity); RemoteLockscreenValidationSession request = createRemoteLockscreenValidationSession( KeyguardManager.PATTERN, VALID_REMAINING_ATTEMPTS); diff --git a/tests/robotests/src/com/android/settings/password/ConfirmLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/ConfirmLockPasswordTest.java index 2be8aba1563..d26c33b6e68 100644 --- a/tests/robotests/src/com/android/settings/password/ConfirmLockPasswordTest.java +++ b/tests/robotests/src/com/android/settings/password/ConfirmLockPasswordTest.java @@ -62,7 +62,6 @@ import com.android.settings.testutils.shadow.ShadowUtils; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; @@ -162,7 +161,6 @@ public class ConfirmLockPasswordTest { InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD); } - @Ignore @Test public void handleNext_normalFlow_doesNotAttemptRemoteLockscreenValidation() { ConfirmLockPassword activity = Robolectric.buildActivity( @@ -177,7 +175,6 @@ public class ConfirmLockPasswordTest { verifyNoInteractions(mRemoteLockscreenValidationClient); } - @Ignore @Test public void handleNext_remoteValidation_correctGuess_checkboxChecked() throws Exception { ConfirmDeviceCredentialBaseActivity activity = diff --git a/tests/robotests/src/com/android/settings/password/ConfirmLockPatternTest.java b/tests/robotests/src/com/android/settings/password/ConfirmLockPatternTest.java index 68bee68f3e6..2ed79885430 100644 --- a/tests/robotests/src/com/android/settings/password/ConfirmLockPatternTest.java +++ b/tests/robotests/src/com/android/settings/password/ConfirmLockPatternTest.java @@ -55,11 +55,9 @@ import com.android.settings.testutils.shadow.ShadowDevicePolicyManager; import com.android.settings.testutils.shadow.ShadowLockPatternUtils; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settings.testutils.shadow.ShadowUtils; -import com.android.settings.utils.ActivityControllerWrapper; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; @@ -145,9 +143,8 @@ public class ConfirmLockPatternTest { @Test public void onPatternDetected_normalFlow_doesNotAttemptRemoteLockscreenValidation() { - ConfirmLockPattern activity = (ConfirmLockPattern) ActivityControllerWrapper.setup( - Robolectric.buildActivity(ConfirmLockPattern.class, new Intent())).get(); - + ConfirmLockPattern activity = Robolectric.buildActivity( + ConfirmLockPattern.class, new Intent()).setup().get(); ConfirmDeviceCredentialBaseFragment fragment = getConfirmDeviceCredentialBaseFragment(activity); LockPatternView lockPatternView = activity.findViewById(R.id.lockPattern); @@ -158,7 +155,6 @@ public class ConfirmLockPatternTest { verifyNoInteractions(mRemoteLockscreenValidationClient); } - @Ignore @Test public void onPatternDetected_remoteValidation_guessValid_checkboxChecked() throws Exception { ConfirmDeviceCredentialBaseActivity activity = diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockGenericTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockGenericTest.java index 0eb365bfa1b..c23ce9be665 100644 --- a/tests/robotests/src/com/android/settings/password/SetupChooseLockGenericTest.java +++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockGenericTest.java @@ -44,7 +44,6 @@ import com.android.settings.testutils.shadow.ShadowLockPatternUtils; import com.android.settings.testutils.shadow.ShadowPasswordUtils; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settings.testutils.shadow.ShadowUtils; -import com.android.settings.utils.ActivityControllerWrapper; import com.google.android.setupdesign.GlifPreferenceLayout; @@ -58,6 +57,7 @@ import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; import org.robolectric.Robolectric; import org.robolectric.RobolectricTestRunner; +import org.robolectric.android.controller.ActivityController; import org.robolectric.annotation.Config; import java.util.List; @@ -202,8 +202,8 @@ public class SetupChooseLockGenericTest { intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FACE, forFace); intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_BIOMETRICS, forBiometric); - SetupChooseLockGeneric activity = (SetupChooseLockGeneric) ActivityControllerWrapper.setup( - Robolectric.buildActivity(SetupChooseLockGeneric.class, intent)).get(); + SetupChooseLockGeneric activity = ActivityController.of( + new SetupChooseLockGeneric(), intent).setup().get(); List fragments = activity.getSupportFragmentManager().getFragments(); assertThat(fragments).isNotNull(); diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java index bff69916ab8..97a326f7f11 100644 --- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java +++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java @@ -40,7 +40,6 @@ import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; import com.android.settings.testutils.shadow.ShadowDevicePolicyManager; import com.android.settings.testutils.shadow.ShadowLockPatternUtils; import com.android.settings.testutils.shadow.ShadowUtils; -import com.android.settings.utils.ActivityControllerWrapper; import com.android.settings.widget.ScrollToParentEditText; import com.google.android.setupcompat.PartnerCustomizationLayout; @@ -50,7 +49,6 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.Robolectric; import org.robolectric.RobolectricTestRunner; import org.robolectric.Shadows; import org.robolectric.android.controller.ActivityController; @@ -96,8 +94,7 @@ public class SetupChooseLockPasswordTest { application, new IntentBuilder(application).build()); - ActivityControllerWrapper.setup( - Robolectric.buildActivity(SetupChooseLockPassword.class, intent)).get(); + ActivityController.of(new SetupChooseLockPassword(), intent).setup().get(); } @Test @@ -218,8 +215,7 @@ public class SetupChooseLockPasswordTest { application, new IntentBuilder(application).build()); intent.putExtra(ChooseLockGenericFragment.EXTRA_SHOW_OPTIONS_BUTTON, true); - return (SetupChooseLockPassword) ActivityControllerWrapper.setup( - Robolectric.buildActivity(SetupChooseLockPassword.class, intent)).get(); + return ActivityController.of(new SetupChooseLockPassword(), intent).setup().get(); } @Implements(ChooseLockGenericController.class) diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java index d353a22599a..648c42f1fca 100644 --- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java +++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java @@ -45,19 +45,17 @@ import com.android.settings.password.ChooseLockPattern.IntentBuilder; import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; import com.android.settings.testutils.shadow.ShadowLockPatternUtils; import com.android.settings.testutils.shadow.ShadowUtils; -import com.android.settings.utils.ActivityControllerWrapper; import com.google.android.setupcompat.PartnerCustomizationLayout; import com.google.android.setupcompat.template.FooterBarMixin; import com.google.android.setupcompat.template.FooterButton; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.Robolectric; import org.robolectric.RobolectricTestRunner; import org.robolectric.Shadows; +import org.robolectric.android.controller.ActivityController; import org.robolectric.annotation.Config; import org.robolectric.annotation.LooperMode; import org.robolectric.shadows.ShadowPackageManager; @@ -86,9 +84,7 @@ public class SetupChooseLockPatternTest { new IntentBuilder(application) .setUserId(UserHandle.myUserId()) .build()); - - mActivity = (SetupChooseLockPattern) ActivityControllerWrapper.setup( - Robolectric.buildActivity(SetupChooseLockPattern.class, intent)).get(); + mActivity = ActivityController.of(new SetupChooseLockPattern(), intent).setup().get(); } @Test @@ -102,7 +98,6 @@ public class SetupChooseLockPatternTest { assertThat(componentEnabled).isEqualTo(PackageManager.COMPONENT_ENABLED_STATE_ENABLED); } - @Ignore @Test public void optionsButton_whenPatternSelected_shouldBeVisible() { final Button button = mActivity.findViewById(R.id.screen_lock_options); @@ -128,14 +123,12 @@ public class SetupChooseLockPatternTest { assertWithMessage("List items shown").that(count).isEqualTo(3); } - @Ignore @Config(qualifiers = "sw400dp") @Test public void sw400dp_shouldShowScreenLockOptions() { verifyScreenLockOptionsShown(); } - @Ignore @Config(qualifiers = "sw400dp-land") @Test public void sw400dpLandscape_shouldShowScreenLockOptions() { @@ -160,7 +153,6 @@ public class SetupChooseLockPatternTest { verifyScreenLockOptionsHidden(); } - @Ignore @Test public void skipButton_shouldBeVisible_duringNonFingerprintFlow() { final PartnerCustomizationLayout layout = mActivity.findViewById(R.id.setup_wizard_layout); diff --git a/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java b/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java index 2cc256b6bad..53a80dc4e8e 100644 --- a/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java +++ b/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java @@ -35,7 +35,6 @@ import com.android.settings.R; import com.android.settings.biometrics.BiometricUtils; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.shadow.ShadowUtils; -import com.android.settings.utils.ActivityControllerWrapper; import org.junit.Before; import org.junit.Rule; @@ -71,8 +70,7 @@ public class SetupSkipDialogTest { ShadowUtils.setFingerprintManager(mFingerprintManager); ShadowUtils.setFaceManager(mFaceManager); mFakeFeatureFactory = FakeFeatureFactory.setupForTest(); - mActivity = (FragmentActivity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(FragmentActivity.class)).get(); + mActivity = Robolectric.setupActivity(FragmentActivity.class); when(mFakeFeatureFactory.mFaceFeatureProvider.isSetupWizardSupported(any())).thenReturn( true); diff --git a/tests/robotests/src/com/android/settings/password/TestUtils.java b/tests/robotests/src/com/android/settings/password/TestUtils.java index fa6a11d2926..ef08f054622 100644 --- a/tests/robotests/src/com/android/settings/password/TestUtils.java +++ b/tests/robotests/src/com/android/settings/password/TestUtils.java @@ -27,7 +27,6 @@ import android.content.pm.ServiceInfo; import com.android.security.SecureBox; import com.android.settings.R; -import com.android.settings.utils.ActivityControllerWrapper; import org.robolectric.Robolectric; @@ -96,11 +95,7 @@ public final class TestUtils { public static ConfirmDeviceCredentialBaseActivity buildConfirmDeviceCredentialBaseActivity( Class impl, Intent intent) { - - return (ConfirmDeviceCredentialBaseActivity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(impl, intent)).get(); - - //return Robolectric.buildActivity(impl, intent).setup().get(); + return Robolectric.buildActivity(impl, intent).setup().get(); } public static ConfirmDeviceCredentialBaseFragment getConfirmDeviceCredentialBaseFragment( diff --git a/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java b/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java index 8b8fad0ea5a..09b1ea944a5 100644 --- a/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java +++ b/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java @@ -31,7 +31,6 @@ import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.search.SearchIndexableRaw; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; @@ -96,7 +95,6 @@ public class BaseSearchIndexProviderTest { assertThat(mIndexProvider.getNonIndexableKeys(mContext)).isEqualTo(Collections.EMPTY_LIST); } - @Ignore @Test @Config(qualifiers = "mcc999") public void getAllPreferenceControllers_shouldCreateControllerFromCodeAndXml() { @@ -180,7 +178,6 @@ public class BaseSearchIndexProviderTest { assertThat(nonIndexableKeys).contains("status_header"); } - @Ignore @Test @Config(qualifiers = "mcc999") public void getNonIndexableKeys_hasSearchableAttributeInXml_shouldSuppressUnsearchable() { diff --git a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java index 0aa49eb6d68..f3496001d09 100644 --- a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java @@ -33,7 +33,6 @@ import androidx.fragment.app.FragmentActivity; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.shadow.ShadowUtils; -import com.android.settings.utils.ActivityControllerWrapper; import org.junit.Before; import org.junit.Ignore; @@ -55,11 +54,7 @@ public class SearchFeatureProviderImplTest { @Before public void setUp() { FakeFeatureFactory.setupForTest(); - mActivity = (FragmentActivity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(FragmentActivity.class)).get(); - - mActivity = (FragmentActivity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(FragmentActivity.class)).get(); + mActivity = Robolectric.setupActivity(FragmentActivity.class); mProvider = new SearchFeatureProviderImpl(); mPackageManager = Shadows.shadowOf(mActivity.getPackageManager()); Settings.Global.putInt(mActivity.getContentResolver(), diff --git a/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java b/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java index c70411c354d..21b00a336a9 100644 --- a/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java +++ b/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java @@ -30,7 +30,6 @@ import com.android.settingslib.search.SearchIndexableData; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; @@ -131,7 +130,6 @@ public class SettingsSearchIndexablesProviderTest { assertThat(cursor.getString(6)).isNull(); } - @Ignore @Test @Config(qualifiers = "mcc999") public void testNonIndexablesColumnFetched() { diff --git a/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java index 67798aa8ea6..410198bf796 100644 --- a/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java @@ -32,7 +32,6 @@ import com.android.settings.testutils.shadow.ShadowLockPatternUtils; import com.android.settings.testutils.shadow.ShadowUserManager; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; @@ -57,7 +56,6 @@ public class EncryptionStatusPreferenceControllerTest { mPreference = new Preference(mContext); } - @Ignore @Test @Config(qualifiers = "mcc999") public void isAvailable_notVisible_false() { diff --git a/tests/robotests/src/com/android/settings/security/MemtagPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/MemtagPreferenceControllerTest.java index 521a9393d46..e3fc3cc5414 100644 --- a/tests/robotests/src/com/android/settings/security/MemtagPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/MemtagPreferenceControllerTest.java @@ -37,7 +37,6 @@ import com.android.settingslib.RestrictedSwitchPreference; import com.android.settingslib.testutils.shadow.ShadowInteractionJankMonitor; import org.junit.Before; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -46,7 +45,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowSystemProperties; -@Ignore @RunWith(RobolectricTestRunner.class) @Config( shadows = { diff --git a/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java index 546545c1d02..4f694bc8d40 100644 --- a/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java @@ -28,7 +28,6 @@ import com.android.settings.R; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; @@ -63,7 +62,6 @@ public class ScreenPinningPreferenceControllerTest { assertThat(mController.isAvailable()).isTrue(); } - @Ignore @Test @Config(qualifiers = "mcc999") public void isAvailable_whenNotVisible_isFalse() { diff --git a/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java index 35e1c9bf530..206dee1ffb2 100644 --- a/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java @@ -28,7 +28,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -62,7 +61,6 @@ public class ShowPasswordPreferenceControllerTest { assertThat(mController.isAvailable()).isTrue(); } - @Ignore @Test @Config(qualifiers = "mcc999") public void isAvailable_whenNotVisible_isFalse() { diff --git a/tests/robotests/src/com/android/settings/security/screenlock/PinPrivacyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/PinPrivacyPreferenceControllerTest.java index 73b4b9b3165..171fb44786d 100644 --- a/tests/robotests/src/com/android/settings/security/screenlock/PinPrivacyPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/screenlock/PinPrivacyPreferenceControllerTest.java @@ -32,7 +32,6 @@ import androidx.preference.SwitchPreference; import com.android.internal.widget.LockPatternUtils; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -67,7 +66,6 @@ public class PinPrivacyPreferenceControllerTest { assertThat(mController.isAvailable()).isTrue(); } - @Ignore @Test public void isAvailable_lockSetToPinOrPw_shouldReturnTrue() { when(mLockPatternUtils.getCredentialTypeForUser(TEST_USER_ID)).thenReturn( diff --git a/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java index 43f5cfce8c1..33a62f40a9c 100644 --- a/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java @@ -32,7 +32,6 @@ import com.android.settings.testutils.FakeFeatureFactory; import com.android.settingslib.utils.StringUtil; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -76,7 +75,6 @@ public class ManageTrustAgentsPreferenceControllerTest { assertThat(mController.isAvailable()).isTrue(); } - @Ignore @Test @Config(qualifiers = "mcc999") public void isAvailable_whenNotVisible_isFalse() { diff --git a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java index b6b9788e15d..0463e003ae2 100644 --- a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java @@ -45,7 +45,6 @@ import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.search.SearchIndexableRaw; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -102,7 +101,6 @@ public class TrustAgentListPreferenceControllerTest { assertThat(mController).isInstanceOf(PreferenceControllerMixin.class); } - @Ignore @Test @Config(qualifiers = "mcc999") public void isAvailable_whenNotVisible_isFalse() { @@ -152,7 +150,6 @@ public class TrustAgentListPreferenceControllerTest { verify(mCategory, atLeastOnce()).addPreference(any(Preference.class)); } - @Ignore @Test @Config(qualifiers = "mcc999") public void onResume_ifNotAvailable_shouldNotAddNewAgents() { diff --git a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java index 4903a28ad53..57f4e170298 100644 --- a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java +++ b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java @@ -30,6 +30,7 @@ import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -63,7 +64,6 @@ import com.android.settings.testutils.shadow.ShadowUtils; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -636,7 +636,6 @@ public class SettingsSliceProviderTest { verify(mManager, never()).grantSlicePermission(anyString(), any(Uri.class)); } - @Ignore @Test @Config(qualifiers = "mcc999") public void grantAllowlistedPackagePermissions_hasPackageAllowlist_shouldGrant() { @@ -664,7 +663,6 @@ public class SettingsSliceProviderTest { assertThat(mProvider.isPrivateSlicesNeeded(uri)).isFalse(); } - @Ignore @Test @Config(qualifiers = "mcc999") public void isPrivateSlicesNeeded_correctUriWithPermissionAndIsSI_returnTrue() { diff --git a/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java b/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java index ec828a8c622..69f1886db20 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java +++ b/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java @@ -41,7 +41,6 @@ import com.android.settingslib.search.SearchIndexableData; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; @@ -89,7 +88,6 @@ public class SliceDataConverterTest { mFakeFeatureFactory.searchFeatureProvider = mock(SearchFeatureProvider.class); } - @Ignore @Test @Config(qualifiers = "mcc999") public void testFakeProvider_convertsFakeData() { diff --git a/tests/robotests/src/com/android/settings/support/SupportPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/support/SupportPreferenceControllerTest.java index f095cc85bd2..735dd34f372 100644 --- a/tests/robotests/src/com/android/settings/support/SupportPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/support/SupportPreferenceControllerTest.java @@ -28,7 +28,6 @@ import android.app.Activity; import androidx.preference.Preference; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.utils.ActivityControllerWrapper; import org.junit.Before; import org.junit.Test; @@ -47,8 +46,7 @@ public class SupportPreferenceControllerTest { @Before public void setUp() { - mActivity = (Activity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(Activity.class)).get(); + mActivity = Robolectric.setupActivity(Activity.class); mFeatureFactory = FakeFeatureFactory.setupForTest(); mPreference = new Preference(mActivity); mPreference.setKey("test_key"); diff --git a/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java b/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java index 0fc3ca12a3d..8f4326802ee 100644 --- a/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java +++ b/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java @@ -11,7 +11,6 @@ import androidx.fragment.app.FragmentActivity; import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.overlay.SurveyFeatureProvider; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.utils.ActivityControllerWrapper; import org.junit.Before; import org.junit.Test; @@ -43,8 +42,7 @@ public class SurveyMixinTest { @Test public void onResume_noActionIfActivityDoesNotExist() { // Pretend we are an activity that is starting up - FragmentActivity temp = (FragmentActivity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(FragmentActivity.class)).get(); + FragmentActivity temp = Robolectric.setupActivity(FragmentActivity.class); when(mFragment.getActivity()).thenReturn(null); SurveyMixin mixin = new SurveyMixin(mFragment, FAKE_KEY); mixin.onResume(); diff --git a/tests/robotests/src/com/android/settings/system/AdditionalSystemUpdatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/system/AdditionalSystemUpdatePreferenceControllerTest.java index a853b9e32b3..0abfc20b59c 100644 --- a/tests/robotests/src/com/android/settings/system/AdditionalSystemUpdatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/system/AdditionalSystemUpdatePreferenceControllerTest.java @@ -20,7 +20,6 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; @@ -47,7 +46,6 @@ public class AdditionalSystemUpdatePreferenceControllerTest { assertThat(mController.isAvailable()).isFalse(); } - @Ignore @Test @Config(qualifiers = "mcc999") public void displayPrefs_ifAvailable_shouldDisplay() { diff --git a/tests/robotests/src/com/android/settings/system/ResetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/system/ResetPreferenceControllerTest.java index 7ceac2367ab..dd95d2973cb 100644 --- a/tests/robotests/src/com/android/settings/system/ResetPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/system/ResetPreferenceControllerTest.java @@ -20,7 +20,6 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; @@ -46,7 +45,6 @@ public class ResetPreferenceControllerTest { assertThat(mController.isAvailable()).isTrue(); } - @Ignore @Test @Config(qualifiers = "mcc999") public void isAvailable_ifNotVisible_false() { diff --git a/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java index 544ba96d64b..61aa294fd9b 100644 --- a/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java @@ -38,7 +38,6 @@ import com.android.settings.testutils.shadow.ShadowUserManager; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -112,7 +111,6 @@ public class SystemUpdatePreferenceControllerTest { assertThat(mPreference.isVisible()).isFalse(); } - @Ignore @Test @Config(qualifiers = "mcc999") public void displayPrefs_ifAdminUser_butNotVisible_shouldNotDisplay() { diff --git a/tests/robotests/src/com/android/settings/theme/ContrastPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/theme/ContrastPreferenceControllerTest.java index 8f78df97f76..dbd33728b85 100644 --- a/tests/robotests/src/com/android/settings/theme/ContrastPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/theme/ContrastPreferenceControllerTest.java @@ -38,7 +38,6 @@ import androidx.preference.Preference; import androidx.test.core.app.ApplicationProvider; import org.junit.Before; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -74,7 +73,6 @@ public class ContrastPreferenceControllerTest { assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE); } - @Ignore @Test public void testHandlePreferenceTreeClick() { Preference preference = new Preference(mContext); diff --git a/tests/robotests/src/com/android/settings/users/TimeoutToDockUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/TimeoutToDockUserPreferenceControllerTest.java index 92bdc6def61..3d8e8930775 100644 --- a/tests/robotests/src/com/android/settings/users/TimeoutToDockUserPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/TimeoutToDockUserPreferenceControllerTest.java @@ -40,7 +40,6 @@ import com.android.settings.testutils.shadow.ShadowSecureSettings; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -127,7 +126,6 @@ public class TimeoutToDockUserPreferenceControllerTest { BasePreferenceController.CONDITIONALLY_UNAVAILABLE); } - @Ignore @Test public void getAvailabilityStatus_isCurrentlyMainUser_returnDisabledForUser() { when(Utils.canCurrentUserDream(mContext)).thenReturn(true); @@ -136,7 +134,6 @@ public class TimeoutToDockUserPreferenceControllerTest { BasePreferenceController.DISABLED_FOR_USER); } - @Ignore @Test public void getAvailabilityStatus_featureAndMultiUserEnabledAndNonMainUser_returnAvailable() { when(Utils.canCurrentUserDream(mContext)).thenReturn(false); diff --git a/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java b/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java index fbe4a055905..256e08b38a2 100644 --- a/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java +++ b/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java @@ -63,7 +63,6 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -662,7 +661,6 @@ public class UserDetailsSettingsTest { assertThat(result).isTrue(); } - @Ignore @Test public void canDeleteUser_adminSelectsUser_hasRemoveRestriction_shouldReturnFalse() { setupSelectedUser(); diff --git a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java index 37af4b17c43..36eeac8208c 100644 --- a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java +++ b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java @@ -73,7 +73,6 @@ import com.android.settingslib.search.SearchIndexableRaw; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.AdditionalMatchers; @@ -262,7 +261,6 @@ public class UserSettingsTest { eq(SettingsEnums.ACTION_USER_GUEST_EXIT_CONFIRMED)); } - @Ignore @Test public void withDisallowRemoveUser_ShouldDisableRemoveUser() { // TODO(b/115781615): Tidy robolectric tests diff --git a/tests/robotests/src/com/android/settings/utils/ActivityControllerWrapper.java b/tests/robotests/src/com/android/settings/utils/ActivityControllerWrapper.java deleted file mode 100644 index 6ebbc6533fe..00000000000 --- a/tests/robotests/src/com/android/settings/utils/ActivityControllerWrapper.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (C) 2023 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.settings.utils; - -import android.os.Bundle; - -import org.robolectric.android.controller.ActivityController; - -/* - * b/275023433 - * This class is a workaround for Robolectric, in order to re-enable presubmit - * We don't use ActivityController#visible() to avoid test crash - */ -public class ActivityControllerWrapper { - - private static final boolean ENABLE_WORKAROUND = true; - - - public static ActivityController setup(ActivityController controller) { - if (ENABLE_WORKAROUND) { - return controller.create().start().postCreate(null).resume(); - } else { - return controller.setup(); - } - } - - public static ActivityController setup(ActivityController controller, Bundle savedState) { - return controller.create(savedState) - .start() - .restoreInstanceState(savedState) - .postCreate(savedState) - .resume(); - } - -} diff --git a/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java index ed63cc0b574..6201bcb1191 100644 --- a/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java +++ b/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java @@ -27,8 +27,6 @@ import android.content.Context; import android.content.Intent; import android.content.res.Resources; -import com.android.settings.utils.ActivityControllerWrapper; - import com.google.android.setupcompat.util.WizardManagerHelper; import org.junit.After; @@ -121,13 +119,10 @@ public class WallpaperSuggestionActivityTest { @Test public void addExtras_intentNotFromSetupWizard_extrasHasFocusWallpaper() { - WallpaperSuggestionActivity activity = - (WallpaperSuggestionActivity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(WallpaperSuggestionActivity.class, - new Intent(Intent.ACTION_MAIN).setComponent( + WallpaperSuggestionActivity activity = Robolectric.buildActivity( + WallpaperSuggestionActivity.class, new Intent(Intent.ACTION_MAIN).setComponent( new ComponentName(RuntimeEnvironment.application, - PACKAGE_WALLPAPER_ACTIVITY)))).get(); - + PACKAGE_WALLPAPER_ACTIVITY))).setup().get(); Intent intent = Shadows.shadowOf(activity).getNextStartedActivity(); assertThat(intent).isNotNull(); diff --git a/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypePreferenceControllerTest.java index fc6df9c09c4..8871cc8bb27 100644 --- a/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypePreferenceControllerTest.java @@ -25,7 +25,6 @@ import android.content.Intent; import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; -import com.android.settings.utils.ActivityControllerWrapper; import org.junit.Before; import org.junit.Test; @@ -45,8 +44,7 @@ public class WallpaperTypePreferenceControllerTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - mContext = (Activity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(Activity.class)).get(); + mContext = Robolectric.setupActivity(Activity.class); mController = new WallpaperTypePreferenceController(mContext, "pref_key"); mIntent = new Intent(); mPreference = new Preference(mContext); diff --git a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java index bc816fa3de1..834f3d1ed83 100644 --- a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java @@ -45,7 +45,6 @@ import com.android.settings.R; import com.android.settingslib.widget.LayoutPreference; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Answers; @@ -204,7 +203,6 @@ public class EntityHeaderControllerTest { verify(activity, never()).startActivity(any(Intent.class)); } - @Ignore @Test public void bindButton_hasAppInfo_shouldAttachClickListener() { final View appLinks = mLayoutInflater.inflate( diff --git a/tests/robotests/src/com/android/settings/widget/SeekBarPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/SeekBarPreferenceTest.java index 809aa872851..732defb8a0c 100644 --- a/tests/robotests/src/com/android/settings/widget/SeekBarPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/SeekBarPreferenceTest.java @@ -39,7 +39,6 @@ import com.android.settings.testutils.shadow.ShadowInteractionJankMonitor; import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -49,7 +48,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.androidx.fragment.FragmentController; -@Ignore @RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowRestrictedLockUtilsInternal.class, ShadowInteractionJankMonitor.class}) public class SeekBarPreferenceTest { @@ -102,7 +100,6 @@ public class SeekBarPreferenceTest { assertThat(mSeekBarPreference.isSelectable()).isTrue(); } - @Ignore @Test @Config(qualifiers = "mcc998") public void isSelectable_default_returnFalse() { diff --git a/tests/robotests/src/com/android/settings/widget/SettingsMainSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/SettingsMainSwitchPreferenceTest.java index 33c9facd1f0..c079029ffe0 100644 --- a/tests/robotests/src/com/android/settings/widget/SettingsMainSwitchPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/SettingsMainSwitchPreferenceTest.java @@ -29,7 +29,6 @@ import androidx.preference.PreferenceViewHolder; import com.android.settings.R; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -59,7 +58,6 @@ public class SettingsMainSwitchPreferenceTest { mHolder = PreferenceViewHolder.createInstanceForTests(rootView); } - @Ignore @Test public void onBindViewHolder_isRestricted_restrictIconShouldDisplay() { mPreference.onBindViewHolder(mHolder); diff --git a/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java index 2c0ad7d2e67..2492de1e58b 100644 --- a/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java @@ -40,7 +40,6 @@ import com.android.settings.R; import com.android.settings.testutils.shadow.ShadowSettingsMediaPlayer; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -141,7 +140,6 @@ public class VideoPreferenceTest { assertThat(mAnimationController.isPlaying()).isTrue(); } - @Ignore @Test @Config(qualifiers = "mcc999") public void onViewVisible_createAnimationController() { diff --git a/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java index bb0ae1a554e..5e3d7150bb5 100644 --- a/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java @@ -30,7 +30,6 @@ import com.android.settings.testutils.XmlTestUtils; import com.android.settingslib.core.AbstractPreferenceController; import org.junit.Before; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -69,7 +68,6 @@ public class ConfigureWifiSettingsTest { TestConfigureWifiSettings mSettings; - @Ignore @Before public void setUp() { when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager); @@ -148,7 +146,6 @@ public class ConfigureWifiSettingsTest { verify(mPreferenceScreen).removeAll(); } - @Ignore @Test @Config(qualifiers = "mcc999") public void getNonIndexableKeys_ifPageDisabled_shouldNotIndexResource() { diff --git a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogActivityTest.java b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogActivityTest.java index fb29924c106..616cb0bde39 100644 --- a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogActivityTest.java +++ b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogActivityTest.java @@ -37,7 +37,6 @@ import androidx.appcompat.app.AlertDialog; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; -import com.android.settings.utils.ActivityControllerWrapper; import com.android.settings.wifi.NetworkRequestErrorDialogFragment.ERROR_DIALOG_TYPE; import com.android.wifitrackerlib.WifiPickerTracker; @@ -82,8 +81,7 @@ public class NetworkRequestDialogActivityTest { .thenReturn(mock(WifiPickerTracker.class)); mScanResults.add(getScanResult(TEST_SSID, TEST_CAPABILITY)); - mActivity = spy((NetworkRequestDialogActivity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(NetworkRequestDialogActivity.class)).get()); + mActivity = spy(Robolectric.setupActivity(NetworkRequestDialogActivity.class)); when(mActivity.getSystemService(WifiManager.class)).thenReturn(mWifiManager); } @@ -183,8 +181,7 @@ public class NetworkRequestDialogActivityTest { @Test public void onAbort_withFakeActivity_callStopAndPopShouldBeTrue() { final FakeNetworkRequestDialogActivity fakeActivity = - (FakeNetworkRequestDialogActivity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(FakeNetworkRequestDialogActivity.class)).get(); + Robolectric.setupActivity(FakeNetworkRequestDialogActivity.class); fakeActivity.onResume(); fakeActivity.onAbort(); diff --git a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java index 2679745918e..386f66d1605 100644 --- a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java @@ -45,7 +45,6 @@ import androidx.fragment.app.FragmentActivity; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; -import com.android.settings.utils.ActivityControllerWrapper; import com.android.wifitrackerlib.WifiEntry; import com.android.wifitrackerlib.WifiPickerTracker; @@ -104,11 +103,10 @@ public class NetworkRequestDialogFragmentTest { when(fakeFeatureFactory.wifiTrackerLibProvider.createWifiPickerTracker( any(), any(), any(), any(), any(), anyLong(), anyLong(), any())) .thenReturn(mock(WifiPickerTracker.class)); - Intent intent = new Intent(); - intent.putExtra(NetworkRequestDialogFragment.EXTRA_APP_NAME, - TEST_APP_NAME); - mActivity = (WifiDialogActivity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(WifiDialogActivity.class, intent)).get(); + + mActivity = Robolectric.buildActivity(FragmentActivity.class, + new Intent().putExtra(NetworkRequestDialogFragment.EXTRA_APP_NAME, + TEST_APP_NAME)).setup().get(); networkRequestDialogFragment = spy(NetworkRequestDialogFragment.newInstance()); networkRequestDialogFragment.mWifiPickerTracker = mWifiPickerTracker; } diff --git a/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java b/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java index 8b9faf2ff09..c9cc02e9afb 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java @@ -41,7 +41,6 @@ import android.net.wifi.WifiManager; import android.os.UserManager; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.utils.ActivityControllerWrapper; import com.android.settingslib.wifi.AccessPoint; import com.android.wifitrackerlib.WifiEntry; @@ -99,8 +98,7 @@ public class WifiDialogActivityTest { when(mWifiEntry.canConnect()).thenReturn(true); FakeFeatureFactory.setupForTest(); - mActivity = spy((WifiDialogActivity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(WifiDialogActivity.class)).get()); + mActivity = spy(Robolectric.setupActivity(WifiDialogActivity.class)); when(mActivity.getSystemService(UserManager.class)).thenReturn(mUserManager); when(mActivity.getSystemService(WifiManager.class)).thenReturn(mWifiManager); when(mActivity.getSystemService(KeyguardManager.class)).thenReturn(mKeyguardManager); @@ -156,8 +154,7 @@ public class WifiDialogActivityTest { final Intent intent = new Intent("com.android.settings.WIFI_DIALOG"); intent.putExtra(WifiDialogActivity.KEY_CHOSEN_WIFIENTRY_KEY, "FAKE_KEY"); intent.putExtra(WifiDialogActivity.KEY_CONNECT_FOR_CALLER, true); - mActivity = spy((WifiDialogActivity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(WifiDialogActivity.class, intent)).get()); + mActivity = spy(Robolectric.buildActivity(WifiDialogActivity.class, intent).setup().get()); when(mActivity.getSystemService(WifiManager.class)).thenReturn(mWifiManager); mActivity.onSubmit(mWifiDialog2); @@ -169,8 +166,7 @@ public class WifiDialogActivityTest { public void onSubmit_whenConnectForCallerIsFalse_shouldNotConnectToNetwork() { final Intent intent = new Intent(); intent.putExtra(WifiDialogActivity.KEY_CONNECT_FOR_CALLER, false); - mActivity = spy((WifiDialogActivity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(WifiDialogActivity.class, intent)).get()); + mActivity = spy(Robolectric.buildActivity(WifiDialogActivity.class, intent).setup().get()); when(mActivity.getSystemService(WifiManager.class)).thenReturn(mWifiManager); mActivity.onSubmit(mWifiDialog); @@ -183,8 +179,7 @@ public class WifiDialogActivityTest { final Intent intent = new Intent("com.android.settings.WIFI_DIALOG"); intent.putExtra(WifiDialogActivity.KEY_CHOSEN_WIFIENTRY_KEY, "FAKE_KEY"); intent.putExtra(WifiDialogActivity.KEY_CONNECT_FOR_CALLER, false); - mActivity = spy((WifiDialogActivity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(WifiDialogActivity.class, intent)).get()); + mActivity = spy(Robolectric.buildActivity(WifiDialogActivity.class, intent).setup().get()); when(mActivity.getSystemService(WifiManager.class)).thenReturn(mWifiManager); mActivity.onSubmit(mWifiDialog2); @@ -198,8 +193,7 @@ public class WifiDialogActivityTest { intent.putExtra(WifiDialogActivity.KEY_CONNECT_FOR_CALLER, false); intent.putExtra(WizardManagerHelper.EXTRA_IS_FIRST_RUN, true); intent.putExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, true); - mActivity = spy((WifiDialogActivity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(WifiDialogActivity.class, intent)).get()); + mActivity = spy(Robolectric.buildActivity(WifiDialogActivity.class, intent).setup().get()); when(mActivity.getSystemService(WifiManager.class)).thenReturn(mWifiManager); doNothing().when(mActivity).createDialogWithSuwTheme(); diff --git a/tests/robotests/src/com/android/settings/wifi/WifiNoInternetDialogTest.java b/tests/robotests/src/com/android/settings/wifi/WifiNoInternetDialogTest.java index 1788a0d96a9..8e52210d818 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiNoInternetDialogTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiNoInternetDialogTest.java @@ -43,10 +43,8 @@ import android.net.NetworkRequest; import android.os.Bundle; import com.android.settings.R; -import com.android.settings.utils.ActivityControllerWrapper; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; @@ -57,7 +55,6 @@ import org.robolectric.Robolectric; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@Ignore @RunWith(RobolectricTestRunner.class) public class WifiNoInternetDialogTest { @@ -87,8 +84,8 @@ public class WifiNoInternetDialogTest { @Test public void launchActivity_noIntentAction_shouldNotFatalException() { - ActivityControllerWrapper.setup( - Robolectric.buildActivity(WifiNoInternetDialog.class)).get(); + WifiNoInternetDialog wifiNoInternetDialog = + Robolectric.setupActivity(WifiNoInternetDialog.class); } @Test @@ -276,7 +273,6 @@ public class WifiNoInternetDialogTest { RuntimeEnvironment.application.getPackageName(), WifiNoInternetDialog.class.getName()); intent.putExtra(ConnectivityManager.EXTRA_NETWORK, network); - mActivity = spy((WifiNoInternetDialog) ActivityControllerWrapper.setup( - Robolectric.buildActivity(WifiNoInternetDialog.class, intent)).get()); + mActivity = spy(Robolectric.buildActivity(WifiNoInternetDialog.class, intent).get()); } } \ No newline at end of file diff --git a/tests/robotests/src/com/android/settings/wifi/WifiPrimarySwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiPrimarySwitchPreferenceControllerTest.java index 2c125178a39..9204d4326f5 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiPrimarySwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiPrimarySwitchPreferenceControllerTest.java @@ -46,7 +46,6 @@ import com.android.settingslib.PrimarySwitchPreference; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -97,7 +96,6 @@ public class WifiPrimarySwitchPreferenceControllerTest { assertThat(mController.isAvailable()).isTrue(); } - @Ignore @Test @Config(qualifiers = "mcc999") public void testWifiPrimarySwitch_ifDisabled_shouldNotBeShown() { diff --git a/tests/robotests/src/com/android/settings/wifi/WifiScanModeActivityTest.java b/tests/robotests/src/com/android/settings/wifi/WifiScanModeActivityTest.java index 1d3dadff33e..5937997ac17 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiScanModeActivityTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiScanModeActivityTest.java @@ -30,7 +30,6 @@ import android.text.TextUtils; import androidx.test.core.app.ApplicationProvider; import com.android.settings.testutils.shadow.ShadowUtils; -import com.android.settings.utils.ActivityControllerWrapper; import com.android.settingslib.wifi.WifiPermissionChecker; import org.junit.After; @@ -69,8 +68,7 @@ public class WifiScanModeActivityTest { when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager); when(mUserManager.isGuestUser()).thenReturn(false); - mActivity = spy((WifiScanModeActivity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(WifiScanModeActivity.class)).get()); + mActivity = spy(Robolectric.setupActivity(WifiScanModeActivity.class)); when(mActivity.getApplicationContext()).thenReturn(mContext); mActivity.mWifiPermissionChecker = mWifiPermissionChecker; } @@ -82,8 +80,8 @@ public class WifiScanModeActivityTest { @Test public void launchActivity_noIntentAction_shouldNotFatalException() { - ActivityControllerWrapper.setup( - Robolectric.buildActivity(WifiScanModeActivity.class)).get(); + WifiScanModeActivity wifiScanModeActivity = + Robolectric.setupActivity(WifiScanModeActivity.class); } @Test diff --git a/tests/robotests/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragmentTest.java index c5f4cd49f66..303963d7087 100644 --- a/tests/robotests/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragmentTest.java +++ b/tests/robotests/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragmentTest.java @@ -43,7 +43,6 @@ import androidx.fragment.app.FragmentActivity; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.utils.ActivityControllerWrapper; import com.android.wifitrackerlib.WifiEntry; import com.android.wifitrackerlib.WifiPickerTracker; @@ -100,8 +99,7 @@ public class AddAppNetworksFragmentTest { public void setUp() { MockitoAnnotations.initMocks(this); mAddAppNetworksFragment = spy(new AddAppNetworksFragment()); - mActivity = spy((FragmentActivity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(FragmentActivity.class)).get()); + mActivity = spy(Robolectric.setupActivity(FragmentActivity.class)); doReturn(mActivity).when(mAddAppNetworksFragment).getActivity(); when(mWifiManager.isWifiEnabled()).thenReturn(true); when(mActivity.getSystemService(WifiManager.class)).thenReturn(mWifiManager); diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java index da0bdf2e9db..0ece537371f 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java @@ -40,7 +40,6 @@ import androidx.recyclerview.widget.RecyclerView.OnScrollListener; import com.android.settings.R; import com.android.settings.testutils.shadow.ShadowDisclaimerItemFactory; import com.android.settings.testutils.shadow.ShadowFragment; -import com.android.settings.utils.ActivityControllerWrapper; import org.junit.Before; import org.junit.Test; @@ -90,8 +89,7 @@ public class WifiCallingDisclaimerFragmentTest { public void setUp() { MockitoAnnotations.initMocks(this); - mActivity = (FragmentActivity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(FragmentActivity.class)).get(); + mActivity = Robolectric.setupActivity(FragmentActivity.class); mFragment = spy(new WifiCallingDisclaimerFragment()); doReturn(mActivity).when(mFragment).getActivity(); diff --git a/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivityTest.java b/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivityTest.java index 56c1ec7e65b..d8605ded829 100644 --- a/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivityTest.java +++ b/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivityTest.java @@ -28,8 +28,6 @@ import android.os.UserManager; import androidx.test.core.app.ApplicationProvider; -import com.android.settings.utils.ActivityControllerWrapper; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -64,15 +62,14 @@ public class WifiDppConfiguratorActivityTest { mIntent.putExtra(WifiDppUtils.EXTRA_WIFI_SECURITY, "WPA"); mIntent.putExtra(WifiDppUtils.EXTRA_WIFI_PRE_SHARED_KEY, "\\012345678,"); - mActivity = spy((WifiDppConfiguratorActivity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(WifiDppConfiguratorActivity.class)).get()); + mActivity = spy(Robolectric.setupActivity(WifiDppConfiguratorActivity.class)); when(mActivity.getApplicationContext()).thenReturn(mContext); } @Test public void launchActivity_noIntentAction_shouldNotFatalException() { - ActivityControllerWrapper.setup( - Robolectric.buildActivity(WifiDppConfiguratorActivity.class)).get(); + WifiDppConfiguratorActivity wifiDppConfiguratorActivity = + Robolectric.setupActivity(WifiDppConfiguratorActivity.class); } @Test diff --git a/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivityTest.java b/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivityTest.java index 717e4a75669..67d467803b2 100644 --- a/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivityTest.java +++ b/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivityTest.java @@ -19,16 +19,15 @@ package com.android.settings.wifi.dpp; import static com.android.settings.wifi.dpp.WifiDppEnrolleeActivity.ACTION_ENROLLEE_QR_CODE_SCANNER; import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Intent; -import com.android.settings.utils.ActivityControllerWrapper; import com.android.settingslib.wifi.WifiRestrictionsCache; import org.junit.Before; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -58,18 +57,16 @@ public class WifiDppEnrolleeActivityTest { when(mIntent.getAction()).thenReturn(ACTION_ENROLLEE_QR_CODE_SCANNER); when(mIntent.getStringExtra(WifiDppUtils.EXTRA_WIFI_SSID)).thenReturn(WIFI_SSID); - mActivity = (WifiDppEnrolleeActivity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(WifiDppEnrolleeActivity.class)).get(); + mActivity = spy(Robolectric.setupActivity(WifiDppEnrolleeActivity.class)); mActivity.mWifiRestrictionsCache = mWifiRestrictionsCache; } @Test public void launchActivity_noIntentAction_shouldNotFatalException() { - ActivityControllerWrapper.setup( - Robolectric.buildActivity(WifiDppEnrolleeActivity.class)).get(); + WifiDppEnrolleeActivity wifiDppEnrolleeActivity = + Robolectric.setupActivity(WifiDppEnrolleeActivity.class); } - @Ignore @Test public void handleIntent_noIntentAction_shouldFinish() { when(mIntent.getAction()).thenReturn(null); @@ -79,7 +76,6 @@ public class WifiDppEnrolleeActivityTest { verify(mActivity).finish(); } - @Ignore @Test public void handleIntent_notAllowedConfigWifi_shouldFinish() { when(mWifiRestrictionsCache.isConfigWifiAllowed()).thenReturn(false); @@ -89,7 +85,6 @@ public class WifiDppEnrolleeActivityTest { verify(mActivity).finish(); } - @Ignore @Test public void handleIntent_hasIntentDataAndAllowedConfigWifi_shouldShowFragment() { when(mWifiRestrictionsCache.isConfigWifiAllowed()).thenReturn(true); diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2pSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2pSettingsTest.java index 25a59a9e158..a8b1d9cee8f 100644 --- a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2pSettingsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2pSettingsTest.java @@ -48,7 +48,6 @@ import androidx.fragment.app.FragmentTransaction; import com.android.settings.testutils.XmlTestUtils; import com.android.settings.testutils.shadow.ShadowInteractionJankMonitor; -import com.android.settings.utils.ActivityControllerWrapper; import com.android.settingslib.core.AbstractPreferenceController; import org.junit.Before; @@ -90,8 +89,7 @@ public class WifiP2pSettingsTest { mContext = RuntimeEnvironment.application; TestWifiP2pSettings.sMockWifiP2pManager = mWifiP2pManager; - mActivity = (FragmentActivity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(FragmentActivity.class)).get(); + mActivity = Robolectric.setupActivity(FragmentActivity.class); mFragment = new TestWifiP2pSettings(); mFragment.mWifiP2pManager = mWifiP2pManager; doReturn(mChannel).when(mWifiP2pManager).initialize(any(), any(), any()); diff --git a/tests/robotests/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsWifiSettings2Test.java b/tests/robotests/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsWifiSettings2Test.java index d26287d84b2..3e6c64b1ea6 100644 --- a/tests/robotests/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsWifiSettings2Test.java +++ b/tests/robotests/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsWifiSettings2Test.java @@ -34,7 +34,6 @@ import androidx.fragment.app.FragmentTransaction; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.testutils.shadow.ShadowInteractionJankMonitor; -import com.android.settings.utils.ActivityControllerWrapper; import com.android.settingslib.core.AbstractPreferenceController; import org.junit.Before; @@ -66,8 +65,7 @@ public class SavedAccessPointsWifiSettings2Test { MockitoAnnotations.initMocks(this); mContext = spy(RuntimeEnvironment.application); mSettings = spy(new TestFragment()); - mActivity = (FragmentActivity) ActivityControllerWrapper.setup( - Robolectric.buildActivity(FragmentActivity.class)).get(); + mActivity = Robolectric.setupActivity(FragmentActivity.class); doReturn(mSubscribedApController).when(mSettings) .use(SubscribedAccessPointsPreferenceController2.class);