From e30a1833f748e2fce1d20e3ed8c6b040071769b1 Mon Sep 17 00:00:00 2001 From: Christopher Tate Date: Mon, 29 Oct 2018 16:58:33 -0700 Subject: [PATCH 01/22] Fix app link open mode UI The app link open mode UI misrepresented some states; notably, it was representing the 'ask' state as the 'always use this app' state. This had the effect of implicitly pushing the app into 'always' accidentally, as a consequence of setting the UI to that initial state, then re-evaluating on exit against the true state. Bug: 32810168 Test: run cts -m CtsOsHostTestCases Test: manual Change-Id: Ifb9d7ad0140fae5fa75a4b78b01301b196a48d10 --- .../applications/AppLaunchSettings.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/applications/AppLaunchSettings.java b/src/com/android/settings/applications/AppLaunchSettings.java index 0e2e3c7c0f9..3ccc36ff6ec 100644 --- a/src/com/android/settings/applications/AppLaunchSettings.java +++ b/src/com/android/settings/applications/AppLaunchSettings.java @@ -124,6 +124,8 @@ public class AppLaunchSettings extends AppInfoWithHeader implements OnClickListe // * always // * ask // * never + // + // Make sure to update linkStateToIndex() if this presentation order is changed. mAppLinkState.setEntries(new CharSequence[] { getString(R.string.app_link_open_always), getString(R.string.app_link_open_ask), @@ -141,10 +143,7 @@ public class AppLaunchSettings extends AppInfoWithHeader implements OnClickListe // purposes of the UI (and does the right thing around pending domain // verifications that might arrive after the user chooses 'ask' in this UI). final int state = mPm.getIntentVerificationStatusAsUser(mPackageName, UserHandle.myUserId()); - mAppLinkState.setValue( - Integer.toString((state == INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED) - ? INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS_ASK - : state)); + mAppLinkState.setValueIndex(linkStateToIndex(state)); // Set the callback only after setting the initial selected item mAppLinkState.setOnPreferenceChangeListener(new OnPreferenceChangeListener() { @@ -157,6 +156,17 @@ public class AppLaunchSettings extends AppInfoWithHeader implements OnClickListe } } + private int linkStateToIndex(final int state) { + switch (state) { + case INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS: + return 0; // Always + case INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER: + return 2; // Never + default: + return 1; // Ask + } + } + private boolean updateAppLinkState(final int newState) { if (mIsBrowser) { // We shouldn't get into this state, but if we do make sure -- GitLab From ff8fca7d9eac8edea506d5b7c69f101b329176a3 Mon Sep 17 00:00:00 2001 From: tmfang Date: Tue, 11 Dec 2018 21:49:42 +0800 Subject: [PATCH 02/22] Change LayoutPreference resource path in robo test Since we change the name of LayoutPreference in SettingsLib, we also need to change its path for robo test. Test: robotest Change-Id: I0401351585564ebfc320c52279af6bfa3b6dbb84 Fixes: 120706174 --- .../settings/testutils/SettingsRobolectricTestRunner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java index 74914f4eb44..b3b3a8c6162 100644 --- a/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java +++ b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java @@ -86,7 +86,7 @@ public class SettingsRobolectricTestRunner extends RobolectricTestRunner { paths.add(new ResourcePath(null, Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/ActionButtonsPreference/res")), null)); paths.add(new ResourcePath(null, - Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/SettingsLayoutPreference/res")), null)); + Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/LayoutPreference/res")), null)); paths.add(new ResourcePath(null, Fs.fromURL(new URL("file:frameworks/base/core/res/res")), null)); paths.add(new ResourcePath(null, -- GitLab From 18e3692ea369913b1c6639d316c5e4c8f8070807 Mon Sep 17 00:00:00 2001 From: cosmohsieh Date: Mon, 10 Dec 2018 13:44:15 +0800 Subject: [PATCH 03/22] Remove bug id for WiFi MAC randomization since feature is ready. Bug: 117957974 Test: RunSettingsRoboTests Change-Id: I36955d302d9c365e7985a53c6a2a89026f6ebb34 --- src/com/android/settings/wifi/WifiConfigController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java index 2e3b76aea84..67f59ea5de3 100644 --- a/src/com/android/settings/wifi/WifiConfigController.java +++ b/src/com/android/settings/wifi/WifiConfigController.java @@ -279,7 +279,7 @@ public class WifiConfigController implements TextWatcher, mHiddenSettingsSpinner.setSelection(config.hiddenSSID ? HIDDEN_NETWORK : NOT_HIDDEN_NETWORK); - //TODO(b/117957974): set MAC randomization value to mPrivacySettingsSpinner + mPrivacySettingsSpinner.setSelection(config.macRandomizationSetting); if (config.getIpAssignment() == IpAssignment.STATIC) { mIpSettingsSpinner.setSelection(STATIC_IP); showAdvancedFields = true; @@ -759,7 +759,7 @@ public class WifiConfigController implements TextWatcher, } if (mPrivacySettingsSpinner != null) { - //TODO(b/117957974): set MAC randomization value to WifiConfiguration + config.macRandomizationSetting = mPrivacySettingsSpinner.getSelectedItemPosition(); } return config; -- GitLab From c886544a55a79b1aaed8037becf470709d856bfa Mon Sep 17 00:00:00 2001 From: Raff Tsai Date: Thu, 6 Dec 2018 15:53:35 +0800 Subject: [PATCH 04/22] Do not return null in getSlice() - It will result in a empty SliceView. Because we can use slice.hasHint(HINT_ERROR) to check if we should show the slice, always return a valid slice object. - Set tintcolor -1 therefore battery icon will not have tint Bug: 120221527 Test: manual Change-Id: Idfc97f90c75515b079e1faed802c9b9047bfdeb4 --- .../slices/BatteryFixSlice.java | 82 +++++++++---------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java b/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java index 403178c0788..41c27575fd1 100644 --- a/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java +++ b/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java @@ -18,11 +18,14 @@ package com.android.settings.homepage.contextualcards.slices; import static android.content.Context.MODE_PRIVATE; +import static com.android.settings.slices.CustomSliceRegistry.BATTERY_FIX_SLICE_URI; + import android.app.PendingIntent; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.net.Uri; +import android.util.Log; import androidx.annotation.VisibleForTesting; import androidx.annotation.WorkerThread; @@ -36,13 +39,11 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.internal.os.BatteryStatsHelper; import com.android.settings.R; import com.android.settings.SubSettings; -import com.android.settings.Utils; import com.android.settings.fuelgauge.BatteryStatsHelperLoader; import com.android.settings.fuelgauge.PowerUsageSummary; import com.android.settings.fuelgauge.batterytip.BatteryTipLoader; import com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController; import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; -import com.android.settings.slices.CustomSliceRegistry; import com.android.settings.slices.CustomSliceable; import com.android.settings.slices.SliceBackgroundWorker; import com.android.settings.slices.SliceBuilderUtils; @@ -67,59 +68,44 @@ public class BatteryFixSlice implements CustomSliceable { @Override public Uri getUri() { - return CustomSliceRegistry.BATTERY_FIX_SLICE_URI; + return BATTERY_FIX_SLICE_URI; } @Override public Slice getSlice() { - IconCompat icon; - SliceAction primaryAction; - Slice slice = null; + final ListBuilder sliceBuilder = + new ListBuilder(mContext, BATTERY_FIX_SLICE_URI, ListBuilder.INFINITY) + .setAccentColor(-1); // TipType.SUMMARY is battery good if (readBatteryTipAvailabilityCache(mContext) == BatteryTip.TipType.SUMMARY) { - return null; + return buildBatteryGoodSlice(sliceBuilder, true); } final List batteryTips = SliceBackgroundWorker.getInstance(mContext, this).getResults(); - if (batteryTips != null) { - for (BatteryTip batteryTip : batteryTips) { - if (batteryTip.getState() != BatteryTip.StateType.INVISIBLE) { - icon = IconCompat.createWithResource(mContext, batteryTip.getIconId()); - primaryAction = SliceAction.createDeeplink(getPrimaryAction(), - icon, - ListBuilder.ICON_IMAGE, - batteryTip.getTitle(mContext)); - slice = new ListBuilder(mContext, CustomSliceRegistry.BATTERY_FIX_SLICE_URI, - ListBuilder.INFINITY) - .setAccentColor(Utils.getColorAccentDefaultColor(mContext)) - .addRow(new RowBuilder() - .setTitle(batteryTip.getTitle(mContext)) - .setSubtitle(batteryTip.getSummary(mContext)) - .setPrimaryAction(primaryAction) - .addEndItem(icon, ListBuilder.ICON_IMAGE)) - .build(); - break; - } + if (batteryTips == null) { + // Because we need wait slice background worker return data + return buildBatteryGoodSlice(sliceBuilder, false); + } + + for (BatteryTip batteryTip : batteryTips) { + if (batteryTip.getState() != BatteryTip.StateType.INVISIBLE) { + final IconCompat icon = IconCompat.createWithResource(mContext, batteryTip.getIconId()); + final SliceAction primaryAction = SliceAction.createDeeplink(getPrimaryAction(), + icon, + ListBuilder.ICON_IMAGE, + batteryTip.getTitle(mContext)); + sliceBuilder.addRow(new RowBuilder() + .setTitle(batteryTip.getTitle(mContext)) + .setSubtitle(batteryTip.getSummary(mContext)) + .setPrimaryAction(primaryAction) + .addEndItem(icon, ListBuilder.ICON_IMAGE)); + break; } - } else { - icon = IconCompat.createWithResource(mContext, - R.drawable.ic_battery_status_good_24dp); - final String title = mContext.getString(R.string.power_usage_summary_title); - primaryAction = SliceAction.createDeeplink(getPrimaryAction(), icon, - ListBuilder.ICON_IMAGE, title); - slice = new ListBuilder(mContext, CustomSliceRegistry.BATTERY_FIX_SLICE_URI, - ListBuilder.INFINITY) - .setAccentColor(Utils.getColorAccentDefaultColor(mContext)) - .addRow(new RowBuilder() - .setTitle(title) - .setPrimaryAction(primaryAction) - .addEndItem(icon, ListBuilder.ICON_IMAGE)) - .build(); } - return slice; + return sliceBuilder.build(); } @Override @@ -151,6 +137,20 @@ public class BatteryFixSlice implements CustomSliceable { return PendingIntent.getActivity(mContext, 0 /* requestCode */, intent, 0 /* flags */); } + private Slice buildBatteryGoodSlice(ListBuilder sliceBuilder, boolean isError) { + final IconCompat icon = IconCompat.createWithResource(mContext, + R.drawable.ic_battery_status_good_24dp); + final String title = mContext.getString(R.string.power_usage_summary_title); + final SliceAction primaryAction = SliceAction.createDeeplink(getPrimaryAction(), icon, + ListBuilder.ICON_IMAGE, title); + sliceBuilder.addRow(new RowBuilder() + .setTitle(title) + .setPrimaryAction(primaryAction) + .addEndItem(icon, ListBuilder.ICON_IMAGE)) + .setIsError(isError); + return sliceBuilder.build(); + } + // TODO(b/114807643): we should find a better way to get current battery tip type quickly // Now we save battery tip type to shared preference when battery level changes public static void updateBatteryTipAvailabilityCache(Context context) { -- GitLab From 4c3a0d7c2aa415e893eda07dcbb90f7ea710f7ae Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Wed, 5 Dec 2018 18:16:05 -0800 Subject: [PATCH 05/22] Make location history package not disableable. Bug:119226131 Test: Unit test, also tested manually on device Change-Id: Ib72fdd8b5195b67ef9d79a8a6dbb91acc54dbbbf --- .../ApplicationFeatureProviderImpl.java | 7 +++++++ .../ApplicationFeatureProviderImplTest.java | 19 ++++++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java index c246c58eadc..4bda99e98c6 100644 --- a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java +++ b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java @@ -25,6 +25,7 @@ import android.content.pm.IPackageManager; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.content.pm.UserInfo; +import android.location.LocationManager; import android.os.RemoteException; import android.os.UserManager; import android.telecom.DefaultDialerManager; @@ -142,6 +143,12 @@ public class ApplicationFeatureProviderImpl implements ApplicationFeatureProvide // Keep Settings intelligence enabled, otherwise search feature will be disabled. keepEnabledPackages.add( mContext.getString(R.string.config_settingsintelligence_package_name)); + final LocationManager locationManager = + (LocationManager) mContext.getSystemService(Context.LOCATION_SERVICE); + final String locationHistoryPackage = locationManager.getLocationControllerExtraPackage(); + if (locationHistoryPackage != null) { + keepEnabledPackages.add(locationHistoryPackage); + } return keepEnabledPackages; } diff --git a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java index 128f34547a4..07111fd749b 100644 --- a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java @@ -18,6 +18,7 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import android.app.admin.DevicePolicyManager; @@ -30,6 +31,7 @@ import android.content.pm.IPackageManager; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.content.pm.UserInfo; +import android.location.LocationManager; import android.os.Build; import android.os.UserHandle; import android.os.UserManager; @@ -83,6 +85,8 @@ public final class ApplicationFeatureProviderImplTest { private IPackageManager mPackageManagerService; @Mock private DevicePolicyManager mDevicePolicyManager; + @Mock + private LocationManager mLocationManager; private ApplicationFeatureProvider mProvider; @@ -95,6 +99,7 @@ public final class ApplicationFeatureProviderImplTest { when(mContext.getApplicationContext()).thenReturn(mContext); when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager); + when(mContext.getSystemService(Context.LOCATION_SERVICE)).thenReturn(mLocationManager); mProvider = new ApplicationFeatureProviderImpl(mContext, mPackageManager, mPackageManagerService, mDevicePolicyManager); @@ -256,19 +261,27 @@ public final class ApplicationFeatureProviderImplTest { @Test @Config(shadows = {ShadowSmsApplication.class, ShadowDefaultDialerManager.class}) - public void getKeepEnabledPackages_shouldContainDefaultPhoneAndSms() { + public void getKeepEnabledPackages_shouldContainDefaultPhoneAndSmsAndLocationHistory() { final String testDialer = "com.android.test.defaultdialer"; final String testSms = "com.android.test.defaultsms"; + final String testLocationHistory = "com.android.test.location.history"; + final String settingsIntelligence = RuntimeEnvironment.application.getString( R.string.config_settingsintelligence_package_name); ShadowSmsApplication.setDefaultSmsApplication(new ComponentName(testSms, "receiver")); ShadowDefaultDialerManager.setDefaultDialerApplication(testDialer); - ReflectionHelpers.setField(mProvider, "mContext", RuntimeEnvironment.application); + + // Spy the real context to mock LocationManager. + Context spyContext = spy(RuntimeEnvironment.application); + when(mLocationManager.getLocationControllerExtraPackage()).thenReturn(testLocationHistory); + when(spyContext.getSystemService(Context.LOCATION_SERVICE)).thenReturn(mLocationManager); + + ReflectionHelpers.setField(mProvider, "mContext", spyContext); final Set keepEnabledPackages = mProvider.getKeepEnabledPackages(); final List expectedPackages = Arrays.asList(testDialer, testSms, - settingsIntelligence); + settingsIntelligence, testLocationHistory); assertThat(keepEnabledPackages).containsExactlyElementsIn(expectedPackages); } -- GitLab From 07933cb96788ea5005a98e6c7413371cd8f246c7 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Wed, 12 Dec 2018 13:40:22 -0800 Subject: [PATCH 06/22] Set setting back to default when turning off dev option When turning off developer options, mobile data always on setting should be set back to default, which is ON not OFF. Change-Id: I257ba108976b05162fa3cea6e48f3490e9c64f80 Fixes: 119719605 Test: robotests --- .../development/MobileDataAlwaysOnPreferenceController.java | 4 ++-- .../MobileDataAlwaysOnPreferenceControllerTest.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java b/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java index 78054ae2ab7..b2fa693104e 100644 --- a/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java +++ b/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java @@ -66,7 +66,7 @@ public class MobileDataAlwaysOnPreferenceController extends protected void onDeveloperOptionsSwitchDisabled() { super.onDeveloperOptionsSwitchDisabled(); Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.MOBILE_DATA_ALWAYS_ON, - SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(false); + SETTING_VALUE_ON); + ((SwitchPreference) mPreference).setChecked(true); } } diff --git a/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java index a578429d63c..91bdad39f91 100644 --- a/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java @@ -96,13 +96,13 @@ public class MobileDataAlwaysOnPreferenceControllerTest { } @Test - public void onDeveloperOptionsSwitchDisabled_preferenceShouldBeDisabled() { + public void onDeveloperOptionsSwitchDisabled_shouldDisableMobileDataAlwaysOn() { mController.onDeveloperOptionsSwitchDisabled(); final int mode = Settings.Global.getInt(mContext.getContentResolver(), Settings.Global.MOBILE_DATA_ALWAYS_ON, -1 /* default */); - assertThat(mode).isEqualTo(MobileDataAlwaysOnPreferenceController.SETTING_VALUE_OFF); + assertThat(mode).isEqualTo(MobileDataAlwaysOnPreferenceController.SETTING_VALUE_ON); verify(mPreference).setEnabled(false); - verify(mPreference).setChecked(false); + verify(mPreference).setChecked(true); } } -- GitLab From ad12b76a984474c4b285e3064f535dfb9397f6e5 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Wed, 12 Dec 2018 15:07:59 -0800 Subject: [PATCH 07/22] Add a timeout waiting for contextual card loader. - Intially setting it to 1 second. - Also changed card appear animation from drop in to fade in. It looks less janky if we don't animate any size change. - And some random code cleanup Change-Id: I6e73bcf98fd9aa1d76ae002b94ab5b068dfecf1e Fixes: 120916829 Test: robotests --- ...ll_down.xml => item_animation_fade_in.xml} | 15 ----------- ..._down.xml => layout_animation_fade_in.xml} | 2 +- res/layout/settings_homepage.xml | 2 +- .../ContextualCardFeatureProvider.java | 8 +++--- .../ContextualCardFeatureProviderImpl.java | 9 +++---- .../contextualcards/ContextualCardLoader.java | 2 ++ .../ContextualCardManager.java | 17 +++++++----- .../ConditionContextualCardController.java | 1 - .../ContextualCardManagerTest.java | 27 +++++++++++++++++++ 9 files changed, 50 insertions(+), 33 deletions(-) rename res/anim/{item_animation_fall_down.xml => item_animation_fade_in.xml} (62%) rename res/anim/{layout_animation_fall_down.xml => layout_animation_fade_in.xml} (93%) diff --git a/res/anim/item_animation_fall_down.xml b/res/anim/item_animation_fade_in.xml similarity index 62% rename from res/anim/item_animation_fall_down.xml rename to res/anim/item_animation_fade_in.xml index df2451cf638..68a2713e534 100644 --- a/res/anim/item_animation_fall_down.xml +++ b/res/anim/item_animation_fade_in.xml @@ -18,25 +18,10 @@ - - - - - \ No newline at end of file diff --git a/res/anim/layout_animation_fall_down.xml b/res/anim/layout_animation_fade_in.xml similarity index 93% rename from res/anim/layout_animation_fall_down.xml rename to res/anim/layout_animation_fade_in.xml index f39735c157b..fcdb8741718 100644 --- a/res/anim/layout_animation_fall_down.xml +++ b/res/anim/layout_animation_fade_in.xml @@ -17,6 +17,6 @@ \ No newline at end of file diff --git a/res/layout/settings_homepage.xml b/res/layout/settings_homepage.xml index f027d655349..e04b372aa38 100644 --- a/res/layout/settings_homepage.xml +++ b/res/layout/settings_homepage.xml @@ -25,6 +25,6 @@ android:id="@+id/card_container" android:layout_width="match_parent" android:layout_height="match_parent" - android:layoutAnimation="@anim/layout_animation_fall_down"/> + android:layoutAnimation="@anim/layout_animation_fade_in"/> diff --git a/src/com/android/settings/homepage/contextualcards/ContextualCardFeatureProvider.java b/src/com/android/settings/homepage/contextualcards/ContextualCardFeatureProvider.java index 8583f38c78b..5ebc924bdec 100644 --- a/src/com/android/settings/homepage/contextualcards/ContextualCardFeatureProvider.java +++ b/src/com/android/settings/homepage/contextualcards/ContextualCardFeatureProvider.java @@ -24,16 +24,16 @@ import java.util.List; public interface ContextualCardFeatureProvider { /** Homepage displays. */ - public void logHomepageDisplay(Context context, Long latency); + void logHomepageDisplay(Context context, long latency); /** When user clicks dismiss in contextual card */ - public void logContextualCardDismiss(Context context, ContextualCard card); + void logContextualCardDismiss(Context context, ContextualCard card); /** After ContextualCardManager decides which cards will be displayed/hidden */ - public void logContextualCardDisplay(Context context, List showedCards, + void logContextualCardDisplay(Context context, List showedCards, List hiddenCards); /** When user clicks toggle/title area of a contextual card. */ - public void logContextualCardClick(Context context, ContextualCard card, int row, + void logContextualCardClick(Context context, ContextualCard card, int row, int tapTarget); } diff --git a/src/com/android/settings/homepage/contextualcards/ContextualCardFeatureProviderImpl.java b/src/com/android/settings/homepage/contextualcards/ContextualCardFeatureProviderImpl.java index 32a86e84389..dc295fc1f94 100644 --- a/src/com/android/settings/homepage/contextualcards/ContextualCardFeatureProviderImpl.java +++ b/src/com/android/settings/homepage/contextualcards/ContextualCardFeatureProviderImpl.java @@ -85,11 +85,10 @@ public class ContextualCardFeatureProviderImpl implements ContextualCardFeatureP private static final int TARGET_SLIDER = 3; @Override - public void logHomepageDisplay(Context context, Long latency) { - final Intent intent = new Intent(); - intent.putExtra(EXTRA_CONTEXTUALCARD_ACTION_TYPE, CONTEXTUAL_HOME_SHOW); - intent.putExtra(EXTRA_LATENCY, latency); - sendBroadcast(context, intent); + public void logHomepageDisplay(Context context, long latency) { + sendBroadcast(context, new Intent() + .putExtra(EXTRA_CONTEXTUALCARD_ACTION_TYPE, CONTEXTUAL_HOME_SHOW) + .putExtra(EXTRA_LATENCY, latency)); } @Override diff --git a/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java b/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java index e631d22e216..802d9166b84 100644 --- a/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java +++ b/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java @@ -31,6 +31,7 @@ import android.database.Cursor; import android.net.Uri; import android.os.Handler; import android.os.Looper; +import android.text.format.DateUtils; import android.util.Log; import androidx.annotation.NonNull; @@ -49,6 +50,7 @@ public class ContextualCardLoader extends AsyncLoaderCompat @VisibleForTesting static final int DEFAULT_CARD_COUNT = 4; static final int CARD_CONTENT_LOADER_ID = 1; + static final long CARD_CONTENT_LOADER_TIMEOUT_MS = DateUtils.SECOND_IN_MILLIS; private static final String TAG = "ContextualCardLoader"; diff --git a/src/com/android/settings/homepage/contextualcards/ContextualCardManager.java b/src/com/android/settings/homepage/contextualcards/ContextualCardManager.java index 28ad0d30e8e..24266eea409 100644 --- a/src/com/android/settings/homepage/contextualcards/ContextualCardManager.java +++ b/src/com/android/settings/homepage/contextualcards/ContextualCardManager.java @@ -59,12 +59,15 @@ public class ContextualCardManager implements ContextualCardLoader.CardContentLo ContextualCardUpdateListener { private static final String TAG = "ContextualCardManager"; + //The list for Settings Custom Card private static final int[] SETTINGS_CARDS = {ContextualCard.CardType.CONDITIONAL, ContextualCard.CardType.LEGACY_SUGGESTION}; @VisibleForTesting final List mContextualCards; + @VisibleForTesting + long mStartTime; private final Context mContext; private final ControllerRendererPool mControllerRendererPool; @@ -72,7 +75,6 @@ public class ContextualCardManager implements ContextualCardLoader.CardContentLo private final List mLifecycleObservers; private ContextualCardUpdateListener mListener; - private long mStartTime; public ContextualCardManager(Context context, Lifecycle lifecycle) { mContext = context; @@ -169,11 +171,14 @@ public class ContextualCardManager implements ContextualCardLoader.CardContentLo @Override public void onFinishCardLoading(List cards) { - onContextualCardUpdated(cards.stream().collect(groupingBy(ContextualCard::getCardType))); - final long elapsedTime = System.currentTimeMillis() - mStartTime; - final ContextualCardFeatureProvider contextualCardFeatureProvider = - FeatureFactory.getFactory(mContext).getContextualCardFeatureProvider(); - contextualCardFeatureProvider.logHomepageDisplay(mContext, elapsedTime); + final long loadTime = System.currentTimeMillis() - mStartTime; + if (loadTime <= ContextualCardLoader.CARD_CONTENT_LOADER_TIMEOUT_MS) { + onContextualCardUpdated( + cards.stream().collect(groupingBy(ContextualCard::getCardType))); + } + final long totalTime = System.currentTimeMillis() - mStartTime; + FeatureFactory.getFactory(mContext).getContextualCardFeatureProvider() + .logHomepageDisplay(mContext, totalTime); } public ControllerRendererPool getControllerRendererPool() { diff --git a/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardController.java b/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardController.java index 02854c2213f..834ebbc6539 100644 --- a/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardController.java +++ b/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardController.java @@ -109,7 +109,6 @@ public class ConditionContextualCardController implements ContextualCardControll final Map> conditionalCards = buildConditionalCardsWithFooterOrHeader(conditionCards); mListener.onContextualCardUpdated(conditionalCards); - } /** 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 64a7c9cfcd6..81f87b98d81 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardManagerTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardManagerTest.java @@ -18,6 +18,13 @@ package com.android.settings.homepage.contextualcards; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.anyMap; +import static org.mockito.ArgumentMatchers.nullable; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; + import android.content.Context; import android.net.Uri; import android.util.ArrayMap; @@ -36,6 +43,7 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; +import java.util.Map; @RunWith(SettingsRobolectricTestRunner.class) public class ContextualCardManagerTest { @@ -107,6 +115,25 @@ public class ContextualCardManagerTest { .isEqualTo(ContextualCard.CardType.CONDITIONAL_FOOTER); } + @Test + public void onFinishCardLoading_fastLoad_shouldCallOnContextualCardUpdated() { + mManager.mStartTime = System.currentTimeMillis(); + final ContextualCardManager manager = spy(mManager); + doNothing().when(manager).onContextualCardUpdated(anyMap()); + + manager.onFinishCardLoading(new ArrayList<>()); + verify(manager).onContextualCardUpdated(nullable(Map.class)); + } + + @Test + public void onFinishCardLoading_slowLoad_shouldSkipOnContextualCardUpdated() { + mManager.mStartTime = 0; + final ContextualCardManager manager = spy(mManager); + doNothing().when(manager).onContextualCardUpdated(anyMap()); + + manager.onFinishCardLoading(new ArrayList<>()); + verify(manager, never()).onContextualCardUpdated(anyMap()); + } private ContextualCard buildContextualCard(String sliceUri) { return new ContextualCard.Builder() -- GitLab From 5fe372a0399da9a2e6422916e08acb70ccba76f2 Mon Sep 17 00:00:00 2001 From: Ben Lin Date: Wed, 12 Dec 2018 16:55:08 -0800 Subject: [PATCH 08/22] Exclue Scanning Settings for searchable in ARC. Scanning settings is actually done outside of Android, in the host OS. Bug: 120222705 Test: RunSettingsRoboTests RunArcSettingsRoboTests Change-Id: I92435541a671c43d3584f1f223b8b744e6182aa9 --- src/com/android/settings/location/ScanningSettings.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/settings/location/ScanningSettings.java b/src/com/android/settings/location/ScanningSettings.java index b2ce5fbf7da..86402c0934c 100644 --- a/src/com/android/settings/location/ScanningSettings.java +++ b/src/com/android/settings/location/ScanningSettings.java @@ -34,7 +34,7 @@ import java.util.List; /** * A page that configures the background scanning settings for Wi-Fi and Bluetooth. */ -@SearchIndexable +@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class ScanningSettings extends DashboardFragment { private static final String TAG = "ScanningSettings"; -- GitLab From 86a2afe798cea1b0bdf973c9b14ffcb6df0fca2c Mon Sep 17 00:00:00 2001 From: Raff Tsai Date: Tue, 11 Dec 2018 17:51:41 +0800 Subject: [PATCH 09/22] Fix ANR in SliceRelayReceiver The same broadcast are handled in SliceRelayReceiver and WifiScanWorker. We will only use WifiScanWorker to handle wifi broadcast. Change-Id: I32c2fcc699ae240f12bd1049ba33e1792ae123b0 Fixes: 120284615 Test: manual --- .../slices/SliceBackgroundWorker.java | 4 ++++ src/com/android/settings/wifi/WifiSlice.java | 12 ++-------- .../android/settings/wifi/WifiSliceTest.java | 23 +++++++++++++++++-- 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/src/com/android/settings/slices/SliceBackgroundWorker.java b/src/com/android/settings/slices/SliceBackgroundWorker.java index a663eceb1df..8b68f057ec0 100644 --- a/src/com/android/settings/slices/SliceBackgroundWorker.java +++ b/src/com/android/settings/slices/SliceBackgroundWorker.java @@ -58,6 +58,10 @@ public abstract class SliceBackgroundWorker implements Closeable { mUri = uri; } + public Uri getUri() { + return mUri; + } + /** * Returns the singleton instance of the {@link SliceBackgroundWorker} for specified {@link * CustomSliceable} diff --git a/src/com/android/settings/wifi/WifiSlice.java b/src/com/android/settings/wifi/WifiSlice.java index 64e3fc3fb16..9f05783421f 100644 --- a/src/com/android/settings/wifi/WifiSlice.java +++ b/src/com/android/settings/wifi/WifiSlice.java @@ -25,7 +25,6 @@ import android.annotation.ColorInt; import android.app.PendingIntent; import android.content.Context; import android.content.Intent; -import android.content.IntentFilter; import android.net.Uri; import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; @@ -75,14 +74,6 @@ public class WifiSlice implements CustomSliceable { return WIFI_SLICE_URI; } - @Override - public IntentFilter getIntentFilter() { - final IntentFilter filter = new IntentFilter(); - filter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION); - filter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION); - return filter; - } - @Override public Slice getSlice() { final boolean isWifiEnabled = isWifiEnabled(); @@ -200,7 +191,7 @@ public class WifiSlice implements CustomSliceable { mWifiManager.isWifiEnabled()); mWifiManager.setWifiEnabled(newState); // Do not notifyChange on Uri. The service takes longer to update the current value than it - // does for the Slice to check the current value again. Let {@link SliceBroadcastRelay} + // does for the Slice to check the current value again. Let {@link WifiScanWorker} // handle it. } @@ -292,6 +283,7 @@ public class WifiSlice implements CustomSliceable { @Override public void onWifiStateChanged(int state) { + mContext.getContentResolver().notifyChange(getUri(), null); } @Override diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSliceTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSliceTest.java index cdd1664d47b..fb98f85400e 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiSliceTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiSliceTest.java @@ -20,10 +20,18 @@ package com.android.settings.wifi; import static android.app.slice.Slice.HINT_LIST_ITEM; import static android.app.slice.SliceItem.FORMAT_SLICE; +import static com.android.settings.slices.CustomSliceRegistry.WIFI_SLICE_URI; import static com.android.settings.wifi.WifiSlice.DEFAULT_EXPANDED_ROW_COUNT; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Mockito.doReturn; +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.ContentResolver; import android.content.Context; import android.content.Intent; import android.net.wifi.WifiManager; @@ -52,13 +60,16 @@ import java.util.List; public class WifiSliceTest { private Context mContext; - + private ContentResolver mResolver; private WifiManager mWifiManager; private WifiSlice mWifiSlice; + private WifiSlice.WifiScanWorker mWifiScanWorker; @Before public void setUp() { - mContext = RuntimeEnvironment.application; + mContext = spy(RuntimeEnvironment.application); + mResolver = mock(ContentResolver.class); + doReturn(mResolver).when(mContext).getContentResolver(); mWifiManager = mContext.getSystemService(WifiManager.class); // Set-up specs for SliceMetadata. @@ -66,6 +77,7 @@ public class WifiSliceTest { mWifiManager.setWifiEnabled(true); mWifiSlice = new WifiSlice(mContext); + mWifiScanWorker = new WifiSlice.WifiScanWorker(mContext, WIFI_SLICE_URI); } @Test @@ -122,4 +134,11 @@ public class WifiSliceTest { assertThat(wifiManager.getWifiState()).isEqualTo(WifiManager.WIFI_STATE_ENABLED); } + + @Test + public void onWifiStateChanged_shouldNotifyChange() { + mWifiScanWorker.onWifiStateChanged(WifiManager.WIFI_STATE_DISABLED); + + verify(mResolver).notifyChange(WIFI_SLICE_URI, null); + } } -- GitLab From 75ac728e0e35c7b4398c63893b91b22377a3332a Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 13 Dec 2018 03:15:08 +0000 Subject: [PATCH 10/22] Revert "Change LayoutPreference resource path in robo test" This reverts commit ff8fca7d9eac8edea506d5b7c69f101b329176a3. Reason for revert: broke build when combined with ag/5781147 Bug: 120706174 Change-Id: Id543bc3cb0b4979144e92c400e57988009f4c407 --- .../settings/testutils/SettingsRobolectricTestRunner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java index b3b3a8c6162..74914f4eb44 100644 --- a/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java +++ b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java @@ -86,7 +86,7 @@ public class SettingsRobolectricTestRunner extends RobolectricTestRunner { paths.add(new ResourcePath(null, Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/ActionButtonsPreference/res")), null)); paths.add(new ResourcePath(null, - Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/LayoutPreference/res")), null)); + Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/SettingsLayoutPreference/res")), null)); paths.add(new ResourcePath(null, Fs.fromURL(new URL("file:frameworks/base/core/res/res")), null)); paths.add(new ResourcePath(null, -- GitLab From c0c5511862a2bade73b71936cd1202b956ac587c Mon Sep 17 00:00:00 2001 From: Jason Chiu Date: Wed, 12 Dec 2018 12:08:26 +0800 Subject: [PATCH 11/22] Add vertical and horizontal dividers for large cards of homepage - Add a new field in ContextualCard to store whether this card is a large one - Set dividers for large cards in renderer Fixes: 119528161 Fixes: 119641839 Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.homepage Change-Id: I5cb95214789f44ccfd8d9ce2177ca2b84835b7a4 --- .../homepage/contextualcards/ContextualCard.java | 14 ++++++++++++++ .../contextualcards/ContextualCardLoader.java | 12 +++++++++--- .../slices/SliceContextualCardRenderer.java | 6 ++++++ 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/homepage/contextualcards/ContextualCard.java b/src/com/android/settings/homepage/contextualcards/ContextualCard.java index ca5555b855d..4673ad15eef 100644 --- a/src/com/android/settings/homepage/contextualcards/ContextualCard.java +++ b/src/com/android/settings/homepage/contextualcards/ContextualCard.java @@ -64,6 +64,7 @@ public class ContextualCard { private final int mCardAction; private final long mExpireTimeMS; private final boolean mIsHalfWidth; + private final boolean mIsLargeCard; private final Drawable mIconDrawable; public String getName() { @@ -142,6 +143,10 @@ public class ContextualCard { return mIsHalfWidth; } + public boolean isLargeCard() { + return mIsLargeCard; + } + boolean isCustomCard() { return TextUtils.isEmpty(mSliceUri); } @@ -170,6 +175,7 @@ public class ContextualCard { mExpireTimeMS = builder.mExpireTimeMS; mIconDrawable = builder.mIconDrawable; mIsHalfWidth = builder.mIsHalfWidth; + mIsLargeCard = builder.mIsLargeCard; } ContextualCard(Cursor c) { @@ -212,6 +218,8 @@ public class ContextualCard { mIsHalfWidth = (c.getInt( c.getColumnIndex(CardDatabaseHelper.CardColumns.SUPPORT_HALF_WIDTH)) == 1); mBuilder.setIsHalfWidth(mIsHalfWidth); + mIsLargeCard = false; + mBuilder.setIsLargeCard(mIsLargeCard); mIconDrawable = null; mBuilder.setIconDrawable(mIconDrawable); } @@ -256,6 +264,7 @@ public class ContextualCard { private long mExpireTimeMS; private Drawable mIconDrawable; private boolean mIsHalfWidth; + private boolean mIsLargeCard; public Builder setName(String name) { mName = name; @@ -347,6 +356,11 @@ public class ContextualCard { return this; } + public Builder setIsLargeCard(boolean isLargeCard) { + mIsLargeCard = isLargeCard; + return this; + } + public ContextualCard build() { return new ContextualCard(this); } diff --git a/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java b/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java index e631d22e216..f32be26e433 100644 --- a/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java +++ b/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java @@ -97,6 +97,8 @@ public class ContextualCardLoader extends AsyncLoaderCompat final ContextualCard card = new ContextualCard(cursor); if (card.isCustomCard()) { //TODO(b/114688391): Load and generate custom card,then add into list + } else if (isLargeCard(card)) { + result.add(card.mutate().setIsLargeCard(true).build()); } else { result.add(card); } @@ -195,12 +197,16 @@ public class ContextualCardLoader extends AsyncLoaderCompat private int getNumberOfLargeCard(List cards) { return (int) cards.stream() - .filter(card -> card.getSliceUri().equals(WIFI_SLICE_URI) - || card.getSliceUri().equals(BLUETOOTH_DEVICES_SLICE_URI)) + .filter(card -> isLargeCard(card)) .count(); } + private boolean isLargeCard(ContextualCard card) { + return card.getSliceUri().equals(WIFI_SLICE_URI) + || card.getSliceUri().equals(BLUETOOTH_DEVICES_SLICE_URI); + } + public interface CardContentLoaderListener { void onFinishCardLoading(List contextualCards); } -} \ No newline at end of file +} diff --git a/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java b/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java index be03c281e9a..172c3b27845 100644 --- a/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java +++ b/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java @@ -131,6 +131,12 @@ public class SliceContextualCardRenderer implements ContextualCardRenderer, // Set this listener so we can log the interaction users make on the slice cardHolder.sliceView.setOnSliceActionListener(this); + // Customize slice view for Settings + if (card.isLargeCard()) { + cardHolder.sliceView.showHeaderDivider(true); + cardHolder.sliceView.showActionDividers(true); + } + initDismissalActions(cardHolder, card); } -- GitLab From f1dade40d2d85fd994f52e4b87795626806f459e Mon Sep 17 00:00:00 2001 From: James Lemieux Date: Fri, 7 Dec 2018 12:56:49 -0800 Subject: [PATCH 12/22] Use binary resource support in robolectric The resources available to tests are now exactly the merged resources located in the APK under test. Bug: 74359828 Test: make -j56 RunSettingsRoboTests Change-Id: I050db81a92decefea23314b5ec7a62f77ff4bb2b --- tests/robotests/Android.mk | 73 +++++++- tests/robotests/config/robolectric.properties | 5 +- tests/robotests/res/values-mcc998/config.xml | 20 +++ .../android/settings/DisplaySettingsTest.java | 4 +- .../android/settings/HelpTrampolineTest.java | 4 +- .../android/settings/LegalSettingsTest.java | 4 +- .../com/android/settings/MasterClearTest.java | 4 +- .../settings/ResetNetworkConfirmTest.java | 14 +- .../RestrictedListPreferenceTest.java | 14 +- .../RestrictedSettingsFragmentTest.java | 5 +- .../settings/SettingsActivityTest.java | 6 +- .../settings/SettingsDialogFragmentTest.java | 6 +- .../settings/SettingsDumpServiceTest.java | 8 +- .../settings/SettingsInitializeTest.java | 33 ++-- .../settings/SettingsLicenseActivityTest.java | 7 +- .../SettingsPreferenceFragmentTest.java | 10 +- .../settings/SetupWizardUtilsTest.java | 3 +- .../settings/SummaryPreferenceTest.java | 8 +- .../android/settings/TetherSettingsTest.java | 13 +- .../src/com/android/settings/UtilsTest.java | 7 +- ...ityHearingAidPreferenceControllerTest.java | 16 +- .../AccessibilitySettingsTest.java | 20 +-- ...sibilitySlicePreferenceControllerTest.java | 4 +- .../AccessibilityTimeoutControllerTest.java | 8 +- ...olorInversionPreferenceControllerTest.java | 4 +- ...backIntensityPreferenceControllerTest.java | 4 +- ...ationGesturesPreferenceControllerTest.java | 4 +- ...icationNavbarPreferenceControllerTest.java | 4 +- ...tionIntensityPreferenceControllerTest.java | 4 +- .../ShortcutServicePickerFragmentTest.java | 6 +- .../ToggleFeaturePreferenceFragmentTest.java | 7 +- .../VibrationPreferenceFragmentTest.java | 4 +- .../AccountDashboardFragmentTest.java | 6 +- .../AccountDetailDashboardFragmentTest.java | 36 ++-- ...AccountHeaderPreferenceControllerTest.java | 8 +- .../AccountPreferenceControllerTest.java | 52 +++--- .../accounts/AccountPreferenceTest.java | 4 +- .../AccountSyncPreferenceControllerTest.java | 6 +- .../accounts/AccountSyncSettingsTest.java | 4 +- .../AccountTypePreferenceLoaderTest.java | 12 +- .../accounts/AvatarViewMixinTest.java | 11 +- ...ChooseAccountPreferenceControllerTest.java | 6 +- ...ContactSearchPreferenceControllerTest.java | 4 +- ...ofileCalendarPreferenceControllerTest.java | 10 +- ...EmergencyInfoPreferenceControllerTest.java | 15 +- ...iseDisclosurePreferenceControllerTest.java | 5 +- .../accounts/ProviderPreferenceTest.java | 5 +- ...RemoveAccountPreferenceControllerTest.java | 16 +- .../accounts/RemoveUserFragmentTest.java | 5 +- .../SyncStateSwitchPreferenceTest.java | 5 +- ...lAccountEntryPreferenceControllerTest.java | 10 +- .../WorkModePreferenceControllerTest.java | 4 +- .../applications/AppInfoWithHeaderTest.java | 6 +- ...ppPermissionsPreferenceControllerTest.java | 11 +- .../AppStateAppOpsBridgeTest.java | 10 +- .../AppStateInstallAppsBridgeTest.java | 5 +- .../AppStateNotificationBridgeTest.java | 28 +-- .../applications/AppStorageSettingsTest.java | 6 +- .../AppStorageSizesControllerTest.java | 4 +- ...ithAdminGrantedPermissionsCounterTest.java | 15 +- ...WithAdminGrantedPermissionsListerTest.java | 11 +- .../ApplicationFeatureProviderImplTest.java | 7 +- .../applications/DefaultAppSettingsTest.java | 11 +- .../EnterpriseDefaultAppsTest.java | 8 +- .../FetchPackageStorageAsyncLoaderTest.java | 8 +- .../applications/InstalledAppCounterTest.java | 12 +- .../applications/InstalledAppListerTest.java | 15 +- .../RecentAppsPreferenceControllerTest.java | 14 +- ...cialAppAccessPreferenceControllerTest.java | 4 +- .../applications/UsageAccessDetailsTest.java | 4 +- .../AppBatteryPreferenceControllerTest.java | 6 +- .../AppButtonsPreferenceControllerTest.java | 22 +-- .../AppDataUsagePreferenceControllerTest.java | 4 +- ...AppHeaderViewPreferenceControllerTest.java | 4 +- .../appinfo/AppInfoDashboardFragmentTest.java | 7 +- .../AppInfoPreferenceControllerBaseTest.java | 4 +- ...InstallerInfoPreferenceControllerTest.java | 4 +- .../AppMemoryPreferenceControllerTest.java | 4 +- ...pNotificationPreferenceControllerTest.java | 33 ++-- ...OpenByDefaultPreferenceControllerTest.java | 4 +- ...AppPermissionPreferenceControllerTest.java | 7 +- .../AppSettingPreferenceControllerTest.java | 5 +- .../AppStoragePreferenceControllerTest.java | 4 +- .../AppVersionPreferenceControllerTest.java | 5 +- .../ButtonActionDialogFragmentTest.java | 9 +- ...pShortcutPreferenceControllerBaseTest.java | 12 +- ...owserShortcutPreferenceControllerTest.java | 9 +- ...gencyShortcutPreferenceControllerTest.java | 5 +- ...tHomeShortcutPreferenceControllerTest.java | 6 +- ...PhoneShortcutPreferenceControllerTest.java | 8 +- ...ltSmsShortcutPreferenceControllerTest.java | 8 +- ...OverlayDetailPreferenceControllerTest.java | 4 +- .../appinfo/DrawOverlayDetailsTest.java | 4 +- ...lSourceDetailPreferenceControllerTest.java | 4 +- .../appinfo/ExternalSourcesDetailsTest.java | 4 +- .../InstantAppButtonDialogFragmentTest.java | 13 +- ...antAppButtonsPreferenceControllerTest.java | 6 +- ...antAppDomainsPreferenceControllerTest.java | 4 +- ...imeSpentInAppPreferenceControllerTest.java | 5 +- .../appinfo/WriteSettingsDetailsTest.java | 6 +- ...ystemSettingsPreferenceControllerTest.java | 4 +- ...AssistContextPreferenceControllerTest.java | 10 +- ...stFlashScreenPreferenceControllerTest.java | 10 +- .../assist/AssistSettingObserverTest.java | 5 +- .../assist/DefaultAssistPickerTest.java | 5 +- ...DefaultAssistPreferenceControllerTest.java | 10 +- .../applications/assist/ManageAssistTest.java | 4 +- .../DefaultAppPickerFragmentTest.java | 6 +- .../DefaultAppPreferenceControllerTest.java | 5 +- .../DefaultAutofillPickerTest.java | 26 ++- ...faultAutofillPreferenceControllerTest.java | 4 +- .../defaultapps/DefaultBrowserPickerTest.java | 10 +- ...efaultBrowserPreferenceControllerTest.java | 19 +- .../DefaultEmergencyPickerTest.java | 7 +- .../defaultapps/DefaultHomePickerTest.java | 24 ++- .../DefaultHomePreferenceControllerTest.java | 12 +- ...ymentSettingsPreferenceControllerTest.java | 6 +- .../defaultapps/DefaultPhonePickerTest.java | 12 +- .../defaultapps/DefaultSmsPickerTest.java | 10 +- .../manageapplications/AppFilterItemTest.java | 4 +- .../AppFilterRegistryTest.java | 5 +- .../ApplicationViewHolderTest.java | 4 +- .../ManageApplicationsTest.java | 13 +- .../MusicViewHolderControllerTest.java | 6 +- .../PhotosViewHolderControllerTest.java | 6 +- .../DomainAppPreferenceControllerTest.java | 4 +- ...antAppAccountPreferenceControllerTest.java | 5 +- ...tAppWebActionPreferenceControllerTest.java | 5 +- .../DataSaverControllerTest.java | 5 +- .../HighPowerAppsControllerTest.java | 5 +- .../ZenAccessControllerTest.java | 5 +- .../deviceadmin/DeviceAdminAddTest.java | 8 +- .../deviceadmin/DeviceAdminListItemTest.java | 7 +- ...viceAdminListPreferenceControllerTest.java | 4 +- ...PictureDetailPreferenceControllerTest.java | 4 +- .../PictureInPictureDetailsTest.java | 4 +- .../PictureInPictureSettingsTest.java | 8 +- .../premiumsms/PremiumSmsAccessTest.java | 4 +- .../premiumsms/PremiumSmsControllerTest.java | 5 +- ...miumSmsScreenPreferenceControllerTest.java | 5 +- .../EnabledVrListenersControllerTest.java | 5 +- ...istenerScreenPreferenceControllerTest.java | 5 +- .../vrlistener/VrListenerSettingsTest.java | 4 +- .../AutoRestorePreferenceControllerTest.java | 4 +- .../BackupDataPreferenceControllerTest.java | 4 +- ...ackupInactivePreferenceControllerTest.java | 4 +- ...tingsActivityPreferenceControllerTest.java | 47 +++-- .../backup/BackupSettingsActivityTest.java | 16 +- .../backup/BackupSettingsHelperTest.java | 12 +- ...ackupSettingsPreferenceControllerTest.java | 5 +- ...figureAccountPreferenceControllerTest.java | 4 +- ...ataManagementPreferenceControllerTest.java | 7 +- .../FaceStatusPreferenceControllerTest.java | 4 +- .../DeleteFingerprintDialogTest.java | 7 +- .../FingerprintEnrollEnrollingTest.java | 11 +- .../FingerprintEnrollFindSensorTest.java | 11 +- ...ngerprintEnrollSuggestionActivityTest.java | 11 +- ...erprintLocationAnimationVideoViewTest.java | 7 +- .../FingerprintPreferenceTest.java | 4 +- ...ProfileStatusPreferenceControllerTest.java | 4 +- ...erprintStatusPreferenceControllerTest.java | 7 +- .../FingerprintSuggestionActivityTest.java | 4 +- .../SetupFingerprintEnrollFindSensorTest.java | 13 +- ...etupFingerprintEnrollIntroductionTest.java | 4 +- .../bluetooth/AlwaysDiscoverableTest.java | 9 +- ...ilableMediaBluetoothDeviceUpdaterTest.java | 4 +- ...BluetoothDetailsButtonsControllerTest.java | 15 +- .../BluetoothDetailsControllerEventsTest.java | 9 +- .../BluetoothDetailsControllerTestBase.java | 4 +- .../BluetoothDetailsHeaderControllerTest.java | 11 +- ...etoothDetailsMacAddressControllerTest.java | 7 +- ...luetoothDetailsProfilesControllerTest.java | 9 +- .../BluetoothDeviceDetailsFragmentTest.java | 6 +- ...othDeviceNamePreferenceControllerTest.java | 8 +- .../BluetoothDevicePreferenceTest.java | 7 +- ...hDeviceRenamePreferenceControllerTest.java | 4 +- .../bluetooth/BluetoothDeviceUpdaterTest.java | 6 +- .../bluetooth/BluetoothEnablerTest.java | 11 +- ...luetoothFilesPreferenceControllerTest.java | 5 +- .../BluetoothNameDialogFragmentTest.java | 6 +- .../BluetoothPairingControllerTest.java | 7 +- .../bluetooth/BluetoothPairingDetailTest.java | 10 +- .../bluetooth/BluetoothPairingDialogTest.java | 9 +- ...etoothPairingPreferenceControllerTest.java | 6 +- .../bluetooth/BluetoothSliceBuilderTest.java | 7 +- .../BluetoothSummaryUpdaterTest.java | 6 +- ...uetoothSwitchPreferenceControllerTest.java | 10 +- .../ConnectedBluetoothDeviceUpdaterTest.java | 6 +- .../DeviceListPreferenceFragmentTest.java | 8 +- .../bluetooth/DevicePickerFragmentTest.java | 5 +- .../ForgetDeviceDialogFragmentTest.java | 7 +- .../LocalDeviceNameDialogFragmentTest.java | 11 +- .../RemoteDeviceNameDialogFragmentTest.java | 12 +- .../SavedBluetoothDeviceUpdaterTest.java | 6 +- .../android/settings/bluetooth/UtilsTest.java | 10 +- .../AddDevicePreferenceControllerTest.java | 7 +- ...AdvancedConnectedDeviceControllerTest.java | 4 +- ...dConnectedDeviceDashboardFragmentTest.java | 9 +- ...ailableMediaDeviceGroupControllerTest.java | 15 +- .../BluetoothDashboardFragmentTest.java | 6 +- .../ConnectedDeviceDashboardFragmentTest.java | 8 +- .../ConnectedDeviceGroupControllerTest.java | 6 +- ...verableFooterPreferenceControllerTest.java | 9 +- ...nnectedDevicePreferenceControllerTest.java | 5 +- .../SavedDeviceGroupControllerTest.java | 7 +- ...nectedDevicesPreferenceControllerTest.java | 6 +- .../usb/ConnectedUsbDeviceUpdaterTest.java | 4 +- .../connecteddevice/usb/UsbBackendTest.java | 5 +- .../UsbConnectionBroadcastReceiverTest.java | 5 +- .../usb/UsbDefaultFragmentTest.java | 11 +- .../usb/UsbDetailsDataRoleControllerTest.java | 4 +- .../UsbDetailsFunctionsControllerTest.java | 4 +- .../usb/UsbDetailsHeaderControllerTest.java | 4 +- .../UsbDetailsPowerRoleControllerTest.java | 6 +- .../core/BasePreferenceControllerTest.java | 10 +- .../core/InstrumentedActivityTest.java | 5 +- .../InstrumentedPreferenceFragmentTest.java | 4 +- .../PreferenceControllerListHelperTest.java | 4 +- .../core/PreferenceXmlParserUtilsTest.java | 14 +- ...ettingsSliderPreferenceControllerTest.java | 9 +- .../core/SliderPreferenceControllerTest.java | 9 +- .../settings/core/SubSettingLauncherTest.java | 4 +- .../core/TogglePreferenceControllerTest.java | 12 +- .../core/XmlControllerAttributeTest.java | 53 +++--- .../codeinspection/CodeInspectionTest.java | 4 +- .../LifecycleObserverCodeInspector.java | 2 +- .../InstrumentedDialogFragmentTest.java | 5 +- .../MetricsFeatureProviderTest.java | 4 +- .../dashboard/CategoryManagerTest.java | 5 +- .../DashboardFeatureProviderImplTest.java | 10 +- .../DashboardFragmentRegistryTest.java | 5 +- .../dashboard/DashboardFragmentTest.java | 4 +- ...lePlaceholderPreferenceControllerTest.java | 7 +- .../settings/dashboard/SummaryLoaderTest.java | 4 +- .../ProfileSelectDialogTest.java | 5 +- .../SuggestionFeatureProviderImplTest.java | 17 +- .../SuggestionStateProviderTest.java | 6 +- .../datausage/AppDataUsagePreferenceTest.java | 4 +- .../settings/datausage/AppDataUsageTest.java | 17 +- .../settings/datausage/AppPrefLoaderTest.java | 9 +- .../datausage/BillingCycleSettingsTest.java | 25 ++- .../datausage/CellDataPreferenceTest.java | 8 +- .../ChartDataUsagePreferenceTest.java | 4 +- .../DataUsageInfoControllerTest.java | 4 +- .../settings/datausage/DataUsageListTest.java | 4 +- .../datausage/DataUsagePreferenceTest.java | 7 +- ...aUsageSummaryPreferenceControllerTest.java | 6 +- .../DataUsageSummaryPreferenceTest.java | 8 +- .../datausage/DataUsageSummaryTest.java | 19 +- .../datausage/DataUsageUtilsTest.java | 11 +- ...tedDataAccessPreferenceControllerTest.java | 6 +- ...utoTimeFormatPreferenceControllerTest.java | 5 +- .../AutoTimePreferenceControllerTest.java | 4 +- .../AutoTimeZonePreferenceControllerTest.java | 4 +- .../DatePreferenceControllerTest.java | 4 +- .../datetime/TimeChangeListenerMixinTest.java | 4 +- .../TimeFormatPreferenceControllerTest.java | 9 +- .../TimePreferenceControllerTest.java | 4 +- .../TimeZonePreferenceControllerTest.java | 4 +- .../timezone/BaseTimeZoneAdapterTest.java | 13 +- .../timezone/BaseTimeZoneInfoPickerTest.java | 10 +- .../BaseTimeZonePreferenceControllerTest.java | 12 +- .../timezone/FixedOffsetPickerTest.java | 6 +- .../FixedOffsetPreferenceControllerTest.java | 5 +- .../RegionPreferenceControllerTest.java | 6 +- .../timezone/RegionSearchPickerTest.java | 8 +- .../timezone/RegionZonePickerTest.java | 5 +- .../RegionZonePreferenceControllerTest.java | 6 +- .../datetime/timezone/SpannableUtilTest.java | 4 +- .../TimeZoneInfoPreferenceControllerTest.java | 4 +- .../datetime/timezone/TimeZoneInfoTest.java | 4 +- .../timezone/TimeZoneSettingsTest.java | 10 +- .../timezone/model/TimeZoneDataTest.java | 5 +- ...erDescriptionPreferenceControllerTest.java | 4 +- ...StorageManagerSwitchBarControllerTest.java | 8 +- ...BluetoothA2dpPreferenceControllerTest.java | 4 +- .../AdbPreferenceControllerTest.java | 8 +- ...ppsOnExternalPreferenceControllerTest.java | 5 +- ...ctivityStartsPreferenceControllerTest.java | 5 +- ...DurationScalePreferenceControllerTest.java | 4 +- ...NotRespondingPreferenceControllerTest.java | 5 +- ...dProcessLimitPreferenceControllerTest.java | 4 +- ...A2dpHwOffloadPreferenceControllerTest.java | 5 +- ...bsoluteVolumePreferenceControllerTest.java | 5 +- ...BitsPerSamplePreferenceControllerTest.java | 4 +- ...ioChannelModePreferenceControllerTest.java | 4 +- ...othAudioCodecPreferenceControllerTest.java | 4 +- ...hAudioQualityPreferenceControllerTest.java | 4 +- ...dioSampleRatePreferenceControllerTest.java | 4 +- ...hAvrcpVersionPreferenceControllerTest.java | 4 +- ...hDeviceNoNamePreferenceControllerTest.java | 5 +- ...dAudioDevicesPreferenceControllerTest.java | 4 +- ...toothSnoopLogPreferenceControllerTest.java | 5 +- ...ReportInPowerPreferenceControllerTest.java | 7 +- .../BugReportPreferenceControllerTest.java | 7 +- ...raLaserSensorPreferenceControllerTest.java | 5 +- ...brsDataSwitchPreferenceControllerTest.java | 5 +- .../ClearAdbKeysPreferenceControllerTest.java | 4 +- ...orTemperaturePreferenceControllerTest.java | 5 +- ...ugGpuOverdrawPreferenceControllerTest.java | 4 +- ...lipOperationsPreferenceControllerTest.java | 4 +- ...iewAttributesPreferenceControllerTest.java | 6 +- .../DesktopModePreferenceControllerTest.java | 5 +- ...elopmentSettingsDashboardFragmentTest.java | 25 ++- ...velopmentSettingsDisabledActivityTest.java | 4 +- .../DevelopmentSwitchBarControllerTest.java | 4 +- ...omaticUpdatesPreferenceControllerTest.java | 6 +- ...DisplayCutoutPreferenceControllerTest.java | 15 +- ...sFullTrackingPreferenceControllerTest.java | 5 +- ...puDebugLayersPreferenceControllerTest.java | 5 +- ...ileEncryptionPreferenceControllerTest.java | 4 +- .../ForceDarkPreferenceControllerTest.java | 5 +- .../ForceMSAAPreferenceControllerTest.java | 5 +- ...eeformWindowsPreferenceControllerTest.java | 7 +- ...puViewUpdatesPreferenceControllerTest.java | 5 +- ...LayersUpdatesPreferenceControllerTest.java | 5 +- ...dwareOverlaysPreferenceControllerTest.java | 4 +- .../HdcpCheckingPreferenceControllerTest.java | 4 +- ...eepActivitiesPreferenceControllerTest.java | 5 +- ...ackupPasswordPreferenceControllerTest.java | 7 +- ...LocalTerminalPreferenceControllerTest.java | 5 +- .../LogPersistPreferenceControllerTest.java | 4 +- .../LogdSizePreferenceControllerTest.java | 4 +- .../MemoryUsagePreferenceControllerTest.java | 4 +- ...eDataAlwaysOnPreferenceControllerTest.java | 5 +- ...ckLocationAppPreferenceControllerTest.java | 4 +- ...annelWarningsPreferenceControllerTest.java | 5 +- .../OemUnlockPreferenceControllerTest.java | 5 +- ...tureColorModePreferenceControllerTest.java | 4 +- ...interLocationPreferenceControllerTest.java | 5 +- ...eGpuRenderingPreferenceControllerTest.java | 4 +- ...zableActivityPreferenceControllerTest.java | 5 +- .../RtlLayoutPreferenceControllerTest.java | 5 +- ...ondaryDisplayPreferenceControllerTest.java | 4 +- ...electDebugAppPreferenceControllerTest.java | 4 +- ...gerThrottlingPreferenceControllerTest.java | 5 +- ...stCrashDialogPreferenceControllerTest.java | 5 +- ...wLayoutBoundsPreferenceControllerTest.java | 5 +- ...urfaceUpdatesPreferenceControllerTest.java | 4 +- .../ShowTapsPreferenceControllerTest.java | 5 +- ...ateColorSpacePreferenceControllerTest.java | 4 +- ...ssRestrictionPreferenceControllerTest.java | 6 +- .../StayAwakePreferenceControllerTest.java | 4 +- .../StrictModePreferenceControllerTest.java | 5 +- ...HardwareAccelPreferenceControllerTest.java | 5 +- ...nimationScalePreferenceControllerTest.java | 4 +- ...riverDevOptInPreferenceControllerTest.java | 6 +- ...bAudioRoutingPreferenceControllerTest.java | 5 +- ...fyAppsOverUsbPreferenceControllerTest.java | 13 +- ...itForDebuggerPreferenceControllerTest.java | 5 +- .../WebViewAppPreferenceControllerTest.java | 4 +- ...RandomizationPreferenceControllerTest.java | 5 +- ...CertificationPreferenceControllerTest.java | 5 +- ...erboseLoggingPreferenceControllerTest.java | 5 +- ...nimationScalePreferenceControllerTest.java | 4 +- ...lLoggingLevelPreferenceControllerTest.java | 10 +- ...lResetOptionsPreferenceControllerTest.java | 11 +- .../FeatureFlagPersistentTest.java | 5 +- .../FeatureFlagPreferenceControllerTest.java | 7 +- .../FeatureFlagPreferenceTest.java | 5 +- .../FeatureFlagsDashboardTest.java | 4 +- ...velopmentTilePreferenceControllerTest.java | 6 +- .../qstile/DevelopmentTilesTest.java | 4 +- .../development/qstile/WinscopeTraceTest.java | 5 +- ...randedAccountPreferenceControllerTest.java | 4 +- .../BuildNumberPreferenceControllerTest.java | 8 +- .../DeviceModelPreferenceControllerTest.java | 8 +- .../DeviceNamePreferenceControllerTest.java | 12 +- ...ccEquipmentIdPreferenceControllerTest.java | 5 +- .../FeedbackPreferenceControllerTest.java | 7 +- .../HardwareInfoDialogFragmentTest.java | 13 +- ...KernelVersionPreferenceControllerTest.java | 5 +- .../ManualPreferenceControllerTest.java | 7 +- .../PhoneNumberPreferenceControllerTest.java | 4 +- .../deviceinfo/PrivateVolumeForgetTest.java | 7 +- .../deviceinfo/PrivateVolumeFormatTest.java | 5 +- ...PrivateVolumeOptionMenuControllerTest.java | 6 +- .../deviceinfo/PrivateVolumeUnmountTest.java | 5 +- ...egulatoryInfoPreferenceControllerTest.java | 9 +- .../StorageDashboardFragmentTest.java | 4 +- .../deviceinfo/StorageItemPreferenceTest.java | 4 +- .../StorageProfileFragmentTest.java | 6 +- .../deviceinfo/StorageSettingsTest.java | 5 +- ...pLevelStoragePreferenceControllerTest.java | 4 +- .../DeviceNameWarningDialogTest.java | 7 +- .../aboutphone/MyDeviceInfoFragmentTest.java | 6 +- ...elAboutDevicePreferenceControllerTest.java | 8 +- .../BasebandVersionDialogControllerTest.java | 4 +- .../BuildNumberDialogControllerTest.java | 5 +- .../FirmwareVersionDialogControllerTest.java | 5 +- ...rmwareVersionPreferenceControllerTest.java | 6 +- .../KernelVersionDialogControllerTest.java | 4 +- ...ecurityPatchLevelDialogControllerTest.java | 5 +- .../imei/ImeiInfoDialogControllerTest.java | 5 +- .../ImeiInfoPreferenceControllerTest.java | 4 +- .../CopyrightPreferenceControllerTest.java | 10 +- .../LicensePreferenceControllerTest.java | 11 +- .../legal/TermsPreferenceControllerTest.java | 10 +- ...rAttributionsPreferenceControllerTest.java | 4 +- ...ebViewLicensePreferenceControllerTest.java | 10 +- .../SimStatusDialogControllerTest.java | 5 +- .../SimStatusPreferenceControllerTest.java | 4 +- ...agementSwitchPreferenceControllerTest.java | 10 +- .../CachedStorageValuesHelperTest.java | 24 +-- .../storage/SecondaryUserControllerTest.java | 6 +- .../StorageItemPreferenceControllerTest.java | 17 +- ...eSummaryDonutPreferenceControllerTest.java | 22 +-- .../storage/UserProfileControllerTest.java | 4 +- .../storage/VolumeSizesLoaderTest.java | 6 +- ...splayAlwaysOnPreferenceControllerTest.java | 4 +- ...NotificationsPreferenceControllerTest.java | 10 +- .../settings/display/AppGridViewTest.java | 5 +- ...utoBrightnessPreferenceControllerTest.java | 4 +- .../AutoRotatePreferenceControllerTest.java | 15 +- ...eryPercentagePreferenceControllerTest.java | 5 +- ...ightnessLevelPreferenceControllerTest.java | 7 +- .../ColorModePreferenceControllerTest.java | 5 +- .../ColorModePreferenceFragmentTest.java | 10 +- .../DarkUIPreferenceControllerTest.java | 5 +- .../FontSizePreferenceControllerTest.java | 13 +- ...layActivationPreferenceControllerTest.java | 12 +- ...splayAutoModePreferenceControllerTest.java | 10 +- ...CustomEndTimePreferenceControllerTest.java | 10 +- ...stomStartTimePreferenceControllerTest.java | 10 +- ...DisplayFooterPreferenceControllerTest.java | 11 +- ...playIntensityPreferenceControllerTest.java | 10 +- .../NightDisplayPreferenceControllerTest.java | 8 +- .../display/NightDisplaySettingsTest.java | 4 +- .../display/ScreenZoomSettingsTest.java | 5 +- ...wOperatorNamePreferenceControllerTest.java | 4 +- .../ThemePreferenceControllerTest.java | 10 +- .../display/TimeoutListPreferenceTest.java | 10 +- .../TimeoutPreferenceControllerTest.java | 6 +- ...pLevelDisplayPreferenceControllerTest.java | 11 +- .../VrDisplayPreferencePickerTest.java | 4 +- .../WallpaperPreferenceControllerTest.java | 8 +- .../dream/CurrentDreamPickerTest.java | 6 +- .../CurrentDreamPreferenceControllerTest.java | 4 +- .../settings/dream/DreamSettingsTest.java | 32 ++-- .../StartNowPreferenceControllerTest.java | 4 +- .../settings/dream/WhenToDreamPickerTest.java | 4 +- .../WhenToDreamPreferenceControllerTest.java | 4 +- ...ActionDisabledByAdminDialogHelperTest.java | 11 +- .../ActionDisabledByAdminDialogTest.java | 15 +- ...minActionPreferenceControllerBaseTest.java | 5 +- ...eraPermissionPreferenceControllerTest.java | 5 +- ...onPermissionsPreferenceControllerTest.java | 5 +- ...onePermissionPreferenceControllerTest.java | 5 +- ...rmissionsPreferenceControllerBaseTest.java | 6 +- ...rmissionsPreferenceControllerTestBase.java | 4 +- ...pnCurrentUserPreferenceControllerTest.java | 4 +- ...anagedProfilePreferenceControllerTest.java | 4 +- .../ApplicationListFragmentTest.java | 4 +- ...plicationListPreferenceControllerTest.java | 10 +- .../BugReportsPreferenceControllerTest.java | 5 +- ...tsCurrentUserPreferenceControllerTest.java | 4 +- ...anagedProfilePreferenceControllerTest.java | 5 +- .../CaCertsPreferenceControllerBaseTest.java | 5 +- ...alledPackagesPreferenceControllerTest.java | 4 +- ...erprisePrivacyFeatureProviderImplTest.java | 4 +- ...rprisePrivacyPreferenceControllerTest.java | 4 +- .../EnterprisePrivacySettingsTest.java | 4 +- ...erpriseSetDefaultAppsListFragmentTest.java | 4 +- ...faultAppsListPreferenceControllerTest.java | 10 +- ...etDefaultAppsPreferenceControllerTest.java | 10 +- ...peCurrentUserPreferenceControllerTest.java | 5 +- ...anagedProfilePreferenceControllerTest.java | 5 +- ...swordWipePreferenceControllerBaseTest.java | 5 +- ...obalHttpProxyPreferenceControllerTest.java | 4 +- .../ImePreferenceControllerTest.java | 4 +- ...geDeviceAdminPreferenceControllerTest.java | 4 +- .../NetworkLogsPreferenceControllerTest.java | 5 +- .../SecurityLogsPreferenceControllerTest.java | 5 +- .../flashlight/FlashlightSliceTest.java | 5 +- .../AdvancedPowerUsageDetailTest.java | 12 +- ...toRestrictionPreferenceControllerTest.java | 4 +- ...roundActivityPreferenceControllerTest.java | 13 +- ...atteryAppListPreferenceControllerTest.java | 4 +- .../BatteryBroadcastReceiverTest.java | 11 +- .../fuelgauge/BatteryDatabaseManagerTest.java | 4 +- .../settings/fuelgauge/BatteryEntryTest.java | 4 +- ...BatteryHeaderPreferenceControllerTest.java | 17 +- .../BatteryHistoryPreferenceTest.java | 9 +- .../fuelgauge/BatteryInfoLoaderTest.java | 8 +- .../settings/fuelgauge/BatteryInfoTest.java | 8 +- .../fuelgauge/BatteryMeterViewTest.java | 9 +- ...yOptimizationPreferenceControllerTest.java | 4 +- .../fuelgauge/BatterySaverControllerTest.java | 5 +- .../fuelgauge/BatterySaverReceiverTest.java | 5 +- .../BatteryStatsHelperLoaderTest.java | 9 +- .../settings/fuelgauge/BatteryUtilsTest.java | 12 +- .../fuelgauge/HighPowerDetailTest.java | 8 +- .../fuelgauge/PowerGaugePreferenceTest.java | 4 +- .../fuelgauge/PowerUsageAdvancedTest.java | 8 +- .../fuelgauge/PowerUsageBaseTest.java | 8 +- .../PowerUsageFeatureProviderImplTest.java | 4 +- .../fuelgauge/PowerUsageSummaryTest.java | 24 +-- .../RestrictAppPreferenceControllerTest.java | 6 +- .../fuelgauge/RestrictedAppDetailsTest.java | 7 +- .../SmartBatteryPreferenceControllerTest.java | 9 +- ...pLevelBatteryPreferenceControllerTest.java | 11 +- ...oBatterySaverPreferenceControllerTest.java | 7 +- ...atterySeekBarPreferenceControllerTest.java | 11 +- ...rySaverButtonPreferenceControllerTest.java | 6 +- ...SaverSchedulePreferenceControllerTest.java | 8 +- .../AnomalyCleanupJobServiceTest.java | 4 +- .../AnomalyConfigJobServiceTest.java | 13 +- .../AnomalyDetectionJobServiceTest.java | 4 +- .../fuelgauge/batterytip/AppInfoTest.java | 5 +- ...atteryManagerPreferenceControllerTest.java | 4 +- .../BatteryTipDialogFragmentTest.java | 8 +- .../batterytip/BatteryTipLoaderTest.java | 11 +- .../batterytip/BatteryTipPolicyTest.java | 5 +- .../BatteryTipPreferenceControllerTest.java | 6 +- .../batterytip/BatteryTipUtilsTest.java | 4 +- .../batterytip/HighUsageDataParserTest.java | 5 +- .../OpenRestrictAppFragmentActionTest.java | 4 +- .../actions/RestrictAppActionTest.java | 4 +- .../actions/UnrestrictAppActionTest.java | 4 +- .../detectors/EarlyWarningDetectorTest.java | 6 +- .../detectors/HighUsageDetectorTest.java | 4 +- .../detectors/LowBatteryDetectorTest.java | 7 +- .../detectors/RestrictAppDetectorTest.java | 21 ++- .../detectors/SmartBatteryDetectorTest.java | 4 +- .../detectors/SummaryDetectorTest.java | 4 +- .../batterytip/tips/BatteryTipTest.java | 4 +- .../batterytip/tips/EarlyWarningTipTest.java | 4 +- .../batterytip/tips/HighUsageTipTest.java | 4 +- .../batterytip/tips/LowBatteryTipTest.java | 4 +- .../batterytip/tips/RestrictAppTipTest.java | 14 +- .../batterytip/tips/SmartBatteryTipTest.java | 4 +- .../batterytip/tips/SummaryTipTest.java | 7 +- .../batterytip/tips/UnrestrictAppTipTest.java | 4 +- ...stureSettingsPreferenceControllerTest.java | 4 +- .../gestures/AssistGestureSettingsTest.java | 6 +- ...oubleTapPowerPreferenceControllerTest.java | 4 +- .../gestures/DoubleTapPowerSettingsTest.java | 5 +- ...ubleTapScreenPreferenceControllerTest.java | 7 +- .../gestures/DoubleTapScreenSettingsTest.java | 5 +- .../DoubleTwistGestureSettingsTest.java | 5 +- .../DoubleTwistPreferenceControllerTest.java | 6 +- .../GesturePreferenceControllerTest.java | 9 +- .../gestures/GestureSettingsTest.java | 4 +- ...turesSettingsPreferenceControllerTest.java | 6 +- ...PickupGesturePreferenceControllerTest.java | 6 +- .../gestures/PickupGestureSettingsTest.java | 5 +- ...ingingGesturePreferenceControllerTest.java | 6 +- .../PreventRingingGestureSettingsTest.java | 5 +- ...RingingParentPreferenceControllerTest.java | 7 +- ...oNotificationPreferenceControllerTest.java | 4 +- .../SwipeToNotificationSettingsTest.java | 5 +- .../SwipeUpPreferenceControllerTest.java | 4 +- ...ScreenGesturePreferenceControllerTest.java | 6 +- .../WakeLockScreenGestureSettingsTest.java | 5 +- ...ScreenGesturePreferenceControllerTest.java | 6 +- .../WakeScreenGestureSettingsTest.java | 5 +- .../SettingsHomepageActivityTest.java | 4 +- .../homepage/TopLevelSettingsTest.java | 5 +- .../CardContentProviderTest.java | 8 +- .../CardDatabaseHelperTest.java | 4 +- ...ContextualCardFeatureProviderImplTest.java | 7 +- .../ContextualCardLoaderTest.java | 4 +- .../ContextualCardLookupTableTest.java | 4 +- .../ContextualCardManagerTest.java | 4 +- .../ControllerRendererPoolTest.java | 4 +- .../SettingsContextualCardProviderTest.java | 4 +- ...rmalRingerConditionControllerBaseTest.java | 6 +- ...BackgroundDataConditionControllerTest.java | 4 +- .../BatterySaverConditionControllerTest.java | 5 +- ...ConditionContextualCardControllerTest.java | 4 +- .../ConditionContextualCardRendererTest.java | 4 +- ...itionFooterContextualCardRendererTest.java | 4 +- .../ConditionFooterContextualCardTest.java | 4 +- ...itionHeaderContextualCardRendererTest.java | 4 +- .../ConditionHeaderContextualCardTest.java | 4 +- .../conditional/ConditionManagerTest.java | 7 +- .../ConditionalContextualCardTest.java | 5 +- .../DndConditionalCardControllerTest.java | 6 +- .../NightDisplayConditionControllerTest.java | 5 +- .../WorkModeConditionControllerTest.java | 5 +- .../deviceinfo/BatterySliceTest.java | 4 +- .../deviceinfo/DataUsageSliceTest.java | 4 +- .../deviceinfo/DeviceInfoSliceTest.java | 4 +- .../deviceinfo/StorageSliceTest.java | 4 +- ...uggestionContextualCardControllerTest.java | 5 +- ...ySuggestionContextualCardRendererTest.java | 5 +- .../LegacySuggestionContextualCardTest.java | 5 +- .../slices/BatteryFixSliceTest.java | 6 +- .../slices/BluetoothDevicesSliceTest.java | 6 +- .../slices/BluetoothUpdateWorkerTest.java | 4 +- .../slices/LowStorageSliceTest.java | 6 +- .../SliceContextualCardControllerTest.java | 4 +- .../SliceContextualCardRendererTest.java | 4 +- ...ameControllerPreferenceControllerTest.java | 5 +- .../InputMethodAndSubtypeEnablerTest.java | 4 +- ...hodAndSubtypePreferenceControllerTest.java | 4 +- .../KeyboardLayoutPickerControllerTest.java | 10 +- ...sicalKeyboardPreferenceControllerTest.java | 4 +- .../SpellCheckerPreferenceControllerTest.java | 4 +- .../UserDictionaryCursorLoaderTest.java | 5 +- .../UserDictionaryListControllerTest.java | 5 +- ...rtualKeyboardPreferenceControllerTest.java | 4 +- .../LanguageAndInputSettingsTest.java | 6 +- ...PhoneLanguagePreferenceControllerTest.java | 4 +- .../language/PointerSpeedControllerTest.java | 5 +- .../language/TtsPreferenceControllerTest.java | 5 +- ...serDictionaryPreferenceControllerTest.java | 4 +- .../localepicker/LocaleListEditorTest.java | 7 +- .../LocalePickerWithRegionActivityTest.java | 4 +- ...ionPermissionPreferenceControllerTest.java | 5 +- ...toothScanningPreferenceControllerTest.java | 5 +- .../location/LocationEnablerTest.java | 19 +- ...ocationFooterPreferenceControllerTest.java | 22 +-- ...cationForWorkPreferenceControllerTest.java | 4 +- ...ationScanningPreferenceControllerTest.java | 4 +- ...cationServicePreferenceControllerTest.java | 10 +- .../location/LocationSettingsTest.java | 4 +- .../settings/location/LocationSliceTest.java | 4 +- .../LocationSwitchBarControllerTest.java | 4 +- ...cationRequestPreferenceControllerTest.java | 4 +- ...RequestSeeAllPreferenceControllerTest.java | 4 +- .../location/ScanningSettingsTest.java | 4 +- .../WifiScanningPreferenceControllerTest.java | 5 +- .../AirplaneModePreferenceControllerTest.java | 4 +- .../settings/network/ApnEditorTest.java | 10 +- ...MobileNetworkPreferenceControllerTest.java | 9 +- .../MobilePlanPreferenceControllerTest.java | 4 +- .../network/NetworkDashboardFragmentTest.java | 4 +- .../NetworkResetPreferenceControllerTest.java | 5 +- .../NetworkResetRestrictionCheckerTest.java | 5 +- ...kScorerPickerPreferenceControllerTest.java | 4 +- .../network/NetworkScorerPickerTest.java | 8 +- .../PrivateDnsModeDialogPreferenceTest.java | 4 +- .../PrivateDnsPreferenceControllerTest.java | 6 +- .../network/SubscriptionUtilTest.java | 5 +- .../SubscriptionsChangeListenerTest.java | 8 +- .../TetherPreferenceControllerTest.java | 6 +- ...lNetworkEntryPreferenceControllerTest.java | 8 +- .../network/VpnPreferenceControllerTest.java | 8 +- .../ApnPreferenceControllerTest.java | 4 +- .../CarrierPreferenceControllerTest.java | 4 +- ...aServiceSetupPreferenceControllerTest.java | 4 +- .../DataUsagePreferenceControllerTest.java | 4 +- ...edNetworkModePreferenceControllerTest.java | 5 +- ...Enhanced4gLtePreferenceControllerTest.java | 5 +- .../Enhanced4gLteSliceHelperTest.java | 6 +- .../EuiccPreferenceControllerTest.java | 6 +- .../MobileDataPreferenceControllerTest.java | 6 +- .../telephony/MobileNetworkActivityTest.java | 10 +- .../telephony/MobileNetworkUtilsTest.java | 4 +- .../telephony/NetworkSelectSettingsTest.java | 6 +- ...edNetworkModePreferenceControllerTest.java | 7 +- .../RoamingPreferenceControllerTest.java | 5 +- .../VideoCallingPreferenceControllerTest.java | 5 +- .../WifiCallingPreferenceControllerTest.java | 6 +- .../cdma/CdmaListPreferenceTest.java | 5 +- ...aSubscriptionPreferenceControllerTest.java | 4 +- ...aSystemSelectPreferenceControllerTest.java | 7 +- .../AutoSelectPreferenceControllerTest.java | 4 +- ...orkSelectPagePreferenceControllerTest.java | 4 +- .../AndroidBeamPreferenceControllerTest.java | 4 +- .../nfc/NfcAirplaneModeObserverTest.java | 6 +- .../android/settings/nfc/NfcEnablerTest.java | 5 +- ...NfcForegroundPreferenceControllerTest.java | 4 +- .../NfcPaymentPreferenceControllerTest.java | 4 +- .../nfc/NfcPreferenceControllerTest.java | 6 +- .../settings/nfc/PaymentSettingsTest.java | 7 +- ...umeRestrictedPreferenceControllerTest.java | 8 +- ...AlarmRingtonePreferenceControllerTest.java | 5 +- .../AlarmVolumePreferenceControllerTest.java | 5 +- .../AllowSoundPreferenceControllerTest.java | 31 ++-- .../AppLinkPreferenceControllerTest.java | 10 +- .../BadgePreferenceControllerTest.java | 8 +- ...gNotificationPreferenceControllerTest.java | 5 +- .../BlockPreferenceControllerTest.java | 11 +- .../BootSoundPreferenceControllerTest.java | 4 +- .../CallVolumePreferenceControllerTest.java | 15 +- .../CastPreferenceControllerTest.java | 5 +- ...ChargingSoundPreferenceControllerTest.java | 11 +- .../ConfigureNotificationSettingsTest.java | 4 +- ...letedChannelsPreferenceControllerTest.java | 9 +- .../DescriptionPreferenceControllerTest.java | 10 +- .../DialPadTonePreferenceControllerTest.java | 5 +- .../DndPreferenceControllerTest.java | 8 +- ...ockAudioMediaPreferenceControllerTest.java | 7 +- .../DockingSoundPreferenceControllerTest.java | 5 +- ...encyBroadcastPreferenceControllerTest.java | 4 +- ...EmergencyTonePreferenceControllerTest.java | 5 +- .../HeaderPreferenceControllerTest.java | 10 +- .../ImportancePreferenceControllerTest.java | 16 +- .../LightsPreferenceControllerTest.java | 15 +- .../MediaVolumePreferenceControllerTest.java | 5 +- .../NotificationAccessSettingsTest.java | 6 +- .../NotificationAppPreferenceTest.java | 4 +- .../notification/NotificationBackendTest.java | 12 +- .../NotificationPreferenceControllerTest.java | 9 +- ...ationRingtonePreferenceControllerTest.java | 5 +- ...icationVolumePreferenceControllerTest.java | 5 +- ...ificationsOffPreferenceControllerTest.java | 5 +- ...PhoneRingtonePreferenceControllerTest.java | 5 +- ...eNotificationPreferenceControllerTest.java | 4 +- ...NotifyingAppsPreferenceControllerTest.java | 12 +- .../RedactionInterstitialTest.java | 9 +- .../RingVolumePreferenceControllerTest.java | 5 +- .../RingtonePreferenceControllerBaseTest.java | 7 +- ...reenLockSoundPreferenceControllerTest.java | 5 +- .../SettingPrefControllerTest.java | 4 +- .../SoundPreferenceControllerTest.java | 60 +++---- .../notification/SoundSettingsTest.java | 5 +- .../notification/SuppressorHelperTest.java | 5 +- .../TouchSoundPreferenceControllerTest.java | 5 +- ...ibrateOnTouchPreferenceControllerTest.java | 6 +- ...brateWhenRingPreferenceControllerTest.java | 5 +- .../VibrationPreferenceControllerTest.java | 8 +- .../VisibilityPreferenceControllerTest.java | 9 +- ...VolumeSeekBarPreferenceControllerTest.java | 16 +- .../VolumeSeekBarPreferenceTest.java | 5 +- .../WorkSoundPreferenceControllerTest.java | 9 +- .../notification/ZenAccessSettingsTest.java | 8 +- .../ZenCustomRadioButtonPreferenceTest.java | 4 +- .../ZenFooterPreferenceControllerTest.java | 4 +- ...ZenModeAlarmsPreferenceControllerTest.java | 4 +- ...BypassingAppsPreferenceControllerTest.java | 9 +- ...utomaticRulesPreferenceControllerTest.java | 23 ++- .../notification/ZenModeBackendTest.java | 5 +- ...ehaviorFooterPreferenceControllerTest.java | 8 +- ...lockedEffectsPreferenceControllerTest.java | 4 +- ...ZenModeButtonPreferenceControllerTest.java | 7 +- ...BypassingAppsPreferenceControllerTest.java | 4 +- .../ZenModeCallsPreferenceControllerTest.java | 4 +- ...nModeDurationPreferenceControllerTest.java | 4 +- .../ZenModeEventRuleSettingsTest.java | 7 +- ...ZenModeEventsPreferenceControllerTest.java | 4 +- .../ZenModeMediaPreferenceControllerTest.java | 4 +- ...nModeMessagesPreferenceControllerTest.java | 4 +- .../ZenModePreferenceControllerTest.java | 6 +- ...PriorityCallsPreferenceControllerTest.java | 10 +- ...orityMessagesPreferenceControllerTest.java | 10 +- ...ModeRemindersPreferenceControllerTest.java | 5 +- ...RepeatCallersPreferenceControllerTest.java | 7 +- .../ZenModeScheduleRuleSettingsTest.java | 7 +- ...ettingsFooterPreferenceControllerTest.java | 6 +- .../notification/ZenModeSettingsTest.java | 6 +- .../notification/ZenModeSliceBuilderTest.java | 4 +- ...arredContactsPreferenceControllerTest.java | 9 +- ...ZenModeSystemPreferenceControllerTest.java | 7 +- ...ModeVisEffectPreferenceControllerTest.java | 4 +- ...VisEffectsAllPreferenceControllerTest.java | 4 +- ...EffectsCustomPreferenceControllerTest.java | 8 +- ...isEffectsNonePreferenceControllerTest.java | 4 +- .../ZenOnboardingActivityTest.java | 10 +- .../panel/InternetConnectivityPanelTest.java | 4 +- .../panel/PanelFeatureProviderImplTest.java | 6 +- .../settings/panel/PanelFragmentTest.java | 4 +- .../panel/PanelSlicesAdapterTest.java | 4 +- .../settings/panel/VolumePanelTest.java | 4 +- .../ChooseLockGenericControllerTest.java | 8 +- .../password/ChooseLockGenericTest.java | 16 +- .../password/ChooseLockPasswordTest.java | 14 +- .../password/ChooseLockPatternTest.java | 13 +- .../ChooseLockSettingsHelperTest.java | 18 +- .../ChooseLockTypeDialogFragmentTest.java | 12 +- .../password/ConfirmCredentialTest.java | 7 +- .../settings/password/ScreenLockTypeTest.java | 5 +- .../password/SetNewPasswordActivityTest.java | 5 +- .../SetNewPasswordControllerTest.java | 9 +- .../password/SetupChooseLockPasswordTest.java | 16 +- .../password/SetupChooseLockPatternTest.java | 13 +- .../password/SetupSkipDialogTest.java | 13 +- ...intJobMessagePreferenceControllerTest.java | 8 +- .../PrintJobPreferenceControllerTest.java | 9 +- ...PrintSettingsPreferenceControllerTest.java | 4 +- .../search/BaseSearchIndexProviderTest.java | 4 +- .../search/SearchFeatureProviderImplTest.java | 7 +- .../search/SearchIndexableResourcesTest.java | 6 +- .../SettingsSearchIndexablesProviderTest.java | 4 +- .../actionbar/SearchMenuControllerTest.java | 4 +- ...ngeScreenLockPreferenceControllerTest.java | 4 +- .../security/ConfigureKeyGuardDialogTest.java | 6 +- ...entialStoragePreferenceControllerTest.java | 4 +- .../security/EncryptionAndCredentialTest.java | 4 +- ...ryptionStatusPreferenceControllerTest.java | 5 +- ...ckUnificationPreferenceControllerTest.java | 4 +- ...ockdownButtonPreferenceControllerTest.java | 6 +- .../LockscreenDashboardFragmentTest.java | 8 +- .../OwnerInfoPreferenceControllerTest.java | 10 +- ...tedEncryptionPreferenceControllerTest.java | 5 +- ...ScreenPinningPreferenceControllerTest.java | 4 +- .../SecurityFeatureProviderImplTest.java | 4 +- .../ShowPasswordPreferenceControllerTest.java | 4 +- .../SimLockPreferenceControllerTest.java | 4 +- ...LevelSecurityPreferenceControllerTest.java | 4 +- ...atternProfilePreferenceControllerTest.java | 4 +- ...kAfterTimeoutPreferenceControllerTest.java | 4 +- .../LockScreenPreferenceControllerTest.java | 5 +- ...atternVisiblePreferenceControllerTest.java | 4 +- ...onInstantLockPreferenceControllerTest.java | 4 +- .../screenlock/ScreenLockSettingsTest.java | 4 +- ...geTrustAgentsPreferenceControllerTest.java | 4 +- ...rustAgentListPreferenceControllerTest.java | 4 +- .../trustagent/TrustAgentManagerTest.java | 5 +- .../TrustAgentsPreferenceControllerTest.java | 13 +- ...reateShortcutPreferenceControllerTest.java | 4 +- .../shortcut/ShortcutsUpdateTaskTest.java | 5 +- .../slices/SettingsSliceProviderTest.java | 15 +- .../slices/SliceBroadcastReceiverTest.java | 4 +- .../slices/SliceBuilderUtilsTest.java | 4 +- .../slices/SliceDataConverterTest.java | 4 +- .../settings/slices/SliceDataTest.java | 5 +- .../slices/SliceRelayReceiverTest.java | 5 +- .../slices/SlicesDatabaseAccessorTest.java | 5 +- .../slices/SlicesDatabaseHelperTest.java | 4 +- .../settings/slices/SlicesIndexerTest.java | 4 +- .../slices/SpecialCaseSliceManagerTest.java | 5 +- ...oOutputSwitchPreferenceControllerTest.java | 11 +- ...ProfileOutputPreferenceControllerTest.java | 9 +- .../MediaOutputPreferenceControllerTest.java | 9 +- .../suggestions/SettingsSuggestionsTest.java | 22 +-- .../settings/support/SupportConfigTest.java | 4 +- .../support/SupportDashboardActivityTest.java | 4 +- .../SupportPreferenceControllerTest.java | 5 +- .../actionbar/HelpMenuControllerTest.java | 4 +- .../settings/survey/SurveyMixinTest.java | 8 +- ...lSystemUpdatePreferenceControllerTest.java | 5 +- .../FactoryResetPreferenceControllerTest.java | 4 +- .../system/ResetPreferenceControllerTest.java | 5 +- .../system/SystemDashboardFragmentTest.java | 4 +- .../SystemUpdatePreferenceControllerTest.java | 4 +- .../settings/testutils/BatteryTestUtils.java | 16 +- .../settings/testutils/DatabaseTestUtils.java | 32 +--- .../testutils/FakeCopyableController.java | 3 +- .../testutils/FakeFeatureFactory.java | 2 +- .../settings/testutils/FakeIndexProvider.java | 1 - .../testutils/FakeSliderController.java | 11 +- .../testutils/FakeToggleController.java | 12 +- .../FakeUnavailablePreferenceController.java | 3 +- .../SettingsRobolectricTestRunner.java | 89 +--------- .../testutils/ShadowIconDrawableFactory.java | 35 ---- .../shadow/SettingsShadowBluetoothDevice.java | 41 ----- .../shadow/SettingsShadowResources.java | 163 ++---------------- .../shadow/SettingsShadowResourcesImpl.java | 63 ------- .../shadow/SettingsShadowTypedArray.java | 47 ----- .../testutils/shadow/ShadowAccessPoint.java | 2 +- .../shadow/ShadowAccessibilityManager.java | 49 ------ .../ShadowAccessibilityServiceInfo.java | 2 +- .../shadow/ShadowAccountManager.java | 4 +- .../shadow/ShadowActivityManager.java | 2 +- .../shadow/ShadowActivityWithLoadManager.java | 44 ----- .../testutils/shadow/ShadowAppInfoBase.java | 4 +- .../shadow/ShadowApplicationsState.java | 2 +- .../testutils/shadow/ShadowAudioHelper.java | 4 +- .../testutils/shadow/ShadowAudioManager.java | 12 +- .../testutils/shadow/ShadowBidiFormatter.java | 31 ---- .../shadow/ShadowBluetoothAdapter.java | 6 +- .../shadow/ShadowBluetoothDevice.java | 12 +- .../testutils/shadow/ShadowBluetoothPan.java | 32 ---- .../shadow/ShadowBluetoothUtils.java | 5 +- .../ShadowCachedBluetoothDeviceManager.java | 2 +- .../shadow/ShadowConnectivityManager.java | 4 +- .../shadow/ShadowContentResolver.java | 14 +- ...ShadowContextImplWithRegisterReceiver.java | 40 ----- .../shadow/ShadowDataSaverBackend.java | 4 +- .../shadow/ShadowDataUsageUtils.java | 10 +- .../shadow/ShadowDatabaseIndexingUtils.java | 37 ---- .../shadow/ShadowDevicePolicyManager.java | 21 +-- ...ShadowDoubleTwistPreferenceController.java | 5 +- .../testutils/shadow/ShadowDynamicLayout.java | 42 ----- .../shadow/ShadowEntityHeaderController.java | 5 +- .../shadow/ShadowEventLogWriter.java | 33 ---- .../shadow/ShadowFingerprintManager.java | 50 +----- .../testutils/shadow/ShadowFragment.java | 15 +- .../testutils/shadow/ShadowHelpUtils.java | 2 +- .../testutils/shadow/ShadowInputDevice.java | 8 +- .../testutils/shadow/ShadowInputManager.java | 25 +-- ...hadowInputMethodManagerWithMethodList.java | 2 +- .../testutils/shadow/ShadowKeyStore.java | 2 +- .../shadow/ShadowLocalBluetoothAdapter.java | 55 ------ .../ShadowLocalBluetoothProfileManager.java | 38 ---- .../shadow/ShadowLockPatternUtils.java | 23 +-- .../testutils/shadow/ShadowMediaRouter.java | 52 ------ .../testutils/shadow/ShadowNfcAdapter.java | 12 +- .../shadow/ShadowNotificationManager.java | 6 +- .../settings/testutils/shadow/ShadowOs.java | 2 +- .../shadow/ShadowPackageMonitor.java | 63 ------- .../testutils/shadow/ShadowParcel.java | 6 +- .../shadow/ShadowPermissionChecker.java | 91 ---------- .../testutils/shadow/ShadowPowerManager.java | 8 +- .../shadow/ShadowPowerWhitelistBackend.java | 2 +- .../testutils/shadow/ShadowProcess.java | 18 -- .../shadow/ShadowRecoverySystem.java | 2 +- .../shadow/ShadowRestrictedLockUtils.java | 4 +- .../ShadowRestrictedLockUtilsInternal.java | 13 +- .../shadow/ShadowRestrictionUtils.java | 2 +- .../shadow/ShadowRotationPolicy.java | 8 +- .../shadow/ShadowRunnableAsyncTask.java | 40 ----- .../ShadowRuntimePermissionPresenter.java | 38 ---- .../ShadowSettingsPreferenceFragment.java | 39 ----- .../shadow/ShadowShortcutManager.java | 65 ------- .../shadow/ShadowStorageManager.java | 10 +- .../shadow/ShadowSystemSettings.java | 76 -------- .../testutils/shadow/ShadowTextUtils.java | 48 ------ .../testutils/shadow/ShadowThreadUtils.java | 7 +- .../testutils/shadow/ShadowTileService.java | 38 ---- .../testutils/shadow/ShadowTileUtils.java | 8 +- .../testutils/shadow/ShadowTimeZoneNames.java | 35 ---- .../testutils/shadow/ShadowUtils.java | 18 +- .../testutils/shadow/ShadowWifiManager.java | 8 +- .../shadow/ShadowWifiP2pManager.java | 10 +- .../testutils/shadow/ShadowZoneGetter.java | 53 ------ .../shadow/ShadowZoneGetterData.java | 52 ------ ...serWhenLockedPreferenceControllerTest.java | 4 +- .../AutoSyncDataPreferenceControllerTest.java | 7 +- ...cPersonalDataPreferenceControllerTest.java | 7 +- ...oSyncWorkDataPreferenceControllerTest.java | 7 +- .../users/EditUserInfoControllerTest.java | 6 +- ...ltiUserFooterPreferenceControllerTest.java | 7 +- .../settings/users/UserCapabilitiesTest.java | 5 +- .../users/UserFeatureProviderImplTest.java | 5 +- .../settings/users/UserPreferenceTest.java | 4 +- .../settings/users/UserSettingsTest.java | 17 +- .../settings/utils/AnnotationSpanTest.java | 5 +- ...calClassLoaderContextThemeWrapperTest.java | 5 +- .../settings/vpn2/AppDialogFragmentTest.java | 5 +- .../android/settings/vpn2/VpnUtilsTest.java | 5 +- .../wallpaper/FallbackHomeActivityTest.java | 29 ++-- .../WallpaperSuggestionActivityTest.java | 25 +-- ...WallpaperTypePreferenceControllerTest.java | 8 +- .../webview/WebViewAppPickerTest.java | 10 +- .../settings/wfd/WifiDisplaySettingsTest.java | 4 +- .../widget/ActionBarShadowControllerTest.java | 6 +- .../widget/AppCheckBoxPreferenceTest.java | 4 +- .../widget/AppSwitchPreferenceTest.java | 4 +- .../widget/AspectRatioFrameLayoutTest.java | 5 +- .../widget/BottomLabelLayoutTest.java | 4 +- .../widget/DefaultIndicatorSeekBarTest.java | 7 +- .../DisabledCheckBoxPreferenceTest.java | 7 +- .../settings/widget/DonutViewTest.java | 5 +- .../widget/EntityHeaderControllerTest.java | 17 +- .../FixedLineSummaryPreferenceTest.java | 5 +- ...oatingAppBarScrollingViewBehaviorTest.java | 4 +- ...ghlightablePreferenceGroupAdapterTest.java | 4 +- .../widget/LoadingViewControllerTest.java | 9 +- .../widget/MasterCheckBoxPreferenceTest.java | 4 +- .../widget/MasterSwitchPreferenceTest.java | 4 +- .../PreferenceCategoryControllerTest.java | 4 +- .../widget/RadioButtonPickerFragmentTest.java | 5 +- .../widget/RadioButtonPreferenceTest.java | 6 +- .../settings/widget/RingProgressBarTest.java | 12 +- .../widget/RoundedHomepageIconTest.java | 5 +- .../widget/RtlCompatibleViewPagerTest.java | 7 +- .../widget/ScrollToParentEditTextTest.java | 11 +- .../widget/SeekBarPreferenceTest.java | 5 +- .../settings/widget/SummaryUpdaterTest.java | 7 +- .../settings/widget/SwitchBarTest.java | 4 +- .../widget/TwoStateButtonPreferenceTest.java | 4 +- ...tableListPreferenceDialogFragmentTest.java | 10 +- .../settings/widget/UsageGraphTest.java | 4 +- .../ValidatedEditTextPreferenceTest.java | 9 +- .../widget/VideoPreferenceControllerTest.java | 1 - .../settings/widget/VideoPreferenceTest.java | 4 +- .../settings/wifi/AddNetworkFragmentTest.java | 4 +- .../AppStateChangeWifiStateBridgeTest.java | 6 +- ...lularFallbackPreferenceControllerTest.java | 5 +- .../wifi/ChangeWifiStateDetailsTest.java | 6 +- .../wifi/ConfigureWifiSettingsTest.java | 4 +- .../ConnectedAccessPointPreferenceTest.java | 4 +- .../settings/wifi/LinkablePreferenceTest.java | 4 +- .../NetworkRequestDialogActivityTest.java | 13 +- .../NetworkRequestDialogFragmentTest.java | 12 +- ...NetworkRequestErrorDialogFragmentTest.java | 9 +- ...fyOpenNetworkPreferenceControllerTest.java | 4 +- .../UseOpenWifiPreferenceControllerTest.java | 6 +- .../wifi/WifiConfigControllerTest.java | 16 +- .../settings/wifi/WifiDialogActivityTest.java | 12 +- .../android/settings/wifi/WifiDialogTest.java | 4 +- .../settings/wifi/WifiEnablerTest.java | 4 +- .../WifiInfoPreferenceControllerTest.java | 12 +- ...iMasterSwitchPreferenceControllerTest.java | 7 +- .../WifiScanningRequiredFragmentTest.java | 15 +- .../settings/wifi/WifiSettingsTest.java | 5 +- .../android/settings/wifi/WifiSliceTest.java | 4 +- .../settings/wifi/WifiSummaryUpdaterTest.java | 11 +- .../android/settings/wifi/WifiUtilsTest.java | 5 +- .../WifiWakeupPreferenceControllerTest.java | 53 +++--- .../wifi/WriteWifiConfigToNfcDialogTest.java | 7 +- .../WifiCallingSettingsForSubTest.java | 8 +- .../calling/WifiCallingSliceHelperTest.java | 11 +- .../WifiDetailPreferenceControllerTest.java | 13 +- .../WifiMeteredPreferenceControllerTest.java | 6 +- .../WifiPrivacyPreferenceControllerTest.java | 6 +- .../P2pCategoryPreferenceControllerTest.java | 7 +- ...P2pThisDevicePreferenceControllerTest.java | 7 +- .../p2p/WifiP2PPreferenceControllerTest.java | 8 +- .../settings/wifi/qrcode/QrCameraTest.java | 6 +- ...dAccessPointsPreferenceControllerTest.java | 5 +- .../SavedAccessPointsWifiSettingsTest.java | 7 +- .../wifi/tether/TetherServiceTest.java | 11 +- ...iTetherApBandPreferenceControllerTest.java | 6 +- ...TetherAutoOffPreferenceControllerTest.java | 5 +- ...etherPasswordPreferenceControllerTest.java | 6 +- .../WifiTetherPreferenceControllerTest.java | 41 +---- ...ifiTetherSSIDPreferenceControllerTest.java | 6 +- ...etherSecurityPreferenceControllerTest.java | 5 +- .../wifi/tether/WifiTetherSettingsTest.java | 8 +- .../WifiTetherSwitchBarControllerTest.java | 7 +- 1005 files changed, 3184 insertions(+), 5475 deletions(-) create mode 100644 tests/robotests/res/values-mcc998/config.xml delete mode 100644 tests/robotests/src/com/android/settings/testutils/ShadowIconDrawableFactory.java delete mode 100644 tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowBluetoothDevice.java delete mode 100644 tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResourcesImpl.java delete mode 100644 tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowTypedArray.java delete mode 100644 tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManager.java delete mode 100644 tests/robotests/src/com/android/settings/testutils/shadow/ShadowActivityWithLoadManager.java delete mode 100644 tests/robotests/src/com/android/settings/testutils/shadow/ShadowBidiFormatter.java delete mode 100644 tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothPan.java delete mode 100644 tests/robotests/src/com/android/settings/testutils/shadow/ShadowContextImplWithRegisterReceiver.java delete mode 100644 tests/robotests/src/com/android/settings/testutils/shadow/ShadowDatabaseIndexingUtils.java delete mode 100644 tests/robotests/src/com/android/settings/testutils/shadow/ShadowDynamicLayout.java delete mode 100644 tests/robotests/src/com/android/settings/testutils/shadow/ShadowEventLogWriter.java delete mode 100644 tests/robotests/src/com/android/settings/testutils/shadow/ShadowLocalBluetoothAdapter.java delete mode 100644 tests/robotests/src/com/android/settings/testutils/shadow/ShadowLocalBluetoothProfileManager.java delete mode 100644 tests/robotests/src/com/android/settings/testutils/shadow/ShadowMediaRouter.java delete mode 100644 tests/robotests/src/com/android/settings/testutils/shadow/ShadowPackageMonitor.java delete mode 100644 tests/robotests/src/com/android/settings/testutils/shadow/ShadowPermissionChecker.java delete mode 100644 tests/robotests/src/com/android/settings/testutils/shadow/ShadowProcess.java delete mode 100644 tests/robotests/src/com/android/settings/testutils/shadow/ShadowRunnableAsyncTask.java delete mode 100644 tests/robotests/src/com/android/settings/testutils/shadow/ShadowRuntimePermissionPresenter.java delete mode 100644 tests/robotests/src/com/android/settings/testutils/shadow/ShadowSettingsPreferenceFragment.java delete mode 100644 tests/robotests/src/com/android/settings/testutils/shadow/ShadowShortcutManager.java delete mode 100644 tests/robotests/src/com/android/settings/testutils/shadow/ShadowSystemSettings.java delete mode 100644 tests/robotests/src/com/android/settings/testutils/shadow/ShadowTextUtils.java delete mode 100644 tests/robotests/src/com/android/settings/testutils/shadow/ShadowTileService.java delete mode 100644 tests/robotests/src/com/android/settings/testutils/shadow/ShadowTimeZoneNames.java delete mode 100644 tests/robotests/src/com/android/settings/testutils/shadow/ShadowZoneGetter.java delete mode 100644 tests/robotests/src/com/android/settings/testutils/shadow/ShadowZoneGetterData.java diff --git a/tests/robotests/Android.mk b/tests/robotests/Android.mk index ff0ddb19979..01218cbb3c2 100644 --- a/tests/robotests/Android.mk +++ b/tests/robotests/Android.mk @@ -1,10 +1,68 @@ -############################################# -# Settings Robolectric test target. # -############################################# LOCAL_PATH := $(call my-dir) + +SETTINGS_AOSP_PATH := packages/apps/Settings + +############################################################# +# Build SettingsTest.apk which includes test-only resources.# +############################################################# +include $(CLEAR_VARS) + +LOCAL_PACKAGE_NAME := SettingsTest +LOCAL_PRIVATE_PLATFORM_APIS := true +LOCAL_CERTIFICATE := platform +LOCAL_PRIVILEGED_MODULE := true +LOCAL_MODULE_TAGS := optional +LOCAL_USE_AAPT2 := true + +RELATIVE_SETTINGS_AOSP_PATH := ../../../../../$(SETTINGS_AOSP_PATH) + +LOCAL_MANIFEST_FILE := $(RELATIVE_SETTINGS_AOSP_PATH)/AndroidManifest.xml + +LOCAL_SRC_FILES := $(call all-java-files-under, $(RELATIVE_SETTINGS_AOSP_PATH)/src) + +LOCAL_RESOURCE_DIR += \ + $(LOCAL_PATH)/res \ + $(SETTINGS_AOSP_PATH)/res + +LOCAL_STATIC_ANDROID_LIBRARIES := \ + androidx.slice_slice-builders \ + androidx.slice_slice-core \ + androidx.slice_slice-view \ + androidx.core_core \ + androidx.appcompat_appcompat \ + androidx.cardview_cardview \ + androidx.preference_preference \ + androidx.recyclerview_recyclerview \ + com.google.android.material_material \ + setupcompat \ + setupdesign + +LOCAL_JAVA_LIBRARIES := \ + telephony-common \ + ims-common + +LOCAL_STATIC_JAVA_LIBRARIES := \ + androidx.lifecycle_lifecycle-runtime \ + androidx.lifecycle_lifecycle-extensions \ + guava \ + jsr305 \ + settings-contextual-card-protos-lite \ + contextualcards \ + settings-logtags \ + zxing-core-1.7 + +include frameworks/base/packages/SettingsLib/common.mk +include frameworks/base/packages/SettingsLib/search/common.mk + +include $(BUILD_PACKAGE) + +############################################################# +# Settings Robolectric test target. # +############################################################# include $(CLEAR_VARS) LOCAL_MODULE := SettingsRoboTests +LOCAL_MODULE_CLASS := JAVA_LIBRARIES LOCAL_SRC_FILES := $(call all-java-files-under, src) \ $(call all-java-files-under, ../../../../../frameworks/base/packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils) @@ -17,10 +75,13 @@ LOCAL_JAVA_LIBRARIES := \ mockito-robolectric-prebuilt \ truth-prebuilt -LOCAL_INSTRUMENTATION_FOR := Settings +LOCAL_INSTRUMENTATION_FOR := SettingsTest LOCAL_MODULE_TAGS := optional +# Generate test_config.properties +include external/robolectric-shadows/gen_test_config.mk + include $(BUILD_STATIC_JAVA_LIBRARY) ############################################################# @@ -37,11 +98,11 @@ LOCAL_JAVA_LIBRARIES := \ mockito-robolectric-prebuilt \ truth-prebuilt -LOCAL_TEST_PACKAGE := Settings +LOCAL_TEST_PACKAGE := SettingsTest LOCAL_INSTRUMENT_SOURCE_DIRS := $(dir $(LOCAL_PATH))../src \ frameworks/base/packages/SettingsLib/search/src \ LOCAL_ROBOTEST_TIMEOUT := 36000 -include external/robolectric-shadows/run_robotests.mk \ No newline at end of file +include external/robolectric-shadows/run_robotests.mk diff --git a/tests/robotests/config/robolectric.properties b/tests/robotests/config/robolectric.properties index aae277902fb..e40e51ccbec 100644 --- a/tests/robotests/config/robolectric.properties +++ b/tests/robotests/config/robolectric.properties @@ -1,6 +1,3 @@ -manifest=packages/apps/Settings/AndroidManifest.xml sdk=NEWEST_SDK - shadows=\ - com.android.settings.testutils.shadow.ShadowThreadUtils,\ - com.android.settingslib.testutils.shadow.ShadowXmlUtils + com.android.settings.testutils.shadow.ShadowThreadUtils diff --git a/tests/robotests/res/values-mcc998/config.xml b/tests/robotests/res/values-mcc998/config.xml new file mode 100644 index 00000000000..f9b91379226 --- /dev/null +++ b/tests/robotests/res/values-mcc998/config.xml @@ -0,0 +1,20 @@ + + + + + + diff --git a/tests/robotests/src/com/android/settings/DisplaySettingsTest.java b/tests/robotests/src/com/android/settings/DisplaySettingsTest.java index c08b841affe..e914b01bea6 100644 --- a/tests/robotests/src/com/android/settings/DisplaySettingsTest.java +++ b/tests/robotests/src/com/android/settings/DisplaySettingsTest.java @@ -4,20 +4,20 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.XmlTestUtils; import com.android.settings.testutils.shadow.ShadowPowerManager; import com.android.settingslib.core.AbstractPreferenceController; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DisplaySettingsTest { @Test diff --git a/tests/robotests/src/com/android/settings/HelpTrampolineTest.java b/tests/robotests/src/com/android/settings/HelpTrampolineTest.java index 46a1382a900..2d825b3bf0a 100644 --- a/tests/robotests/src/com/android/settings/HelpTrampolineTest.java +++ b/tests/robotests/src/com/android/settings/HelpTrampolineTest.java @@ -20,19 +20,19 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Intent; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowHelpUtils; import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowActivity; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowHelpUtils.class) public class HelpTrampolineTest { diff --git a/tests/robotests/src/com/android/settings/LegalSettingsTest.java b/tests/robotests/src/com/android/settings/LegalSettingsTest.java index 28eac07704d..78a5ee3ca68 100644 --- a/tests/robotests/src/com/android/settings/LegalSettingsTest.java +++ b/tests/robotests/src/com/android/settings/LegalSettingsTest.java @@ -19,18 +19,18 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.XmlTestUtils; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LegalSettingsTest { @Before diff --git a/tests/robotests/src/com/android/settings/MasterClearTest.java b/tests/robotests/src/com/android/settings/MasterClearTest.java index 174f5ab7af6..21cb09cc86a 100644 --- a/tests/robotests/src/com/android/settings/MasterClearTest.java +++ b/tests/robotests/src/com/android/settings/MasterClearTest.java @@ -50,7 +50,6 @@ import android.widget.ScrollView; import androidx.fragment.app.FragmentActivity; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUtils; import org.junit.Before; @@ -60,11 +59,12 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowActivity; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowUtils.class) public class MasterClearTest { diff --git a/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java b/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java index 6286cb95e28..0e4592da1f4 100644 --- a/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java +++ b/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java @@ -22,7 +22,6 @@ import static org.mockito.Mockito.spy; import android.app.Activity; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowRecoverySystem; import com.android.settings.testutils.shadow.ShadowWifiP2pManager; @@ -33,9 +32,10 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowRecoverySystem.class, ShadowWifiP2pManager.class}) public class ResetNetworkConfirmTest { @@ -64,8 +64,7 @@ public class ResetNetworkConfirmTest { Robolectric.getBackgroundThreadScheduler().advanceToLastPostedRunnable(); assertThat(mResetNetworkConfirm.mEraseEsimTask).isNotNull(); - assertThat(ShadowRecoverySystem.getWipeEuiccCalledCount()) - .isEqualTo(1); + assertThat(ShadowRecoverySystem.getWipeEuiccCalledCount()).isEqualTo(1); } @Test @@ -75,8 +74,7 @@ public class ResetNetworkConfirmTest { mResetNetworkConfirm.esimFactoryReset(mActivity, "" /* packageName */); assertThat(mResetNetworkConfirm.mEraseEsimTask).isNull(); - assertThat(ShadowRecoverySystem.getWipeEuiccCalledCount()) - .isEqualTo(0); + assertThat(ShadowRecoverySystem.getWipeEuiccCalledCount()).isEqualTo(0); } /** @@ -84,10 +82,8 @@ public class ResetNetworkConfirmTest { */ @Test public void testResetNetworkData_resetP2p() { - mResetNetworkConfirm.p2pFactoryReset(mActivity); - assertThat(ShadowWifiP2pManager.getFactoryResetCount()) - .isEqualTo(1); + assertThat(ShadowWifiP2pManager.getFactoryResetCount()).isEqualTo(1); } } diff --git a/tests/robotests/src/com/android/settings/RestrictedListPreferenceTest.java b/tests/robotests/src/com/android/settings/RestrictedListPreferenceTest.java index 42fa79f5823..9660b9db4cf 100644 --- a/tests/robotests/src/com/android/settings/RestrictedListPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/RestrictedListPreferenceTest.java @@ -29,7 +29,6 @@ import android.content.Intent; import android.os.Bundle; import android.util.AttributeSet; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settingslib.RestrictedPreferenceHelper; @@ -37,17 +36,14 @@ 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.annotation.Config; import org.robolectric.shadows.ShadowKeyguardManager; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) -@Config( - shadows = { - ShadowUserManager.class, - ShadowKeyguardManager.class, - }) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = {ShadowUserManager.class, ShadowKeyguardManager.class}) public class RestrictedListPreferenceTest { private static final int PROFILE_USER_ID = 11; // From UnlaunchableAppActivity @@ -67,7 +63,9 @@ public class RestrictedListPreferenceTest { Shadows.shadowOf(application.getSystemService(KeyguardManager.class)); mMockHelper = mock(RestrictedPreferenceHelper.class); mShadowUserManager = ShadowUserManager.getShadow(); - mPreference = new RestrictedListPreference(mActivity, mock(AttributeSet.class)); + + AttributeSet attributeSet = Robolectric.buildAttributeSet().build(); + mPreference = new RestrictedListPreference(mActivity, attributeSet); mPreference.setProfileUserId(PROFILE_USER_ID); ReflectionHelpers.setField(mPreference, "mHelper", mMockHelper); } diff --git a/tests/robotests/src/com/android/settings/RestrictedSettingsFragmentTest.java b/tests/robotests/src/com/android/settings/RestrictedSettingsFragmentTest.java index 761b3f1e6ad..ec0696b74e0 100644 --- a/tests/robotests/src/com/android/settings/RestrictedSettingsFragmentTest.java +++ b/tests/robotests/src/com/android/settings/RestrictedSettingsFragmentTest.java @@ -24,15 +24,14 @@ import android.app.Activity; import androidx.appcompat.app.AlertDialog; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RestrictedSettingsFragmentTest { @Mock diff --git a/tests/robotests/src/com/android/settings/SettingsActivityTest.java b/tests/robotests/src/com/android/settings/SettingsActivityTest.java index aa414649e70..dd39f12cbba 100644 --- a/tests/robotests/src/com/android/settings/SettingsActivityTest.java +++ b/tests/robotests/src/com/android/settings/SettingsActivityTest.java @@ -34,19 +34,19 @@ import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; import com.android.settings.core.OnActivityResultListener; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SettingsActivityTest { @Mock @@ -99,7 +99,7 @@ public class SettingsActivityTest { public static class ListenerFragment extends Fragment implements OnActivityResultListener { - public boolean mOnActivityResultCalled; + private boolean mOnActivityResultCalled; @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { diff --git a/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java b/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java index ed0e5a02235..2e016384b47 100644 --- a/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java @@ -24,16 +24,15 @@ import android.app.Dialog; import androidx.fragment.app.Fragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SettingsDialogFragmentTest { private static final int DIALOG_ID = 15; @@ -72,7 +71,6 @@ public class SettingsDialogFragmentTest { } catch (IllegalStateException e) { // getDialogMetricsCategory called in constructor verify(mDialogCreatable).getDialogMetricsCategory(DIALOG_ID); - return; } } diff --git a/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java b/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java index 6015e2789e8..c2018a94b12 100644 --- a/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java +++ b/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java @@ -17,8 +17,8 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -32,7 +32,6 @@ import android.content.pm.ResolveInfo; import androidx.annotation.NonNull; import com.android.settings.fuelgauge.batterytip.AnomalyConfigJobService; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.json.JSONException; import org.json.JSONObject; @@ -41,12 +40,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.io.OutputStream; import java.io.PrintWriter; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SettingsDumpServiceTest { private static final String PACKAGE_BROWSER = "com.android.test.browser"; diff --git a/tests/robotests/src/com/android/settings/SettingsInitializeTest.java b/tests/robotests/src/com/android/settings/SettingsInitializeTest.java index fe067909ff3..c28ffc4bbb7 100644 --- a/tests/robotests/src/com/android/settings/SettingsInitializeTest.java +++ b/tests/robotests/src/com/android/settings/SettingsInitializeTest.java @@ -22,25 +22,24 @@ import android.content.Context; import android.content.Intent; import android.content.pm.ShortcutInfo; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.ShadowShortcutManager; +import android.content.pm.ShortcutManager; +import java.util.Collections; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; -import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {ShadowShortcutManager.class}) +@RunWith(RobolectricTestRunner.class) public class SettingsInitializeTest { private Context mContext; private SettingsInitialize mSettingsInitialize; + private ShortcutManager mShortcutManager; @Before public void setUp() { @@ -48,6 +47,7 @@ public class SettingsInitializeTest { mContext = RuntimeEnvironment.application; mSettingsInitialize = new SettingsInitialize(); + mShortcutManager = (ShortcutManager) mContext.getSystemService(Context.SHORTCUT_SERVICE); } @Test @@ -59,14 +59,13 @@ public class SettingsInitializeTest { .setShortLabel("test123") .setIntent(intent) .build(); - final List shortcuts = new ArrayList<>(); - shortcuts.add(info); - ShadowShortcutManager.get().setPinnedShortcuts(shortcuts); + + mShortcutManager.addDynamicShortcuts(Collections.singletonList(info)); + mShortcutManager.requestPinShortcut(info, null); mSettingsInitialize.refreshExistingShortcuts(mContext); - final List updatedShortcuts = - ShadowShortcutManager.get().getLastUpdatedShortcuts(); + final List updatedShortcuts = mShortcutManager.getPinnedShortcuts(); assertThat(updatedShortcuts).hasSize(1); final ShortcutInfo updateInfo = updatedShortcuts.get(0); assertThat(updateInfo.getId()).isEqualTo(id); @@ -87,14 +86,14 @@ public class SettingsInitializeTest { .setIntent(new Intent(Intent.ACTION_DEFAULT)) .build(); info.addFlags(ShortcutInfo.FLAG_IMMUTABLE); - final List shortcuts = new ArrayList<>(); - shortcuts.add(info); - ShadowShortcutManager.get().setPinnedShortcuts(shortcuts); + + mShortcutManager.addDynamicShortcuts(Collections.singletonList(info)); + mShortcutManager.requestPinShortcut(info, null); mSettingsInitialize.refreshExistingShortcuts(mContext); - final List updatedShortcuts = - ShadowShortcutManager.get().getLastUpdatedShortcuts(); - assertThat(updatedShortcuts).isEmpty(); + final List updatedShortcuts = mShortcutManager.getPinnedShortcuts(); + assertThat(updatedShortcuts).hasSize(1); + assertThat(updatedShortcuts.get(0)).isSameAs(info); } } diff --git a/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java b/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java index 89893173759..6c573097ff2 100644 --- a/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java +++ b/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java @@ -18,7 +18,7 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -27,20 +27,19 @@ import android.content.Intent; import android.net.Uri; import android.os.SystemProperties; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.android.controller.ActivityController; import java.io.File; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SettingsLicenseActivityTest { private ActivityController mActivityController; diff --git a/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java index 76f70433b48..cce01550a78 100644 --- a/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java @@ -18,7 +18,7 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -37,8 +37,6 @@ import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settings.widget.WorkOnlyCategory; import org.junit.Before; @@ -46,11 +44,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SettingsPreferenceFragmentTest { private static final int ITEM_COUNT = 5; @@ -149,7 +147,6 @@ public class SettingsPreferenceFragmentTest { } @Test - @Config(shadows = SettingsShadowResources.SettingsShadowTheme.class) public void onCreate_hasExtraFragmentKey_shouldExpandPreferences() { doReturn(mContext.getTheme()).when(mActivity).getTheme(); doReturn(mContext.getResources()).when(mFragment).getResources(); @@ -164,7 +161,6 @@ public class SettingsPreferenceFragmentTest { } @Test - @Config(shadows = SettingsShadowResources.SettingsShadowTheme.class) public void onCreate_noPreferenceScreen_shouldNotCrash() { doReturn(mContext.getTheme()).when(mActivity).getTheme(); doReturn(mContext.getResources()).when(mFragment).getResources(); diff --git a/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java b/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java index 6220ac18f62..513697362f9 100644 --- a/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java +++ b/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java @@ -28,8 +28,9 @@ import com.google.android.setupdesign.util.ThemeHelper; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SetupWizardUtilsTest { @Test diff --git a/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java index 3cb9c4c3da0..98163bf9a36 100644 --- a/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java @@ -25,17 +25,13 @@ import android.widget.TextView; import androidx.preference.PreferenceViewHolder; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = SettingsShadowResourcesImpl.class) +@RunWith(RobolectricTestRunner.class) public class SummaryPreferenceTest { private PreferenceViewHolder mHolder; diff --git a/tests/robotests/src/com/android/settings/TetherSettingsTest.java b/tests/robotests/src/com/android/settings/TetherSettingsTest.java index 269e52de690..e69bd073f52 100644 --- a/tests/robotests/src/com/android/settings/TetherSettingsTest.java +++ b/tests/robotests/src/com/android/settings/TetherSettingsTest.java @@ -27,19 +27,18 @@ import android.net.ConnectivityManager; import android.os.UserHandle; import android.os.UserManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TetherSettingsTest { private Context mContext; @@ -61,8 +60,8 @@ public class TetherSettingsTest { setupIsTetherAvailable(true); - when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(new String[]{}); - when(mConnectivityManager.getTetherableBluetoothRegexs()).thenReturn(new String[]{}); + when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(new String[0]); + when(mConnectivityManager.getTetherableBluetoothRegexs()).thenReturn(new String[0]); } @Test @@ -91,7 +90,7 @@ public class TetherSettingsTest { @Test public void testTetherNonIndexableKeys_usbNotAvailable_usbKeyReturned() { - when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(new String[]{}); + when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(new String[0]); final List niks = TetherSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext); @@ -113,7 +112,7 @@ public class TetherSettingsTest { @Test public void testTetherNonIndexableKeys_bluetoothNotAvailable_bluetoothKeyReturned() { - when(mConnectivityManager.getTetherableBluetoothRegexs()).thenReturn(new String[]{}); + when(mConnectivityManager.getTetherableBluetoothRegexs()).thenReturn(new String[0]); final List niks = TetherSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext); diff --git a/tests/robotests/src/com/android/settings/UtilsTest.java b/tests/robotests/src/com/android/settings/UtilsTest.java index 77cbae2b2bc..c10e0d64df9 100644 --- a/tests/robotests/src/com/android/settings/UtilsTest.java +++ b/tests/robotests/src/com/android/settings/UtilsTest.java @@ -19,8 +19,8 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -48,20 +48,19 @@ import android.util.IconDrawableFactory; import android.widget.EditText; import android.widget.TextView; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.net.InetAddress; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class UtilsTest { private static final String PACKAGE_NAME = "com.android.app"; diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java index 02092670b6c..db14ccacdc3 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java @@ -38,7 +38,7 @@ import android.content.IntentFilter; import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; +import com.android.settings.bluetooth.Utils; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import com.android.settings.testutils.shadow.ShadowBluetoothUtils; import com.android.settingslib.bluetooth.CachedBluetoothDevice; @@ -47,6 +47,7 @@ import com.android.settingslib.bluetooth.HearingAidProfile; import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.bluetooth.LocalBluetoothProfileManager; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -54,13 +55,14 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import org.robolectric.shadow.api.Shadow; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowBluetoothAdapter.class, ShadowBluetoothUtils.class}) public class AccessibilityHearingAidPreferenceControllerTest { private static final String TEST_DEVICE_ADDRESS = "00:A1:A1:A1:A1:A1"; @@ -100,6 +102,11 @@ public class AccessibilityHearingAidPreferenceControllerTest { mHearingAidPreference.setSummary(""); } + @After + public void tearDown() { + ShadowBluetoothUtils.reset(); + } + @Test public void onHearingAidStateChanged_connected_updateHearingAidSummary() { when(mHearingAidProfile.getConnectedDevices()).thenReturn(generateHearingAidDeviceList()); @@ -175,7 +182,7 @@ public class AccessibilityHearingAidPreferenceControllerTest { private void setupBluetoothEnvironment() { ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBluetoothManager; - mLocalBluetoothManager = ShadowBluetoothUtils.getLocalBtManager(mContext); + mLocalBluetoothManager = Utils.getLocalBtManager(mContext); mBluetoothManager = new BluetoothManager(mContext); mBluetoothAdapter = mBluetoothManager.getAdapter(); when(mLocalBluetoothManager.getCachedDeviceManager()).thenReturn(mCachedDeviceManager); @@ -197,8 +204,7 @@ public class AccessibilityHearingAidPreferenceControllerTest { private void sendIntent(Intent intent) { ArgumentCaptor broadcastReceiverCaptor = ArgumentCaptor.forClass(BroadcastReceiver.class); - verify(mContext).registerReceiver( - broadcastReceiverCaptor.capture(), (IntentFilter) any()); + verify(mContext).registerReceiver(broadcastReceiverCaptor.capture(), any()); BroadcastReceiver br = broadcastReceiverCaptor.getValue(); br.onReceive(mContext, intent); } diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java index 00980ade201..96d5bf5ebb7 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java @@ -29,19 +29,18 @@ import android.provider.Settings; import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.XmlTestUtils; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AccessibilitySettingsTest { private static final String VIBRATION_PREFERENCE_SCREEN = "vibration_preference_screen"; private static final String ACCESSIBILITY_CONTENT_TIMEOUT_PREFERENCE = @@ -66,20 +65,19 @@ public class AccessibilitySettingsTest { public void testNonIndexableKeys_existInXmlLayout() { final List niks = AccessibilitySettings.SEARCH_INDEX_DATA_PROVIDER .getNonIndexableKeys(mContext); - final List keys = new ArrayList<>(); - - keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(mContext, R.xml.accessibility_settings)); + final List keys = + XmlTestUtils.getKeysFromPreferenceXml(mContext, R.xml.accessibility_settings); assertThat(keys).containsAllIn(niks); } @Test public void testUpdateVibrationSummary_shouldUpdateSummary() { - final Preference mVibrationPreferenceScreen = new Preference(mContext); - doReturn(mVibrationPreferenceScreen).when(mSettings).findPreference( + final Preference vibrationPreferenceScreen = new Preference(mContext); + doReturn(vibrationPreferenceScreen).when(mSettings).findPreference( VIBRATION_PREFERENCE_SCREEN); - mVibrationPreferenceScreen.setKey(VIBRATION_PREFERENCE_SCREEN); + vibrationPreferenceScreen.setKey(VIBRATION_PREFERENCE_SCREEN); Settings.System.putInt(mContext.getContentResolver(), Settings.System.NOTIFICATION_VIBRATION_INTENSITY, @@ -89,8 +87,8 @@ public class AccessibilitySettingsTest { Settings.System.HAPTIC_FEEDBACK_INTENSITY, Vibrator.VIBRATION_INTENSITY_OFF); - mSettings.updateVibrationSummary(mVibrationPreferenceScreen); - assertThat(mVibrationPreferenceScreen.getSummary()).isEqualTo( + mSettings.updateVibrationSummary(vibrationPreferenceScreen); + assertThat(vibrationPreferenceScreen.getSummary()).isEqualTo( VibrationIntensityPreferenceController.getIntensityString(mContext, Vibrator.VIBRATION_INTENSITY_OFF)); } diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java index b00d64d8eb5..471f107f533 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java @@ -30,12 +30,12 @@ import android.content.pm.ServiceInfo; import android.provider.Settings; import android.view.accessibility.AccessibilityManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.accessibility.AccessibilityUtils; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowAccessibilityManager; @@ -45,7 +45,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AccessibilitySlicePreferenceControllerTest { private final String PACKAGE_NAME = "com.android.settings.fake"; diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityTimeoutControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityTimeoutControllerTest.java index 632eea77aa7..531282b44f3 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityTimeoutControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityTimeoutControllerTest.java @@ -31,7 +31,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.RadioButtonPreference; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -40,9 +39,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AccessibilityTimeoutControllerTest implements AccessibilityTimeoutController.OnChangeListener { private static final String PREF_KEY = "accessibility_content_timeout_30secs"; @@ -91,7 +91,7 @@ public class AccessibilityTimeoutControllerTest mController.updateState(mMockPref); - // the first checked state is seted to false by control + // the first checked state is set to false by control verify(mMockPref).setChecked(false); verify(mMockPref).setChecked(false); } @@ -103,7 +103,7 @@ public class AccessibilityTimeoutControllerTest mController.updateState(mMockPref); - // the first checked state is seted to false by control + // the first checked state is set to false by control verify(mMockPref).setChecked(false); verify(mMockPref).setChecked(true); } diff --git a/tests/robotests/src/com/android/settings/accessibility/ColorInversionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/ColorInversionPreferenceControllerTest.java index 2648a50b79b..6b46652e30f 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ColorInversionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/ColorInversionPreferenceControllerTest.java @@ -27,15 +27,15 @@ import android.provider.Settings; import androidx.preference.SwitchPreference; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ColorInversionPreferenceControllerTest { private static final int UNKNOWN = -1; private Context mContext; diff --git a/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java index 96b03236245..a454831ad25 100644 --- a/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java @@ -23,16 +23,16 @@ import android.content.Context; import androidx.lifecycle.LifecycleOwner; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class HapticFeedbackIntensityPreferenceControllerTest { private LifecycleOwner mLifecycleOwner; diff --git a/tests/robotests/src/com/android/settings/accessibility/MagnificationGesturesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/MagnificationGesturesPreferenceControllerTest.java index a143d2577a9..c6bf343a2c6 100644 --- a/tests/robotests/src/com/android/settings/accessibility/MagnificationGesturesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/MagnificationGesturesPreferenceControllerTest.java @@ -28,15 +28,15 @@ import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class MagnificationGesturesPreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/accessibility/MagnificationNavbarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/MagnificationNavbarPreferenceControllerTest.java index 89a7884a11e..08b53b20fa5 100644 --- a/tests/robotests/src/com/android/settings/accessibility/MagnificationNavbarPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/MagnificationNavbarPreferenceControllerTest.java @@ -31,20 +31,20 @@ import android.provider.Settings; import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import org.robolectric.annotation.Resetter; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class MagnificationNavbarPreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java index 3a7fd56b9c7..41accfb4d99 100644 --- a/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java @@ -34,7 +34,6 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -42,9 +41,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NotificationVibrationIntensityPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java index 26b3a6c8e2c..3ae0e75d137 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java @@ -27,7 +27,6 @@ import android.content.Context; import android.os.UserManager; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -35,9 +34,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ShortcutServicePickerFragmentTest { private static final String TEST_SERVICE_KEY_1 = "abc/123"; @@ -56,7 +56,7 @@ public class ShortcutServicePickerFragmentTest { when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager); mFragment = spy(new ShortcutServicePickerFragment()); - mFragment.onAttach((Context) mActivity); + mFragment.onAttach(mActivity); doReturn(RuntimeEnvironment.application).when(mFragment).getContext(); } diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java index bfc176f7682..c9ca772ce46 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java @@ -29,17 +29,14 @@ import androidx.annotation.XmlRes; import androidx.fragment.app.FragmentActivity; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settings.widget.SwitchBar; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.Config; +import org.robolectric.RobolectricTestRunner; import org.robolectric.shadows.androidx.fragment.FragmentController; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = SettingsShadowResources.SettingsShadowTheme.class) +@RunWith(RobolectricTestRunner.class) public class ToggleFeaturePreferenceFragmentTest { private ToggleFeaturePreferenceFragmentTestable mFragment; diff --git a/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java index a44b62ba0b4..68d5e362f5e 100644 --- a/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java @@ -37,7 +37,6 @@ import com.android.settings.R; import com.android.settings.accessibility.VibrationPreferenceFragment .VibrationIntensityCandidateInfo; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.widget.CandidateInfo; import org.junit.Before; @@ -45,13 +44,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.HashMap; import java.util.List; import java.util.Map; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class VibrationPreferenceFragmentTest { private static final Map INTENSITY_TO_KEY = new HashMap<>(4); diff --git a/tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java index 41ac4500b73..006087516cf 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java @@ -19,17 +19,17 @@ import static com.google.common.truth.Truth.assertThat; import android.provider.SearchIndexableResource; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.drawer.CategoryKey; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AccountDashboardFragmentTest { private AccountDashboardFragment mFragment; @@ -53,6 +53,4 @@ public class AccountDashboardFragmentTest { assertThat(indexRes).isNotNull(); assertThat(indexRes.get(0).xmlResId).isEqualTo(mFragment.getPreferenceScreenResId()); } - - } diff --git a/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java index f18496c03b5..0be51c31d29 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java @@ -20,8 +20,8 @@ import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_TITL import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -29,13 +29,11 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.accounts.Account; -import android.accounts.AccountManager; import android.content.Context; import android.content.Intent; import android.content.pm.ActivityInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; -import android.content.pm.UserInfo; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; @@ -45,7 +43,6 @@ import androidx.preference.Preference; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.dashboard.DashboardFeatureProviderImpl; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowAccountManager; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settingslib.drawer.CategoryKey; @@ -56,13 +53,14 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadow.api.Shadow; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowAccountManager.class, ShadowUserManager.class}) public class AccountDetailDashboardFragmentTest { @@ -164,13 +162,11 @@ public class AccountDetailDashboardFragmentTest { @Test public void onResume_accountMissing_shouldFinish() { - ShadowUserManager userManager = Shadow.extract( - mContext.getSystemService(UserManager.class)); - ShadowAccountManager accountManager = Shadow.extract( - mContext.getSystemService(AccountManager.class)); + ShadowUserManager userManager = + Shadow.extract(mContext.getSystemService(UserManager.class)); userManager.addUserProfile(new UserHandle(1)); - accountManager.addAccountForUser(1, new Account("test@test.com", "com.test")); + ShadowAccountManager.addAccountForUser(1, new Account("test@test.com", "com.test")); mFragment.finishIfAccountMissing(); verify(mFragment).finish(); @@ -178,13 +174,11 @@ public class AccountDetailDashboardFragmentTest { @Test public void onResume_accountPresentOneProfile_shouldNotFinish() { - ShadowUserManager userManager = Shadow.extract( - mContext.getSystemService(UserManager.class)); - ShadowAccountManager accountManager = Shadow.extract( - mContext.getSystemService(AccountManager.class)); + ShadowUserManager userManager = + Shadow.extract(mContext.getSystemService(UserManager.class)); userManager.addUserProfile(new UserHandle(1)); - accountManager.addAccountForUser(1, mFragment.mAccount); + ShadowAccountManager.addAccountForUser(1, mFragment.mAccount); mFragment.finishIfAccountMissing(); verify(mFragment, never()).finish(); @@ -192,15 +186,13 @@ public class AccountDetailDashboardFragmentTest { @Test public void onResume_accountPresentTwoProfiles_shouldNotFinish() { - ShadowUserManager userManager = Shadow.extract( - mContext.getSystemService(UserManager.class)); - ShadowAccountManager accountManager = Shadow.extract( - mContext.getSystemService(AccountManager.class)); + ShadowUserManager userManager = + Shadow.extract(mContext.getSystemService(UserManager.class)); userManager.addUserProfile(new UserHandle(1)); userManager.addUserProfile(new UserHandle(2)); - accountManager.addAccountForUser(1, new Account("test@test.com", "com.test")); - accountManager.addAccountForUser(2, mFragment.mAccount); + ShadowAccountManager.addAccountForUser(1, new Account("test@test.com", "com.test")); + ShadowAccountManager.addAccountForUser(2, mFragment.mAccount); mFragment.finishIfAccountMissing(); verify(mFragment, never()).finish(); diff --git a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java index aeb5f547696..50814ee7c40 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java @@ -20,7 +20,7 @@ import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.when; @@ -36,7 +36,6 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.accounts.AuthenticatorHelper; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.widget.LayoutPreference; @@ -46,12 +45,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = AccountHeaderPreferenceControllerTest.ShadowAuthenticatorHelper.class) public class AccountHeaderPreferenceControllerTest { @@ -113,7 +113,7 @@ public class AccountHeaderPreferenceControllerTest { @Implements(AuthenticatorHelper.class) public static class ShadowAuthenticatorHelper { @Implementation - public void onAccountsUpdated(Account[] accounts) { + protected void onAccountsUpdated(Account[] accounts) { } } diff --git a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java index 5ab0982de1c..ed992d2de0d 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java @@ -18,10 +18,10 @@ package com.android.settings.accounts; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Answers.RETURNS_DEEP_STUBS; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.argThat; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.reset; @@ -34,8 +34,6 @@ import android.accounts.AccountManager; import android.accounts.AuthenticatorDescription; import android.content.Context; import android.content.pm.UserInfo; -import android.graphics.drawable.ColorDrawable; -import android.graphics.drawable.Drawable; import android.os.UserHandle; import android.os.UserManager; import android.text.TextUtils; @@ -49,27 +47,25 @@ import com.android.settings.AccessiblePreferenceCategory; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.search.SearchIndexableRaw; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowAccountManager; import com.android.settings.testutils.shadow.ShadowContentResolver; -import com.android.settingslib.accounts.AuthenticatorHelper; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentMatcher; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class}) public class AccountPreferenceControllerTest { @@ -103,6 +99,11 @@ public class AccountPreferenceControllerTest { mController = new AccountPreferenceController(mContext, mFragment, null, mAccountHelper); } + @After + public void tearDown() { + ShadowContentResolver.reset(); + } + @Test public void onResume_managedProfile_shouldNotAddAccountCategory() { when(mUserManager.isManagedProfile()).thenReturn(true); @@ -216,7 +217,6 @@ public class AccountPreferenceControllerTest { verify(preferenceGroup).setTitle( mContext.getString(R.string.account_for_section_header, "user 1")); - } @Test @@ -338,9 +338,10 @@ public class AccountPreferenceControllerTest { Account[] accounts = {new Account("Account1", "com.acct1")}; when(mAccountManager.getAccountsAsUser(anyInt())).thenReturn(accounts); - Account[] accountType1 = new Account[2]; - accountType1[0] = new Account("Account11", "com.acct1"); - accountType1[1] = new Account("Account12", "com.acct1"); + Account[] accountType1 = { + new Account("Account11", "com.acct1"), + new Account("Account12", "com.acct1") + }; when(mAccountManager.getAccountsByTypeAsUser(eq("com.acct1"), any(UserHandle.class))) .thenReturn(accountType1); @@ -362,8 +363,7 @@ public class AccountPreferenceControllerTest { } @Test - @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class, - ShadowAuthenticatorHelper.class}) + @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class}) public void onResume_twoAccountsOfSameName_shouldAddFivePreferences() { final List infos = new ArrayList<>(); infos.add(new UserInfo(1, "user 1", 0)); @@ -532,9 +532,10 @@ public class AccountPreferenceControllerTest { Account[] accounts = {new Account("Acct1", "com.acct1")}; when(mAccountManager.getAccountsAsUser(anyInt())).thenReturn(accounts); - Account[] accountType1 = new Account[2]; - accountType1[0] = new Account("Acct11", "com.acct1"); - accountType1[1] = new Account("Acct12", "com.acct1"); + Account[] accountType1 = { + new Account("Acct11", "com.acct1"), + new Account("Acct12", "com.acct1") + }; when(mAccountManager.getAccountsByTypeAsUser(eq("com.acct1"), any(UserHandle.class))) .thenReturn(accountType1); @@ -552,8 +553,7 @@ public class AccountPreferenceControllerTest { mController.onResume(); // remove an account - accountType1 = new Account[1]; - accountType1[0] = new Account("Acct11", "com.acct1"); + accountType1 = new Account[] {new Account("Acct11", "com.acct1")}; when(mAccountManager.getAccountsByTypeAsUser(eq("com.acct1"), any(UserHandle.class))) .thenReturn(accountType1); @@ -606,12 +606,4 @@ public class AccountPreferenceControllerTest { private static ArgumentMatcher titleMatches(String expected) { return preference -> TextUtils.equals(expected, preference.getTitle()); } - - @Implements(AuthenticatorHelper.class) - public static class ShadowAuthenticatorHelper { - @Implementation - public Drawable getDrawableForType(Context context, final String accountType) { - return new ColorDrawable(); - } - } } diff --git a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceTest.java b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceTest.java index c699ef8c284..731911450db 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceTest.java @@ -22,16 +22,16 @@ import static org.mockito.Mockito.verify; import android.accounts.Account; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AccountPreferenceTest { private AccountPreference mPreference; diff --git a/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java index 0681c82ee71..1084102c2c4 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.accounts; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Answers.RETURNS_DEEP_STUBS; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.when; import android.accounts.Account; @@ -34,7 +34,6 @@ import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.SettingsActivity; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowAccountManager; import com.android.settings.testutils.shadow.ShadowContentResolver; @@ -45,10 +44,11 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class}) public class AccountSyncPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/accounts/AccountSyncSettingsTest.java b/tests/robotests/src/com/android/settings/accounts/AccountSyncSettingsTest.java index 7171a6b20b3..dd1778f95fc 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountSyncSettingsTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountSyncSettingsTest.java @@ -25,17 +25,17 @@ import android.os.UserHandle; import androidx.fragment.app.FragmentActivity; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowContentResolver; import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowContentResolver.class}) public class AccountSyncSettingsTest { diff --git a/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java b/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java index c944c30344f..405f6b3dbb8 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java @@ -17,7 +17,7 @@ package com.android.settings.accounts; import static org.mockito.Answers.RETURNS_DEEP_STUBS; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -36,21 +36,22 @@ import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowAccountManager; import com.android.settings.testutils.shadow.ShadowContentResolver; import com.android.settingslib.accounts.AuthenticatorHelper; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AccountTypePreferenceLoaderTest { @Mock(answer = RETURNS_DEEP_STUBS) @@ -81,6 +82,11 @@ public class AccountTypePreferenceLoaderTest { UserHandle.CURRENT)); } + @After + public void tearDown() { + ShadowContentResolver.reset(); + } + @Test @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class}) public void updatePreferenceIntents_shouldRunRecursively() { diff --git a/tests/robotests/src/com/android/settings/accounts/AvatarViewMixinTest.java b/tests/robotests/src/com/android/settings/accounts/AvatarViewMixinTest.java index f08306dc7d4..7b4fb6f0c6d 100644 --- a/tests/robotests/src/com/android/settings/accounts/AvatarViewMixinTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AvatarViewMixinTest.java @@ -19,7 +19,7 @@ package com.android.settings.accounts; import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -41,13 +41,13 @@ import android.widget.ImageView; import com.android.settings.homepage.SettingsHomepageActivity; import com.android.settings.homepage.contextualcards.slices.BatteryFixSliceTest; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.android.controller.ActivityController; import org.robolectric.annotation.Config; @@ -57,7 +57,7 @@ import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowContentResolver; import org.robolectric.shadows.ShadowPackageManager; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AvatarViewMixinTest { private static final String DUMMY_ACCOUNT = "test@domain.com"; private static final String DUMMY_DOMAIN = "domain.com"; @@ -171,9 +171,8 @@ public class AvatarViewMixinTest { public static class ShadowAccountFeatureProviderImpl { @Implementation - public Account[] getAccounts(Context context) { - Account[] accounts = {new Account(DUMMY_ACCOUNT, DUMMY_DOMAIN)}; - return accounts; + protected Account[] getAccounts(Context context) { + return new Account[] {new Account(DUMMY_ACCOUNT, DUMMY_DOMAIN)}; } } } diff --git a/tests/robotests/src/com/android/settings/accounts/ChooseAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/ChooseAccountPreferenceControllerTest.java index 241765e8ecb..49c0fd2c32b 100644 --- a/tests/robotests/src/com/android/settings/accounts/ChooseAccountPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/ChooseAccountPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.accounts; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -38,7 +38,6 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowAccountManager; import com.android.settings.testutils.shadow.ShadowContentResolver; import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal; @@ -49,10 +48,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class, ShadowRestrictedLockUtilsInternal.class}) public class ChooseAccountPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/accounts/ContactSearchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/ContactSearchPreferenceControllerTest.java index 21b93026cb5..c8606e134a5 100644 --- a/tests/robotests/src/com/android/settings/accounts/ContactSearchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/ContactSearchPreferenceControllerTest.java @@ -27,7 +27,6 @@ import android.content.Context; import android.os.UserHandle; import android.provider.Settings; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedSwitchPreference; import org.junit.Before; @@ -35,9 +34,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ContactSearchPreferenceControllerTest { private static final String PREF_KEY = "contacts_search"; diff --git a/tests/robotests/src/com/android/settings/accounts/CrossProfileCalendarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/CrossProfileCalendarPreferenceControllerTest.java index 4469282a366..bf4dec6f02f 100644 --- a/tests/robotests/src/com/android/settings/accounts/CrossProfileCalendarPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/CrossProfileCalendarPreferenceControllerTest.java @@ -32,10 +32,7 @@ import android.content.ComponentName; import android.content.Context; import android.os.UserHandle; import android.provider.Settings; -import android.util.ArraySet; -import android.util.Log; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedSwitchPreference; import org.junit.Before; @@ -43,15 +40,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; -import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowDevicePolicyManager; -import java.util.Collections; -import java.util.Set; - -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class CrossProfileCalendarPreferenceControllerTest { private static final String PREF_KEY = "cross_profile_calendar"; diff --git a/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java index 9e476bd789b..5901f55edb0 100644 --- a/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java @@ -18,8 +18,8 @@ package com.android.settings.accounts; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Answers.RETURNS_DEEP_STUBS; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -37,24 +37,24 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.search.SearchIndexableRaw; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowAccountManager; import com.android.settings.testutils.shadow.ShadowContentResolver; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; -import org.robolectric.RuntimeEnvironment; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EmergencyInfoPreferenceControllerTest { @Mock(answer = RETURNS_DEEP_STUBS) @@ -76,6 +76,11 @@ public class EmergencyInfoPreferenceControllerTest { when(mScreen.findPreference(mPreference.getKey())).thenReturn(mPreference); } + @After + public void tearDown() { + ShadowContentResolver.reset(); + } + @Test public void updateRawDataToIndex_prefUnavailable_shouldNotUpdate() { final List data = new ArrayList<>(); diff --git a/tests/robotests/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceControllerTest.java index 6b806259047..b9c62c2ed7b 100644 --- a/tests/robotests/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceControllerTest.java @@ -27,16 +27,16 @@ import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.widget.FooterPreferenceMixinCompat; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EnterpriseDisclosurePreferenceControllerTest { private static final String TEST_DISCLOSURE = "This is a test disclosure."; @@ -48,7 +48,6 @@ public class EnterpriseDisclosurePreferenceControllerTest { private PreferenceManager mPreferenceManager; private PreferenceScreen mPreferenceScreen; - @Before public void setUp() { MockitoAnnotations.initMocks(this); diff --git a/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java b/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java index 0803d78d0f2..6ed266f7604 100644 --- a/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java @@ -22,15 +22,14 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ProviderPreferenceTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java index 83ea2184910..cf4cb7cf34b 100644 --- a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java @@ -18,10 +18,10 @@ package com.android.settings.accounts; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Answers.RETURNS_DEEP_STUBS; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -51,19 +51,20 @@ import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowAccountManager; import com.android.settings.testutils.shadow.ShadowContentResolver; import com.android.settings.testutils.shadow.ShadowDevicePolicyManager; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settingslib.widget.LayoutPreference; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; @@ -72,7 +73,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = { ShadowUserManager.class, ShadowDevicePolicyManager.class @@ -116,6 +117,11 @@ public class RemoveAccountPreferenceControllerTest { mFragment); } + @After + public void tearDown() { + ShadowContentResolver.reset(); + } + @Test public void displayPreference_shouldAddClickListener() { when(mScreen.findPreference(KEY_REMOVE_ACCOUNT)).thenReturn(mPreference); diff --git a/tests/robotests/src/com/android/settings/accounts/RemoveUserFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/RemoveUserFragmentTest.java index 86cedb9ed5e..4537eb92452 100644 --- a/tests/robotests/src/com/android/settings/accounts/RemoveUserFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accounts/RemoveUserFragmentTest.java @@ -18,14 +18,13 @@ package com.android.settings.accounts; import static com.google.common.truth.Truth.assertThat; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; import java.lang.reflect.Modifier; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RemoveUserFragmentTest { @Test diff --git a/tests/robotests/src/com/android/settings/accounts/SyncStateSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/accounts/SyncStateSwitchPreferenceTest.java index 0d454181f7e..9c7b346d36c 100644 --- a/tests/robotests/src/com/android/settings/accounts/SyncStateSwitchPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/accounts/SyncStateSwitchPreferenceTest.java @@ -22,14 +22,13 @@ import android.accounts.Account; import android.content.Context; import android.os.UserHandle; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SyncStateSwitchPreferenceTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceControllerTest.java index 79e292dcf94..ced3db18ae6 100644 --- a/tests/robotests/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceControllerTest.java @@ -28,20 +28,20 @@ import android.os.UserHandle; import android.text.TextUtils; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.accounts.AuthenticatorHelper; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import org.robolectric.annotation.Resetter; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {TopLevelAccountEntryPreferenceControllerTest.ShadowAuthenticationHelper.class}) public class TopLevelAccountEntryPreferenceControllerTest { @@ -91,7 +91,7 @@ public class TopLevelAccountEntryPreferenceControllerTest { static final String[] LABELS = {"LABEL1", "LABEL2", "LABEL3", "LABEL4"}; private static String[] sEnabledAccount = TYPES; - public void __constructor__(Context context, UserHandle userHandle, + protected void __constructor__(Context context, UserHandle userHandle, AuthenticatorHelper.OnAccountsUpdateListener listener) { } @@ -105,12 +105,12 @@ public class TopLevelAccountEntryPreferenceControllerTest { } @Implementation - public String[] getEnabledAccountTypes() { + protected String[] getEnabledAccountTypes() { return sEnabledAccount; } @Implementation - public CharSequence getLabelForType(Context context, final String accountType) { + protected CharSequence getLabelForType(Context context, final String accountType) { if (TextUtils.equals(accountType, TYPES[0])) { return LABELS[0]; } else if (TextUtils.equals(accountType, TYPES[1])) { diff --git a/tests/robotests/src/com/android/settings/accounts/WorkModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/WorkModePreferenceControllerTest.java index 1223d5590c0..4871cced349 100644 --- a/tests/robotests/src/com/android/settings/accounts/WorkModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/WorkModePreferenceControllerTest.java @@ -30,16 +30,16 @@ import android.os.UserManager; import androidx.preference.SwitchPreference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WorkModePreferenceControllerTest { private static final String PREF_KEY = "work_mode"; diff --git a/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java b/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java index 3031f5b1a0f..1f63c9c4e48 100644 --- a/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java @@ -18,7 +18,7 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -38,7 +38,6 @@ import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowEntityHeaderController; import com.android.settings.widget.EntityHeaderController; import com.android.settingslib.applications.AppUtils; @@ -53,11 +52,12 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowEntityHeaderController.class) public class AppInfoWithHeaderTest { diff --git a/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java index e828a628bb9..4343e16143e 100644 --- a/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java @@ -18,9 +18,9 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -35,19 +35,18 @@ import android.content.pm.PermissionInfo; import androidx.preference.Preference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppPermissionsPreferenceControllerTest { private static final String PERM_LOCATION = "android.permission-group.LOCATION"; diff --git a/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java b/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java index a4eeacd26bc..3f4175e1c22 100644 --- a/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java @@ -16,8 +16,8 @@ package com.android.settings.applications; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.when; import android.Manifest; @@ -27,7 +27,6 @@ import android.content.pm.IPackageManager; import android.os.RemoteException; import android.os.UserManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.ApplicationsState.AppEntry; import org.junit.Before; @@ -35,8 +34,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public final class AppStateAppOpsBridgeTest { @Mock private Context mContext; @@ -61,7 +61,7 @@ public final class AppStateAppOpsBridgeTest { } private class TestAppStateAppOpsBridge extends AppStateAppOpsBridge { - public TestAppStateAppOpsBridge() { + private TestAppStateAppOpsBridge() { super(mContext, null, null, AppOpsManager.OP_SYSTEM_ALERT_WINDOW, new String[] {Manifest.permission.SYSTEM_ALERT_WINDOW}, mPackageManagerService); diff --git a/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java b/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java index fee7a8b65e1..304dfe9735b 100644 --- a/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java @@ -20,12 +20,11 @@ import static com.google.common.truth.Truth.assertThat; import android.app.AppOpsManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppStateInstallAppsBridgeTest { @Test diff --git a/tests/robotests/src/com/android/settings/applications/AppStateNotificationBridgeTest.java b/tests/robotests/src/com/android/settings/applications/AppStateNotificationBridgeTest.java index cb504861a74..10f3706c7d0 100644 --- a/tests/robotests/src/com/android/settings/applications/AppStateNotificationBridgeTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppStateNotificationBridgeTest.java @@ -31,9 +31,8 @@ import static com.android.settings.applications.AppStateNotificationBridge import static com.google.common.truth.Truth.assertThat; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertTrue; - +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyLong; @@ -59,7 +58,6 @@ import android.widget.Switch; import com.android.settings.R; import com.android.settings.applications.AppStateNotificationBridge.NotificationsSentState; import com.android.settings.notification.NotificationBackend; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.applications.ApplicationsState.AppEntry; @@ -68,13 +66,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; import java.util.Map; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppStateNotificationBridgeTest { private static String PKG1 = "pkg1"; @@ -151,7 +150,7 @@ public class AppStateNotificationBridgeTest { .thenReturn(usageEvents); Map map = mBridge.getAggregatedUsageEvents(); - assertThat(map.get(mBridge.getKey(0, PKG1)).sentCount).isEqualTo(1); + assertThat(map.get(AppStateNotificationBridge.getKey(0, PKG1)).sentCount).isEqualTo(1); } @Test @@ -173,8 +172,8 @@ public class AppStateNotificationBridgeTest { .thenReturn(usageEvents); Map map = mBridge.getAggregatedUsageEvents(); - assertThat(map.get(mBridge.getKey(0, PKG1)).sentCount).isEqualTo(2); - assertThat(map.get(mBridge.getKey(0, PKG1)).lastSent).isEqualTo(6); + assertThat(map.get(AppStateNotificationBridge.getKey(0, PKG1)).sentCount).isEqualTo(2); + assertThat(map.get(AppStateNotificationBridge.getKey(0, PKG1)).lastSent).isEqualTo(6); } @Test @@ -197,10 +196,10 @@ public class AppStateNotificationBridgeTest { Map map = mBridge.getAggregatedUsageEvents(); - assertThat(map.get(mBridge.getKey(0, PKG1)).sentCount).isEqualTo(1); - assertThat(map.get(mBridge.getKey(0, PKG2)).sentCount).isEqualTo(1); - assertThat(map.get(mBridge.getKey(0, PKG1)).lastSent).isEqualTo(6); - assertThat(map.get(mBridge.getKey(0, PKG2)).lastSent).isEqualTo(1); + assertThat(map.get(AppStateNotificationBridge.getKey(0, PKG1)).sentCount).isEqualTo(1); + assertThat(map.get(AppStateNotificationBridge.getKey(0, PKG2)).sentCount).isEqualTo(1); + assertThat(map.get(AppStateNotificationBridge.getKey(0, PKG1)).lastSent).isEqualTo(6); + assertThat(map.get(AppStateNotificationBridge.getKey(0, PKG2)).lastSent).isEqualTo(1); } @Test @@ -419,6 +418,7 @@ public class AppStateNotificationBridgeTest { AppEntry allow = mock(AppEntry.class); allow.extraInfo = allowState; + assertTrue(FILTER_APP_NOTIFICATION_RECENCY.filterApp(allow)); NotificationsSentState denyState = new NotificationsSentState(); @@ -557,7 +557,7 @@ public class AppStateNotificationBridgeTest { @Test public void testSwitchViews_nullDoesNotCrash() { - mBridge.enableSwitch(null); - mBridge.checkSwitch(null); + AppStateNotificationBridge.enableSwitch(null); + AppStateNotificationBridge.checkSwitch(null); } } diff --git a/tests/robotests/src/com/android/settings/applications/AppStorageSettingsTest.java b/tests/robotests/src/com/android/settings/applications/AppStorageSettingsTest.java index 114000ce508..35177024b38 100644 --- a/tests/robotests/src/com/android/settings/applications/AppStorageSettingsTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppStorageSettingsTest.java @@ -18,8 +18,8 @@ package com.android.settings.applications; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -31,7 +31,6 @@ import android.content.Context; import android.view.View; import android.widget.Button; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.StorageStatsSource.AppStorageStats; import com.android.settingslib.widget.ActionButtonsPreference; @@ -40,9 +39,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppStorageSettingsTest { @Mock diff --git a/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java index 04a1237150a..49d4aac9780 100644 --- a/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java @@ -10,16 +10,16 @@ import android.content.Context; import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.StorageStatsSource.AppStorageStats; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppStorageSizesControllerTest { private static final String COMPUTING = "Computing…"; diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java index 43f855ddf0e..4e08f9841df 100644 --- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java @@ -20,9 +20,9 @@ import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; @@ -39,18 +39,18 @@ import android.os.RemoteException; import android.os.UserHandle; import android.os.UserManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - +import java.util.Collections; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.shadows.ShadowApplication; import java.util.Arrays; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public final class AppWithAdminGrantedPermissionsCounterTest { private final String APP_1 = "app1"; @@ -221,7 +221,7 @@ public final class AppWithAdminGrantedPermissionsCounterTest { // granted both permissions by the admin. It should be counted. when(mPackageManager.getInstalledApplicationsAsUser(PackageManager.GET_DISABLED_COMPONENTS | PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS, - MANAGED_PROFILE_ID)).thenReturn(Arrays.asList(mApp6)); + MANAGED_PROFILE_ID)).thenReturn(Collections.singletonList(mApp6)); // app3 and app5 were installed by enterprise policy. final UserHandle mainUser = new UserHandle(MAIN_USER_ID); @@ -239,7 +239,6 @@ public final class AppWithAdminGrantedPermissionsCounterTest { final UserHandle managedProfileUser = new UserHandle(MANAGED_PROFILE_ID); when(mPackageManager.getInstallReason(APP_6, managedProfileUser)) .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN); - } private void configureUserManager() { diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java index 96836ae90a2..a8186373d38 100644 --- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java @@ -20,9 +20,9 @@ import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; @@ -36,20 +36,19 @@ import android.os.Build; import android.os.UserHandle; import android.os.UserManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.shadows.ShadowApplication; import java.util.Arrays; import java.util.Collections; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public final class AppWithAdminGrantedPermissionsListerTest { private final String APP_1 = "app1"; diff --git a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java index 128f34547a4..9cfdf983c10 100644 --- a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java @@ -36,7 +36,6 @@ import android.os.UserManager; import com.android.settings.R; import com.android.settings.testutils.ApplicationTestUtils; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.testutils.shadow.ShadowDefaultDialerManager; import com.android.settingslib.testutils.shadow.ShadowSmsApplication; @@ -45,6 +44,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; @@ -58,7 +58,7 @@ import java.util.Set; /** * Tests for {@link ApplicationFeatureProviderImpl}. */ -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public final class ApplicationFeatureProviderImplTest { private final int MAIN_USER_ID = 0; @@ -109,8 +109,7 @@ public final class ApplicationFeatureProviderImplTest { .thenReturn(PackageManager.INSTALL_REASON_POLICY); mAppCount = -1; - mProvider.calculateNumberOfPolicyInstalledApps(async, - (num) -> mAppCount = num); + mProvider.calculateNumberOfPolicyInstalledApps(async, (num) -> mAppCount = num); if (async) { ShadowApplication.runBackgroundTasks(); } diff --git a/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java b/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java index 8098e5c10a2..1ab086ccf8b 100644 --- a/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java +++ b/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java @@ -18,9 +18,9 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -38,19 +38,19 @@ import com.android.settings.applications.defaultapps.DefaultBrowserPreferenceCon import com.android.settings.applications.defaultapps.DefaultPhonePreferenceController; import com.android.settings.applications.defaultapps.DefaultSmsPreferenceController; import com.android.settings.dashboard.SummaryLoader; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.XmlTestUtils; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DefaultAppSettingsTest { private Context mContext; @@ -146,7 +146,6 @@ public class DefaultAppSettingsTest { summaryProvider.setListening(true); verify(summaryLoader, never()).setSummary(summaryProvider, eq(anyString())); - } @Test diff --git a/tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java b/tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java index 9ab1b5edecd..558334da958 100644 --- a/tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java +++ b/tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java @@ -16,18 +16,18 @@ package com.android.settings.applications; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertTrue; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EnterpriseDefaultAppsTest { @Test - public void testNumberOfIntentsCorrelateWithUI() throws Exception { + public void testNumberOfIntentsCorrelateWithUI() { final int concatenation_templates[] = new int[]{0 /* no need for single app name */, R.string.app_names_concatenation_template_2, diff --git a/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java b/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java index 3378492d27d..144fe18fe25 100644 --- a/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java +++ b/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java @@ -18,9 +18,9 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -28,7 +28,6 @@ import android.content.Context; import android.content.pm.ApplicationInfo; import android.os.UserHandle; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.StorageStatsSource; import com.android.settingslib.applications.StorageStatsSource.AppStorageStats; @@ -40,8 +39,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import java.io.IOException; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FetchPackageStorageAsyncLoaderTest { private static final String PACKAGE_NAME = "com.test.package"; diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java index a68a00b6cd0..2c1fab8ad80 100644 --- a/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java +++ b/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java @@ -21,9 +21,9 @@ import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.argThat; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; @@ -38,14 +38,13 @@ import android.content.pm.UserInfo; import android.os.UserHandle; import android.os.UserManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentMatcher; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; @@ -53,7 +52,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.Set; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public final class InstalledAppCounterTest { private final String APP_1 = "app1"; @@ -232,7 +231,6 @@ public final class InstalledAppCounterTest { .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN); } - private class InstalledAppCounterTestable extends InstalledAppCounter { private InstalledAppCounterTestable(int installReason) { super(mContext, installReason, mPackageManager); diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java index 3cb5a57a70b..e2aed368f80 100644 --- a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java +++ b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java @@ -20,10 +20,10 @@ import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.argThat; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -36,14 +36,13 @@ import android.content.pm.UserInfo; import android.os.UserHandle; import android.os.UserManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentMatcher; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.shadows.ShadowApplication; import java.util.Arrays; @@ -52,7 +51,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public final class InstalledAppListerTest { private final String APP_1 = "app1"; @@ -189,7 +188,7 @@ public final class InstalledAppListerTest { } private class InstalledAppListerTestable extends InstalledAppLister { - public InstalledAppListerTestable() { + private InstalledAppListerTestable() { super(mPackageManager, mUserManager); } diff --git a/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java index 3d3a05a9384..aab2156de08 100644 --- a/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java @@ -18,11 +18,11 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.argThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -50,7 +50,6 @@ import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.AppUtils; import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.applications.instantapps.InstantAppDataProvider; @@ -62,6 +61,7 @@ import org.mockito.ArgumentCaptor; import org.mockito.ArgumentMatcher; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; @@ -69,7 +69,7 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RecentAppsPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java index 694625ef082..e2035e33c42 100644 --- a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java @@ -31,7 +31,6 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.datausage.AppStateDataUsageBridge; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowApplicationsState; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settingslib.applications.ApplicationsState; @@ -41,12 +40,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.ArrayList; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowUserManager.class, ShadowApplicationsState.class}) public class SpecialAppAccessPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java b/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java index 183468905c5..827abc09afe 100644 --- a/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java @@ -26,16 +26,16 @@ import android.os.Bundle; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.ApplicationsState; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class UsageAccessDetailsTest { private FakeFeatureFactory mFeatureFactory; 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 284ce06c748..154856ebeb9 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java @@ -19,7 +19,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.anyDouble; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -41,7 +41,6 @@ import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; import com.android.settings.SettingsActivity; import com.android.settings.fuelgauge.BatteryUtils; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -49,13 +48,14 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppBatteryPreferenceControllerTest { private static final int TARGET_UID = 111; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java index f8dd11bb726..f3d85d3993a 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java @@ -18,11 +18,11 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyBoolean; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; @@ -49,7 +49,6 @@ import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.AppUtils; import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.applications.instantapps.InstantAppDataProvider; @@ -64,9 +63,10 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.mockito.stubbing.Answer; +import org.robolectric.RobolectricTestRunner; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppButtonsPreferenceControllerTest { private static final String PACKAGE_NAME = "com.android.settings"; @@ -202,7 +202,7 @@ public class AppButtonsPreferenceControllerTest { } @Test - public void isAvailable_nonInstantApp() throws Exception { + public void isAvailable_nonInstantApp() { mController.mAppEntry = mAppEntry; ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider", new InstantAppDataProvider() { @@ -215,7 +215,7 @@ public class AppButtonsPreferenceControllerTest { } @Test - public void isAvailable_instantApp() throws Exception { + public void isAvailable_instantApp() { mController.mAppEntry = mAppEntry; ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider", new InstantAppDataProvider() { @@ -371,7 +371,8 @@ public class AppButtonsPreferenceControllerTest { @Test public void onPackageListChanged_available_shouldRefreshUi() { - doReturn(mController.AVAILABLE).when(mController).getAvailabilityStatus(); + doReturn(AppButtonsPreferenceController.AVAILABLE) + .when(mController).getAvailabilityStatus(); doReturn(true).when(mController).refreshUi(); mController.onPackageListChanged(); @@ -381,7 +382,8 @@ public class AppButtonsPreferenceControllerTest { @Test public void onPackageListChanged_notAvailable_shouldNotRefreshUiAndNoCrash() { - doReturn(mController.DISABLED_FOR_USER).when(mController).getAvailabilityStatus(); + doReturn(AppButtonsPreferenceController.DISABLED_FOR_USER) + .when(mController).getAvailabilityStatus(); mController.onPackageListChanged(); diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java index fe70c7ec81e..191db428e7b 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java @@ -36,7 +36,6 @@ import android.os.Bundle; import com.android.settings.core.BasePreferenceController; import com.android.settings.datausage.AppDataUsage; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.ApplicationsState.AppEntry; import org.junit.Before; @@ -45,12 +44,13 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import androidx.loader.app.LoaderManager; import androidx.preference.Preference; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppDataUsagePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java index 67702f1dc42..c82cbe52f87 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java @@ -42,7 +42,6 @@ import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.widget.LayoutPreference; @@ -53,9 +52,10 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppHeaderViewPreferenceControllerTest { @Mock 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 539e75ff21f..9e44c955ed9 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java @@ -48,7 +48,6 @@ import android.view.MenuItem; import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.AppUtils; import com.android.settingslib.applications.ApplicationsState.AppEntry; import com.android.settingslib.applications.instantapps.InstantAppDataProvider; @@ -61,6 +60,7 @@ import org.mockito.Answers; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; @@ -68,7 +68,7 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public final class AppInfoDashboardFragmentTest { private static final String PACKAGE_NAME = "test_package_name"; @@ -239,7 +239,8 @@ public final class AppInfoDashboardFragmentTest { public void onActivityResult_uninstalledUpdates_shouldInvalidateOptionsMenu() { doReturn(true).when(mFragment).refreshUi(); - mFragment.onActivityResult(mFragment.REQUEST_UNINSTALL, 0, mock(Intent.class)); + mFragment + .onActivityResult(AppInfoDashboardFragment.REQUEST_UNINSTALL, 0, mock(Intent.class)); verify(mActivity).invalidateOptionsMenu(); } diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java index e68f8d39955..5e88aafa7f8 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java @@ -36,7 +36,6 @@ import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.core.BasePreferenceController; import com.android.settings.notification.AppNotificationSettings; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.ApplicationsState; import org.junit.Before; @@ -45,9 +44,10 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppInfoPreferenceControllerBaseTest { @Mock diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceControllerTest.java index 30152a40775..1f85477c02e 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceControllerTest.java @@ -40,16 +40,16 @@ import android.os.UserManager; import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppInstallerInfoPreferenceControllerTest { @Mock 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 8fbc27cf3df..b7f84cffa13 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java @@ -34,7 +34,6 @@ import com.android.settings.SettingsActivity; import com.android.settings.applications.ProcStatsData; import com.android.settings.applications.ProcessStatsDetail; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUserManager; import org.junit.Before; @@ -43,11 +42,12 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowUserManager.class}) public class AppMemoryPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java index a3e7ca6af15..60352ae545c 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java @@ -37,7 +37,6 @@ import androidx.preference.PreferenceScreen; import com.android.settings.notification.AppNotificationSettings; import com.android.settings.notification.NotificationBackend; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.ApplicationsState; import org.junit.Before; @@ -45,10 +44,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppNotificationPreferenceControllerTest { @Mock @@ -114,7 +114,7 @@ public class AppNotificationPreferenceControllerTest { @Test public void getNotificationSummary_noCrashOnNull() { - mController.getNotificationSummary(null, mContext); + AppNotificationPreferenceController.getNotificationSummary(null, mContext); } @Test @@ -122,8 +122,9 @@ public class AppNotificationPreferenceControllerTest { NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); appRow.banned = true; appRow.blockedChannelCount = 30; - assertThat(mController.getNotificationSummary(appRow, mContext).toString()) - .isEqualTo("Off"); + assertThat( + AppNotificationPreferenceController.getNotificationSummary(appRow, mContext).toString()) + .isEqualTo("Off"); } @Test @@ -132,8 +133,9 @@ public class AppNotificationPreferenceControllerTest { appRow.banned = false; appRow.blockedChannelCount = 30; appRow.channelCount = 30; - assertThat(mController.getNotificationSummary(appRow, mContext).toString()) - .isEqualTo("Off"); + assertThat( + AppNotificationPreferenceController.getNotificationSummary(appRow, mContext).toString()) + .isEqualTo("Off"); } @Test @@ -144,10 +146,13 @@ public class AppNotificationPreferenceControllerTest { appRow.channelCount = 60; appRow.sentByApp = new NotificationBackend.NotificationsSentState(); appRow.sentByApp.avgSentWeekly = 4; - assertThat(mController.getNotificationSummary( + assertThat(AppNotificationPreferenceController.getNotificationSummary( appRow, mContext).toString().contains("30")).isTrue(); - assertThat(mController.getNotificationSummary(appRow, mContext).toString().contains( - NotificationBackend.getSentSummary(mContext, appRow.sentByApp, false))).isTrue(); + assertThat( + AppNotificationPreferenceController.getNotificationSummary(appRow, mContext).toString() + .contains( + NotificationBackend.getSentSummary(mContext, appRow.sentByApp, false))) + .isTrue(); } @Test @@ -158,7 +163,9 @@ public class AppNotificationPreferenceControllerTest { appRow.channelCount = 10; appRow.sentByApp = new NotificationBackend.NotificationsSentState(); appRow.sentByApp.avgSentDaily = 4; - assertThat(mController.getNotificationSummary(appRow, mContext).toString()).isEqualTo( + assertThat( + AppNotificationPreferenceController.getNotificationSummary(appRow, mContext).toString()) + .isEqualTo( NotificationBackend.getSentSummary(mContext, appRow.sentByApp, false)); } @@ -170,7 +177,9 @@ public class AppNotificationPreferenceControllerTest { appRow.channelCount = 0; appRow.sentByApp = new NotificationBackend.NotificationsSentState(); appRow.sentByApp.avgSentDaily = 7; - assertThat(mController.getNotificationSummary(appRow, mContext).toString()).isEqualTo( + assertThat( + AppNotificationPreferenceController.getNotificationSummary(appRow, mContext).toString()) + .isEqualTo( NotificationBackend.getSentSummary(mContext, appRow.sentByApp, false)); } } diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceControllerTest.java index b3d0a0dbaf9..b6da54e634d 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceControllerTest.java @@ -33,7 +33,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.applications.AppLaunchSettings; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.AppUtils; import com.android.settingslib.applications.ApplicationsState.AppEntry; import com.android.settingslib.applications.instantapps.InstantAppDataProvider; @@ -43,10 +42,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppOpenByDefaultPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java index e6ae61888c7..022de97cbb0 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java @@ -34,7 +34,6 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.SettingsActivity; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.ApplicationsState; import org.junit.Before; @@ -42,11 +41,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppPermissionPreferenceControllerTest { @Mock @@ -77,7 +77,8 @@ public class AppPermissionPreferenceControllerTest { @Test public void getAvailabilityStatus_isAlwaysAvailable() { - assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.AVAILABLE); + assertThat(mController.getAvailabilityStatus()) + .isEqualTo(AppPermissionPreferenceController.AVAILABLE); } @Test 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 9f0fd3182a1..bda1e612a21 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppSettingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppSettingPreferenceControllerTest.java @@ -25,19 +25,18 @@ import android.content.pm.ResolveInfo; import androidx.preference.Preference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.shadows.ShadowPackageManager; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppSettingPreferenceControllerTest { private static final String TEST_PKG_NAME = "test_pkg"; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppStoragePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppStoragePreferenceControllerTest.java index 0cf8b081a6a..809d2cfefd1 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppStoragePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppStoragePreferenceControllerTest.java @@ -33,7 +33,6 @@ import androidx.loader.app.LoaderManager; import androidx.preference.Preference; import com.android.settings.applications.AppStorageSettings; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.ApplicationsState.AppEntry; import com.android.settingslib.applications.StorageStatsSource; @@ -42,9 +41,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppStoragePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java index e07f66e9762..1f513a36b41 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java @@ -25,16 +25,15 @@ import android.content.pm.PackageInfo; import androidx.preference.Preference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppVersionPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/ButtonActionDialogFragmentTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/ButtonActionDialogFragmentTest.java index e9ff8fb5ae8..d9ed6b08b63 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/ButtonActionDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/ButtonActionDialogFragmentTest.java @@ -17,7 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -30,8 +30,6 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; import org.junit.Before; @@ -39,12 +37,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.androidx.fragment.FragmentController; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {ShadowAlertDialogCompat.class, SettingsShadowResourcesImpl.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowAlertDialogCompat.class) public class ButtonActionDialogFragmentTest { private static final int FORCE_STOP_ID = ButtonActionDialogFragment.DialogType.FORCE_STOP; 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 da1c6b44f65..dd7cde2a46e 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java @@ -32,7 +32,6 @@ import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.applications.DefaultAppSettings; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -40,8 +39,9 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DefaultAppShortcutPreferenceControllerBaseTest { @Mock @@ -68,7 +68,8 @@ public class DefaultAppShortcutPreferenceControllerBaseTest { public void getAvailabilityStatus_managedProfile_shouldReturnDisabled() { when(mUserManager.isManagedProfile()).thenReturn(true); - assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.DISABLED_FOR_USER); + assertThat(mController.getAvailabilityStatus()) + .isEqualTo(DefaultAppShortcutPreferenceControllerBase.DISABLED_FOR_USER); } @Test @@ -76,7 +77,8 @@ public class DefaultAppShortcutPreferenceControllerBaseTest { mController.capable = true; when(mUserManager.isManagedProfile()).thenReturn(false); - assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.AVAILABLE); + assertThat(mController.getAvailabilityStatus()) + .isEqualTo(DefaultAppShortcutPreferenceControllerBase.AVAILABLE); } @Test @@ -85,7 +87,7 @@ public class DefaultAppShortcutPreferenceControllerBaseTest { when(mUserManager.isManagedProfile()).thenReturn(false); assertThat(mController.getAvailabilityStatus()).isEqualTo( - mController.UNSUPPORTED_ON_DEVICE); + DefaultAppShortcutPreferenceControllerBase.UNSUPPORTED_ON_DEVICE); } @Test diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceControllerTest.java index f4571ce390e..65b68aaab44 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceControllerTest.java @@ -18,8 +18,8 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.argThat; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -28,19 +28,18 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DefaultBrowserShortcutPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceControllerTest.java index e630a4c5d37..8f12f98fb73 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceControllerTest.java @@ -29,19 +29,18 @@ import android.content.pm.ResolveInfo; import android.provider.Settings; import android.telephony.TelephonyManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DefaultEmergencyShortcutPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultHomeShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultHomeShortcutPreferenceControllerTest.java index a0b802e80f1..ff281b2d1e0 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultHomeShortcutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultHomeShortcutPreferenceControllerTest.java @@ -27,19 +27,19 @@ import android.content.Context; import android.content.pm.PackageManager; import com.android.settings.applications.defaultapps.DefaultHomePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DefaultHomeShortcutPreferenceControllerTest { @Mock @@ -89,7 +89,7 @@ public class DefaultHomeShortcutPreferenceControllerTest { @Implements(DefaultHomePreferenceController.class) public static class ShadowDefaultHomePreferenceController { @Implementation - public static boolean hasHomePreference(String pkg, Context context) { + protected static boolean hasHomePreference(String pkg, Context context) { return true; } } diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultPhoneShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultPhoneShortcutPreferenceControllerTest.java index ac79a4fba6a..bdb7ba338cb 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultPhoneShortcutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultPhoneShortcutPreferenceControllerTest.java @@ -25,19 +25,19 @@ import android.content.Context; import android.content.pm.PackageManager; import com.android.settings.applications.defaultapps.DefaultPhonePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DefaultPhoneShortcutPreferenceControllerTest { @Mock @@ -84,12 +84,12 @@ public class DefaultPhoneShortcutPreferenceControllerTest { @Implements(DefaultPhonePreferenceController.class) public static class ShadowDefaultPhonePreferenceController { @Implementation - public static boolean hasPhonePreference(String pkg, Context context) { + protected static boolean hasPhonePreference(String pkg, Context context) { return true; } @Implementation - public static boolean isPhoneDefault(String pkg, Context context) { + protected static boolean isPhoneDefault(String pkg, Context context) { return true; } } diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java index 3b9ce3d450b..93582bf8776 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java @@ -25,19 +25,19 @@ import android.content.Context; import android.content.pm.PackageManager; import com.android.settings.applications.defaultapps.DefaultSmsPreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DefaultSmsShortcutPreferenceControllerTest { @Mock @@ -84,12 +84,12 @@ public class DefaultSmsShortcutPreferenceControllerTest { @Implements(DefaultSmsPreferenceController.class) public static class ShadowDefaultSmsPreferenceController { @Implementation - public static boolean hasSmsPreference(String pkg, Context context) { + protected static boolean hasSmsPreference(String pkg, Context context) { return true; } @Implementation - public static boolean isSmsDefault(String pkg, Context context) { + protected static boolean isSmsDefault(String pkg, Context context) { return true; } } diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceControllerTest.java index 3cc4cfe6caa..6a4f2e1921d 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceControllerTest.java @@ -33,16 +33,16 @@ import android.os.UserManager; import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DrawOverlayDetailPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailsTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailsTest.java index 4093cba68de..ca993612ac0 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailsTest.java @@ -30,7 +30,6 @@ import androidx.fragment.app.FragmentActivity; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowAppInfoBase; import org.junit.Before; @@ -41,10 +40,11 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.mockito.Spy; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DrawOverlayDetailsTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceControllerTest.java index a81035f17cc..d6f41c7bc47 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceControllerTest.java @@ -29,16 +29,16 @@ import android.os.UserManager; import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ExternalSourceDetailPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java index d3a90da27f5..10c2675be82 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java @@ -33,7 +33,6 @@ import android.os.UserManager; import com.android.settings.applications.AppStateInstallAppsBridge; import com.android.settings.applications.AppStateInstallAppsBridge.InstallAppsState; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settingslib.RestrictedPreferenceHelper; import com.android.settingslib.RestrictedSwitchPreference; @@ -43,12 +42,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadow.api.Shadow; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowUserManager.class}) public class ExternalSourcesDetailsTest { 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 29c783c1835..da18c446a89 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragmentTest.java @@ -17,9 +17,9 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -34,19 +34,18 @@ import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.FragmentActivity; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {ShadowAlertDialogCompat.class, SettingsShadowResourcesImpl.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowAlertDialogCompat.class) public class InstantAppButtonDialogFragmentTest { private static final String TEST_PACKAGE = "testPackage"; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java index 6879b7de2f3..b7b67991778 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java @@ -49,7 +49,6 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.AppUtils; import com.android.settingslib.applications.instantapps.InstantAppDataProvider; import com.android.settingslib.widget.LayoutPreference; @@ -59,10 +58,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class InstantAppButtonsPreferenceControllerTest { private static final String TEST_INSTALLER_PACKAGE_NAME = "com.installer"; @@ -87,7 +87,7 @@ public class InstantAppButtonsPreferenceControllerTest { private InstantAppButtonsPreferenceController mController; @Before - public void setUp() throws PackageManager.NameNotFoundException { + public void setUp() { MockitoAnnotations.initMocks(this); mContext = spy(RuntimeEnvironment.application); when(mContext.getPackageManager()).thenReturn(mPackageManager); diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceControllerTest.java index af38db39038..79f3221a42b 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceControllerTest.java @@ -32,7 +32,6 @@ import android.util.ArraySet; import com.android.settings.applications.AppDomainsPreference; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.AppUtils; import com.android.settingslib.applications.instantapps.InstantAppDataProvider; @@ -41,13 +40,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class InstantAppDomainsPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java index 358bd302b4d..94d12288d28 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java @@ -32,18 +32,18 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.shadows.ShadowPackageManager; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TimeSpentInAppPreferenceControllerTest { private static final String TEST_KEY = "test_tey"; @@ -92,7 +92,6 @@ public class TimeSpentInAppPreferenceControllerTest { assertThat(mController.getAvailabilityStatus()) .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE); - } @Test diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/WriteSettingsDetailsTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/WriteSettingsDetailsTest.java index d9e4ad4c3c2..7bfffff2091 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/WriteSettingsDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/WriteSettingsDetailsTest.java @@ -17,21 +17,21 @@ package com.android.settings.applications.appinfo; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import android.content.Context; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WriteSettingsDetailsTest { private FakeFeatureFactory mFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/WriteSystemSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/WriteSystemSettingsPreferenceControllerTest.java index 00ecece3355..5460cd6300b 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/WriteSystemSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/WriteSystemSettingsPreferenceControllerTest.java @@ -33,16 +33,16 @@ import android.os.UserManager; import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WriteSystemSettingsPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java index 74a38511c9b..ea4129330bd 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java @@ -20,9 +20,9 @@ import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -34,7 +34,6 @@ import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -42,10 +41,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AssistContextPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java index 10197aed4c8..1e6faa16b98 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java @@ -20,9 +20,9 @@ import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -37,7 +37,6 @@ import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowSecureSettings; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -47,11 +46,12 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AssistFlashScreenPreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/applications/assist/AssistSettingObserverTest.java b/tests/robotests/src/com/android/settings/applications/assist/AssistSettingObserverTest.java index e046219e2da..f930106910e 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/AssistSettingObserverTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/AssistSettingObserverTest.java @@ -18,14 +18,13 @@ package com.android.settings.applications.assist; import android.net.Uri; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; import java.util.List; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AssistSettingObserverTest { @Test diff --git a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java index e445dc67d11..3804d6d32f9 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java @@ -26,12 +26,11 @@ import android.content.ComponentName; import android.content.Context; import android.provider.Settings; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowActivityManager; @@ -40,7 +39,7 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DefaultAssistPickerTest { private static ComponentName sTestAssist; 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 02c1b8b4392..3e46027c362 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java @@ -18,9 +18,9 @@ package com.android.settings.applications.assist; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -40,7 +40,6 @@ import android.content.pm.ServiceInfo; import android.provider.Settings; import com.android.internal.app.AssistUtils; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowSecureSettings; import com.android.settingslib.applications.DefaultAppInfo; @@ -49,6 +48,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; @@ -56,7 +56,7 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DefaultAssistPreferenceControllerTest { private static final String TEST_KEY = "test_pref_key"; diff --git a/tests/robotests/src/com/android/settings/applications/assist/ManageAssistTest.java b/tests/robotests/src/com/android/settings/applications/assist/ManageAssistTest.java index ab4f3010f87..0063b54d87c 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/ManageAssistTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/ManageAssistTest.java @@ -20,13 +20,13 @@ import static com.google.common.truth.Truth.assertThat; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ManageAssistTest { private ManageAssist mSettings; diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java index de602badec1..ee05d295dec 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java @@ -16,7 +16,7 @@ package com.android.settings.applications.defaultapps; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -31,7 +31,6 @@ import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.RadioButtonPreference; import com.android.settingslib.applications.DefaultAppInfo; @@ -41,12 +40,13 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DefaultAppPickerFragmentTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java index b9a131643e9..31c00ecdc6e 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java @@ -16,7 +16,6 @@ package com.android.settings.applications.defaultapps; - import static com.android.settingslib.TwoTargetPreference.ICON_SIZE_MEDIUM; import static org.mockito.Mockito.mock; @@ -29,7 +28,6 @@ import android.os.UserManager; import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.TwoTargetPreference; import com.android.settingslib.applications.DefaultAppInfo; @@ -39,8 +37,9 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DefaultAppPreferenceControllerTest { private static final String TEST_APP_NAME = "test"; diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java index f2d14acc2d2..81a16d53a69 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java @@ -40,9 +40,6 @@ import androidx.fragment.app.FragmentActivity; import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; -import com.android.settings.testutils.shadow.ShadowProcess; import com.android.settings.testutils.shadow.ShadowSecureSettings; import com.android.settingslib.applications.DefaultAppInfo; @@ -52,17 +49,15 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; +import org.robolectric.shadows.ShadowProcess; import org.robolectric.util.ReflectionHelpers; import java.util.Arrays; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = { - SettingsShadowResources.SettingsShadowTheme.class, - ShadowProcess.class, - ShadowSecureSettings.class - }) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowSecureSettings.class) public class DefaultAutofillPickerTest { private static final String MAIN_APP_KEY = "main.foo.bar/foo.bar.Baz"; @@ -98,7 +93,7 @@ public class DefaultAutofillPickerTest { mPicker = spy(new DefaultAutofillPicker()); - doReturn(application.getApplicationContext()).when(mPicker).getContext(); + doReturn(application).when(mPicker).getContext(); doReturn(mActivity).when(mPicker).getActivity(); doReturn(res).when(mPicker).getResources(); doReturn(mScreen).when(mPicker).getPreferenceScreen(); @@ -141,7 +136,7 @@ public class DefaultAutofillPickerTest { public void mUserId_shouldDeriveUidFromManagedCaller() { setupUserManager(); setupCaller(); - ShadowProcess.setMyUid(MANAGED_PROFILE_UID * UserHandle.PER_USER_RANGE); + ShadowProcess.setUid(MANAGED_PROFILE_UID * UserHandle.PER_USER_RANGE); mPicker.onAttach((Context) mActivity); mPicker.onCreate(null); @@ -153,7 +148,7 @@ public class DefaultAutofillPickerTest { public void mUserId_shouldDeriveUidFromMainCaller() { setupUserManager(); setupCaller(); - ShadowProcess.setMyUid(MAIN_PROFILE_UID * UserHandle.PER_USER_RANGE); + ShadowProcess.setUid(MAIN_PROFILE_UID * UserHandle.PER_USER_RANGE); mPicker.onAttach((Context) mActivity); mPicker.onCreate(null); @@ -165,7 +160,7 @@ public class DefaultAutofillPickerTest { public void mUserId_shouldDeriveUidFromManagedClick() { setupUserManager(); setupClick(/* forWork= */ true); - ShadowProcess.setMyUid(MAIN_PROFILE_UID * UserHandle.PER_USER_RANGE); + ShadowProcess.setUid(MAIN_PROFILE_UID * UserHandle.PER_USER_RANGE); mPicker.onAttach((Context) mActivity); mPicker.onCreate(null); @@ -177,7 +172,7 @@ public class DefaultAutofillPickerTest { public void mUserId_shouldDeriveUidFromMainClick() { setupUserManager(); setupClick(/* forWork= */ false); - ShadowProcess.setMyUid(MAIN_PROFILE_UID * UserHandle.PER_USER_RANGE); + ShadowProcess.setUid(MAIN_PROFILE_UID * UserHandle.PER_USER_RANGE); mPicker.onAttach((Context) mActivity); mPicker.onCreate(null); @@ -210,7 +205,6 @@ public class DefaultAutofillPickerTest { } private void assertUserId(int userId) { - assertThat((Integer) ReflectionHelpers.getField(mPicker, "mUserId")) - .isEqualTo(userId); + assertThat((Integer) ReflectionHelpers.getField(mPicker, "mUserId")).isEqualTo(userId); } } diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java index 61466710bff..26ec1c62d03 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java @@ -32,7 +32,6 @@ import android.view.autofill.AutofillManager; import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -40,10 +39,11 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DefaultAutofillPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java index 3aa83a8ca1e..3386d83565f 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java @@ -16,8 +16,8 @@ package com.android.settings.applications.defaultapps; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -27,7 +27,6 @@ import android.content.pm.PackageManager; import android.os.UserManager; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -35,9 +34,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DefaultBrowserPickerTest { private static final String TEST_APP_KEY = ""; @@ -58,7 +58,7 @@ public class DefaultBrowserPickerTest { when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager); mPicker = new DefaultBrowserPicker(); - mPicker.onAttach((Context) mActivity); + mPicker.onAttach(mActivity); ReflectionHelpers.setField(mPicker, "mPm", mPackageManager); } diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java index cd3a4260864..7bfd299fb20 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java @@ -18,9 +18,9 @@ package com.android.settings.applications.defaultapps; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -40,7 +40,6 @@ import android.os.UserManager; import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -48,13 +47,14 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.Collections; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DefaultBrowserPreferenceControllerTest { @Mock @@ -119,7 +119,6 @@ public class DefaultBrowserPreferenceControllerTest { when(mPackageManager.getApplicationInfoAsUser( eq(PACKAGE_NAME.toString()), anyInt(), anyInt())) .thenReturn(createApplicationInfo(PACKAGE_NAME.toString())); - final Preference pref = mock(Preference.class); assertThat(spyController.getDefaultAppLabel()).isEqualTo(PACKAGE_NAME); } @@ -170,15 +169,14 @@ public class DefaultBrowserPreferenceControllerTest { .thenReturn(createApplicationInfo(PACKAGE_TWO)); final List defaultBrowserInfo = - mController.getCandidates(mPackageManager, 0 /* userId */); + DefaultBrowserPreferenceController.getCandidates(mPackageManager, 0 /* userId */); assertThat(defaultBrowserInfo.size()).isEqualTo(2); } @Test public void getCandidates_shouldQueryActivityWithFlagsEquals0() { - - mController.getCandidates(mPackageManager, 0 /* userId */); + DefaultBrowserPreferenceController.getCandidates(mPackageManager, 0 /* userId */); verify(mPackageManager).queryIntentActivitiesAsUser( any(Intent.class), eq(0) /* flags */, eq(0) /* userId */); @@ -205,7 +203,8 @@ public class DefaultBrowserPreferenceControllerTest { public void hasBrowserPreference_shouldQueryIntentActivitiesAsUser() { when(mContext.getPackageManager()).thenReturn(mPackageManager); - mController.hasBrowserPreference("com.test.package", mContext, 0 /* userId */); + DefaultBrowserPreferenceController + .hasBrowserPreference("com.test.package", mContext, 0 /* userId */); verify(mPackageManager).queryIntentActivitiesAsUser( any(Intent.class), eq(0) /* flags */, eq(0) /* userId */); diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java index e17b556307b..6aa4babff2b 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java @@ -28,18 +28,17 @@ import android.content.pm.PackageManager; import android.os.UserManager; import android.provider.Settings; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DefaultEmergencyPickerTest { private static final String TEST_APP_KEY = "test_app"; @@ -59,7 +58,7 @@ public class DefaultEmergencyPickerTest { when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager); mPicker = spy(new DefaultEmergencyPicker()); - mPicker.onAttach((Context) mActivity); + mPicker.onAttach(mActivity); ReflectionHelpers.setField(mPicker, "mPm", mPackageManager); diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java index 4cf79df4d01..be4fdbfb4d8 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java @@ -18,10 +18,10 @@ package com.android.settings.applications.defaultapps; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyList; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyList; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -30,6 +30,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.Activity; +import android.app.AppOpsManager; import android.content.ComponentName; import android.content.Context; import android.content.IntentFilter; @@ -42,7 +43,7 @@ import android.content.pm.UserInfo; import android.os.Build; import android.os.UserManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; +import com.android.settings.testutils.FakeFeatureFactory; import com.android.settingslib.applications.DefaultAppInfo; import org.junit.Before; @@ -51,13 +52,14 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DefaultHomePickerTest { private static final String TEST_APP_KEY = "com.android.settings/DefaultEmergencyPickerTest"; @@ -67,6 +69,8 @@ public class DefaultHomePickerTest { @Mock private UserManager mUserManager; @Mock + private AppOpsManager mAppOpsManager; + @Mock private PackageManager mPackageManager; private Context mContext; @@ -75,7 +79,12 @@ public class DefaultHomePickerTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); + + FakeFeatureFactory.setupForTest(); + when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager); + when(mActivity.getSystemService(Context.APP_OPS_SERVICE)).thenReturn(mAppOpsManager); + when(mActivity.getApplicationContext()).thenReturn(RuntimeEnvironment.application); mPicker = spy(new DefaultHomePicker()); mPicker.onAttach((Context) mActivity); @@ -103,8 +112,7 @@ public class DefaultHomePickerTest { } @Test - public void getCandidates_allLaunchersAvailableIfNoManagedProfile() - throws NameNotFoundException { + public void getCandidates_allLaunchersAvailableIfNoManagedProfile() { addLaunchers(); List candidates = mPicker.getCandidates(); assertThat(candidates.size()).isEqualTo(2); diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java index 1083a998653..c19b3159833 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java @@ -18,9 +18,9 @@ package com.android.settings.applications.defaultapps; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyList; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -38,19 +38,18 @@ import android.os.UserManager; import androidx.preference.Preference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DefaultHomePreferenceControllerTest { private static final String TEST_PACKAGE = "test.pkg"; @@ -168,5 +167,4 @@ public class DefaultHomePreferenceControllerTest { when(mPackageManager.getHomeActivities(anyList())).thenReturn(null); assertThat(mController.getSettingIntent(mController.getDefaultAppInfo())).isNull(); } - } diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java index 1d4b5c0485d..c9f93635ee0 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.applications.defaultapps; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -31,17 +31,17 @@ import android.os.UserManager; import androidx.preference.Preference; import com.android.settings.nfc.PaymentBackend; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DefaultPaymentSettingsPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPhonePickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPhonePickerTest.java index 57d31cf84f9..743b096508c 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPhonePickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPhonePickerTest.java @@ -16,9 +16,9 @@ package com.android.settings.applications.defaultapps; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -30,7 +30,6 @@ import android.content.pm.PackageManager; import android.os.UserManager; import com.android.settings.fuelgauge.BatteryUtils; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -38,10 +37,11 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DefaultPhonePickerTest { private static final String TEST_APP_KEY = "com.android.settings/PickerTest"; @@ -65,7 +65,7 @@ public class DefaultPhonePickerTest { when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager); when(mActivity.getSystemService(Context.TELECOM_SERVICE)).thenReturn(null); mPicker = spy(new DefaultPhonePicker()); - mPicker.onAttach((Context) mActivity); + mPicker.onAttach(mActivity); ReflectionHelpers.setField(mPicker, "mPm", mPackageManager); ReflectionHelpers.setField(mPicker, "mDefaultKeyUpdater", mDefaultKeyUpdater); diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultSmsPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultSmsPickerTest.java index ade62a13cb1..6fd65b25dd0 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultSmsPickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultSmsPickerTest.java @@ -16,8 +16,8 @@ package com.android.settings.applications.defaultapps; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -29,7 +29,6 @@ import android.content.pm.PackageManager; import android.os.UserManager; import com.android.settings.fuelgauge.BatteryUtils; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -37,10 +36,11 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DefaultSmsPickerTest { private static final String TEST_APP_KEY = "com.android.settings/PickerTest"; @@ -63,7 +63,7 @@ public class DefaultSmsPickerTest { MockitoAnnotations.initMocks(this); when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager); mPicker = spy(new DefaultSmsPicker()); - mPicker.onAttach((Context) mActivity); + mPicker.onAttach(mActivity); ReflectionHelpers.setField(mPicker, "mPm", mPackageManager); ReflectionHelpers.setField(mPicker, "mDefaultKeyUpdater", mDefaultKeyUpdater); diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java index 13789302765..0ef94ec1af3 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java @@ -25,13 +25,13 @@ import static com.google.common.truth.Truth.assertThat; import com.android.settings.R; import com.android.settings.applications.AppStateUsageBridge; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.ApplicationsState; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppFilterItemTest { @Test diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java index 7409136251b..680cd8aadf1 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java @@ -55,12 +55,11 @@ import static com.android.settings.applications.manageapplications.ManageApplica import static com.google.common.truth.Truth.assertThat; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppFilterRegistryTest { @Test diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java index 2ae95618572..b8d0f20a87c 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java @@ -27,15 +27,15 @@ import android.view.View; import android.widget.FrameLayout; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.ApplicationsState; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ApplicationViewHolderTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java index 4c9cacb6926..3dc0bc453ff 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java @@ -28,10 +28,10 @@ import static com.android.settings.applications.manageapplications.ManageApplica import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -59,7 +59,6 @@ import androidx.fragment.app.FragmentActivity; import androidx.recyclerview.widget.RecyclerView; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.LoadingViewController; import com.android.settingslib.applications.ApplicationsState; @@ -68,13 +67,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.fakes.RoboMenuItem; import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ManageApplicationsTest { @Mock @@ -144,7 +144,6 @@ public class ManageApplicationsTest { assertThat(mMenu.findItem(R.id.sort_order_frequent_notification).isVisible()).isFalse(); } - @Test public void onCreateView_shouldNotShowLoadingContainer() { ReflectionHelpers.setField(mFragment, "mResetAppsHelper", mock(ResetAppsHelper.class)); diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java index d2b6d8a2290..8f5b0abf47b 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.applications.manageapplications; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.nullable; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -33,7 +33,6 @@ import android.widget.FrameLayout; import androidx.fragment.app.Fragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.StorageStatsSource; import org.junit.Before; @@ -43,9 +42,10 @@ import org.mockito.Answers; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class MusicViewHolderControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) private Fragment mFragment; diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java index 64cc1cca1f7..c4534745462 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.applications.manageapplications; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.nullable; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -32,7 +32,6 @@ import android.widget.FrameLayout; import androidx.fragment.app.Fragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.StorageStatsSource; import org.junit.Before; @@ -42,9 +41,10 @@ import org.mockito.Answers; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PhotosViewHolderControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) private Fragment mFragment; diff --git a/tests/robotests/src/com/android/settings/applications/managedomainurls/DomainAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/managedomainurls/DomainAppPreferenceControllerTest.java index be3d5544d80..5f2a51478cb 100644 --- a/tests/robotests/src/com/android/settings/applications/managedomainurls/DomainAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/managedomainurls/DomainAppPreferenceControllerTest.java @@ -31,17 +31,17 @@ import android.widget.ProgressBar; import androidx.preference.PreferenceViewHolder; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.ApplicationsState; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.UUID; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DomainAppPreferenceControllerTest { private ApplicationsState.AppEntry mAppEntry; diff --git a/tests/robotests/src/com/android/settings/applications/managedomainurls/InstantAppAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/managedomainurls/InstantAppAccountPreferenceControllerTest.java index f09e400ad96..007aa86bd24 100644 --- a/tests/robotests/src/com/android/settings/applications/managedomainurls/InstantAppAccountPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/managedomainurls/InstantAppAccountPreferenceControllerTest.java @@ -31,17 +31,16 @@ import android.content.Context; import android.content.pm.PackageManager; import android.provider.Settings; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class InstantAppAccountPreferenceControllerTest { private static final String PREF_KEY = "instant_app_account_pref"; diff --git a/tests/robotests/src/com/android/settings/applications/managedomainurls/InstantAppWebActionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/managedomainurls/InstantAppWebActionPreferenceControllerTest.java index b4ff2fa645f..9319c1310c5 100644 --- a/tests/robotests/src/com/android/settings/applications/managedomainurls/InstantAppWebActionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/managedomainurls/InstantAppWebActionPreferenceControllerTest.java @@ -30,16 +30,15 @@ import android.provider.Settings; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class InstantAppWebActionPreferenceControllerTest { private static final String PREF_KEY = "instant_app_web_action_toggle"; private static final String KEY_INSTANT_APPS_ENABLED = Settings.Secure.INSTANT_APPS_ENABLED; diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/DataSaverControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/DataSaverControllerTest.java index ed72cf93915..39d51fa6f50 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/DataSaverControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/DataSaverControllerTest.java @@ -22,16 +22,15 @@ import static org.mockito.Mockito.spy; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DataSaverControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/HighPowerAppsControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/HighPowerAppsControllerTest.java index 27fb24e9e76..0ed68cb5f77 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/HighPowerAppsControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/HighPowerAppsControllerTest.java @@ -22,16 +22,15 @@ import static org.mockito.Mockito.spy; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class HighPowerAppsControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/ZenAccessControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/ZenAccessControllerTest.java index da2bc0a9ed4..5bce86c386c 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/ZenAccessControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/ZenAccessControllerTest.java @@ -20,16 +20,15 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowActivityManager; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenAccessControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAddTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAddTest.java index eaccdc0ac4b..18aaddd9184 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAddTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAddTest.java @@ -16,8 +16,8 @@ package com.android.settings.applications.specialaccess.deviceadmin; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; @@ -32,7 +32,6 @@ import android.app.settings.SettingsEnums; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.fuelgauge.BatteryUtils; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -41,9 +40,10 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DeviceAdminAddTest { private static final int UID = 12345; private static final String PACKAGE_NAME = "com.android.test.device.admin"; diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListItemTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListItemTest.java index 0873a18f652..17703e334dd 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListItemTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListItemTest.java @@ -16,7 +16,6 @@ package com.android.settings.applications.specialaccess.deviceadmin; - import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -31,16 +30,15 @@ import android.content.pm.PackageManager; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DeviceAdminListItemTest { @Mock @@ -73,5 +71,4 @@ public class DeviceAdminListItemTest { assertThat(item.getName()).isEqualTo(label); assertThat(item.getDescription()).isEqualTo(description); } - } diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceControllerTest.java index 18ecf7d1654..18b4f18d002 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceControllerTest.java @@ -32,7 +32,6 @@ import android.os.UserHandle; import androidx.lifecycle.LifecycleOwner; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.widget.FooterPreferenceMixinCompat; @@ -41,9 +40,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DeviceAdminListPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailPreferenceControllerTest.java index bba2b8b74eb..5746c189301 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailPreferenceControllerTest.java @@ -30,16 +30,16 @@ import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.applications.appinfo.AppInfoDashboardFragment; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PictureInPictureDetailPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailsTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailsTest.java index b3d695849f4..b6c6c6aad99 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailsTest.java @@ -25,14 +25,14 @@ import android.content.pm.ActivityInfo; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PictureInPictureDetailsTest { private FakeFeatureFactory mFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettingsTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettingsTest.java index deb66c86ab7..d08313c32c1 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettingsTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettingsTest.java @@ -18,8 +18,8 @@ package com.android.settings.applications.specialaccess.pictureinpicture; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; import android.content.pm.ActivityInfo; @@ -31,7 +31,6 @@ import android.os.UserManager; import android.util.Pair; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.google.common.collect.ImmutableList; @@ -43,8 +42,9 @@ import org.mockito.MockitoAnnotations; import java.util.ArrayList; import java.util.List; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PictureInPictureSettingsTest { private static final int PRIMARY_USER_ID = 0; diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccessTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccessTest.java index 1f32b18da0e..42a497af946 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccessTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccessTest.java @@ -23,15 +23,15 @@ import android.app.settings.SettingsEnums; import com.android.internal.logging.nano.MetricsProto; import com.android.internal.telephony.SmsUsageMonitor; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PremiumSmsAccessTest { private FakeFeatureFactory mFeatureFactory; 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 4244cd71b0e..0607e58985c 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 @@ -24,16 +24,15 @@ import static org.mockito.Mockito.spy; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PremiumSmsControllerTest { private Context mContext; 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 0dc7da3a312..53d46cab03a 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 @@ -24,16 +24,15 @@ import static org.mockito.Mockito.spy; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PremiumSmsScreenPreferenceControllerTest { private Context mContext; 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 6239774e17c..32b18efafe2 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 @@ -23,17 +23,16 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowActivityManager; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EnabledVrListenersControllerTest { private Context mContext; 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 7a8dc5f2036..bff7ea1fcec 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 @@ -23,17 +23,16 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowActivityManager; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class VrListenerScreenPreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettingsTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettingsTest.java index 3f0bc1d3895..d6c7078a4a5 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettingsTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettingsTest.java @@ -20,14 +20,14 @@ import android.app.settings.SettingsEnums; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class VrListenerSettingsTest { private FakeFeatureFactory mFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/backup/AutoRestorePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/AutoRestorePreferenceControllerTest.java index 43b707c8024..9b36d322aa0 100644 --- a/tests/robotests/src/com/android/settings/backup/AutoRestorePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/backup/AutoRestorePreferenceControllerTest.java @@ -23,17 +23,17 @@ import android.content.Context; import androidx.preference.SwitchPreference; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowPrivacySettingsUtils.class}) public class AutoRestorePreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/backup/BackupDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupDataPreferenceControllerTest.java index f23bc93c637..1a6537b61ef 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupDataPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupDataPreferenceControllerTest.java @@ -24,17 +24,17 @@ import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowPrivacySettingsUtils.class}) public class BackupDataPreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/backup/BackupInactivePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupInactivePreferenceControllerTest.java index bcd432acc89..f8b3578d0d5 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupInactivePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupInactivePreferenceControllerTest.java @@ -23,17 +23,17 @@ import android.content.Context; import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowPrivacySettingsUtils.class}) public class BackupInactivePreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java index f6276d0fd3a..97ddc4bc1ad 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java @@ -18,9 +18,7 @@ package com.android.settings.backup; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; import android.app.backup.BackupManager; import android.content.Context; @@ -29,26 +27,25 @@ import android.os.UserManager; import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; +import org.robolectric.shadow.api.Shadow; +import org.robolectric.shadows.ShadowApplication; +import org.robolectric.shadows.ShadowUserManager; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = BackupSettingsActivityPreferenceControllerTest.ShadowBackupManager.class) +@RunWith(RobolectricTestRunner.class) public class BackupSettingsActivityPreferenceControllerTest { private static final String KEY_BACKUP_SETTINGS = "backup_settings"; private Context mContext; - @Mock + private BackupManager mBackupManager; private UserManager mUserManager; @Mock @@ -56,20 +53,25 @@ public class BackupSettingsActivityPreferenceControllerTest { private BackupSettingsActivityPreferenceController mController; - private static boolean mBackupEnabled; - @Before public void setUp() { MockitoAnnotations.initMocks(this); - mContext = spy(RuntimeEnvironment.application.getApplicationContext()); - when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager); + + mContext = RuntimeEnvironment.application; + mBackupManager = new BackupManager(mContext); + + final ShadowApplication shadowApplication = ShadowApplication.getInstance(); + shadowApplication.grantPermissions(android.Manifest.permission.BACKUP); + shadowApplication.setSystemService(Context.BACKUP_SERVICE, mBackupManager); + + mUserManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE); mController = new BackupSettingsActivityPreferenceController(mContext, KEY_BACKUP_SETTINGS); } @Test public void updateState_backupOn() { - mBackupEnabled = true; + mBackupManager.setBackupEnabled(true); mController.updateState(mBackupPreference); String summaryString = mContext.getString(R.string.backup_summary_state_on); @@ -78,7 +80,7 @@ public class BackupSettingsActivityPreferenceControllerTest { @Test public void updateState_backupOff() { - mBackupEnabled = false; + mBackupManager.setBackupEnabled(false); mController.updateState(mBackupPreference); String summaryString = mContext.getString(R.string.backup_summary_state_off); @@ -87,14 +89,16 @@ public class BackupSettingsActivityPreferenceControllerTest { @Test public void isAvailable_systemUser() { - when(mUserManager.isAdminUser()).thenReturn(true); + final ShadowUserManager sum = Shadow.extract(mUserManager); + sum.setIsAdminUser(true); assertThat(mController.isAvailable()).isTrue(); } @Test public void isAvailable_nonSystemUser() { - when(mUserManager.isAdminUser()).thenReturn(false); + final ShadowUserManager sum = Shadow.extract(mUserManager); + sum.setIsAdminUser(false); assertThat(mController.isAvailable()).isFalse(); } @@ -103,13 +107,4 @@ public class BackupSettingsActivityPreferenceControllerTest { public void getPreferenceKey() { assertThat(mController.getPreferenceKey()).isEqualTo(KEY_BACKUP_SETTINGS); } - - @Implements(BackupManager.class) - public static class ShadowBackupManager { - - @Implementation - public boolean isBackupEnabled() { - return mBackupEnabled; - } - } } diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java index 51a60168aef..931bc1e7ee0 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java @@ -18,9 +18,9 @@ package com.android.settings.backup; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.isA; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.isA; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -36,7 +36,6 @@ import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; import com.android.settings.search.SearchIndexableRaw; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.After; import org.junit.Before; @@ -45,6 +44,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.android.controller.ActivityController; @@ -56,7 +56,7 @@ import org.robolectric.shadows.ShadowPackageManager; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {BackupSettingsActivityTest.ShadowBackupSettingsHelper.class, BackupSettingsActivityTest.ShadowUserHandle.class}) public class BackupSettingsActivityTest { @@ -155,12 +155,12 @@ public class BackupSettingsActivityTest { @Implements(BackupSettingsHelper.class) public static class ShadowBackupSettingsHelper { @Implementation - public Intent getIntentForBackupSettings() { + protected Intent getIntentForBackupSettings() { return mIntent; } @Implementation - public boolean isBackupProvidedByManufacturer() { + protected boolean isBackupProvidedByManufacturer() { return mIsBackupProvidedByOEM; } } @@ -174,7 +174,7 @@ public class BackupSettingsActivityTest { } @Implementation - public static int myUserId() { + protected static int myUserId() { return sUid; } diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java index f3cb850ee59..9a809cc7ba2 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java @@ -36,19 +36,19 @@ import android.os.IBinder; import android.os.RemoteException; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = BackupSettingsHelperTest.ShadowBackupManagerStub.class) public class BackupSettingsHelperTest { @@ -317,7 +317,7 @@ public class BackupSettingsHelperTest { } @Test - public void testIsBackupProvidedByManufacturer_WithIntent() throws Exception { + public void testIsBackupProvidedByManufacturer_WithIntent() { String intent = "test_intent"; when(mContext.getApplicationContext()).thenReturn(mContext); @@ -332,7 +332,7 @@ public class BackupSettingsHelperTest { } @Test - public void testIsBackupProvidedByManufacturer_WithoutIntent() throws Exception { + public void testIsBackupProvidedByManufacturer_WithoutIntent() { String intent = ""; when(mContext.getApplicationContext()).thenReturn(mContext); @@ -347,7 +347,7 @@ public class BackupSettingsHelperTest { } @Test - public void testGetLabelProvidedByManufacturer() throws Exception { + public void testGetLabelProvidedByManufacturer() { String label = "test_label"; when(mContext.getApplicationContext()).thenReturn(mContext); @@ -362,7 +362,7 @@ public class BackupSettingsHelperTest { } @Test - public void testGetIntentProvidedByManufacturer() throws Exception { + public void testGetIntentProvidedByManufacturer() { String intent = "test_intent"; when(mContext.getApplicationContext()).thenReturn(mContext); diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java index fb3f947eba2..c29dc1b1d8e 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java @@ -28,19 +28,18 @@ import android.content.Intent; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = BackupSettingsPreferenceControllerTest.ShadowBackupSettingsHelper.class) public class BackupSettingsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/backup/ConfigureAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/ConfigureAccountPreferenceControllerTest.java index 5609f354261..610e6f85f10 100644 --- a/tests/robotests/src/com/android/settings/backup/ConfigureAccountPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/backup/ConfigureAccountPreferenceControllerTest.java @@ -25,7 +25,6 @@ import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.After; import org.junit.Before; @@ -33,10 +32,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowPrivacySettingsUtils.class}) public class ConfigureAccountPreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/backup/DataManagementPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/DataManagementPreferenceControllerTest.java index caf20c847f0..ac92fb7aca4 100644 --- a/tests/robotests/src/com/android/settings/backup/DataManagementPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/backup/DataManagementPreferenceControllerTest.java @@ -24,7 +24,6 @@ import android.content.Intent; import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.After; import org.junit.Before; @@ -32,10 +31,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowPrivacySettingsUtils.class}) public class DataManagementPreferenceControllerTest { private final String KEY = "data_management"; @@ -70,8 +70,7 @@ public class DataManagementPreferenceControllerTest { mPSCD.setManageIntent(mIntent); mPSCD.setManageLabel(mTitle); mController.updateState(mPreference); - assertThat(mPreference.getTitle()) - .isEqualTo(mTitle); + assertThat(mPreference.getTitle()).isEqualTo(mTitle); } @Test diff --git a/tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java index 9907da08db8..ec924e54295 100644 --- a/tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java @@ -37,19 +37,19 @@ import androidx.preference.Preference; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import java.util.Collections; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FaceStatusPreferenceControllerTest { @Mock private LockPatternUtils mLockPatternUtils; diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/DeleteFingerprintDialogTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/DeleteFingerprintDialogTest.java index 1d3d9ea9576..0681e1c9aa5 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/DeleteFingerprintDialogTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/DeleteFingerprintDialogTest.java @@ -28,8 +28,6 @@ import androidx.fragment.app.FragmentActivity; import com.android.settings.biometrics.fingerprint.FingerprintSettings.FingerprintSettingsFragment; import com.android.settings.biometrics.fingerprint.FingerprintSettings .FingerprintSettingsFragment.DeleteFingerprintDialog; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowFragment; import org.junit.Before; @@ -37,11 +35,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import org.robolectric.shadows.androidx.fragment.FragmentController; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {ShadowFragment.class, SettingsShadowResourcesImpl.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowFragment.class) public class DeleteFingerprintDialogTest { @Mock diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java index fb50b3cfb93..bfe7df307f2 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java @@ -19,7 +19,7 @@ package com.android.settings.biometrics.fingerprint; import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.verify; import android.content.Intent; @@ -31,8 +31,6 @@ import android.widget.TextView; import com.android.settings.R; import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowUtils; @@ -44,12 +42,11 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = { - SettingsShadowResourcesImpl.class, - ShadowUtils.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowUtils.class) public class FingerprintEnrollEnrollingTest { @Mock 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 d51c6a58ed8..d6adb5c78ef 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java @@ -18,8 +18,8 @@ package com.android.settings.biometrics.fingerprint; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.verify; import static org.robolectric.RuntimeEnvironment.application; @@ -35,8 +35,6 @@ import com.android.settings.R; import com.android.settings.biometrics.BiometricEnrollBase; import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settings.testutils.shadow.ShadowUtils; import org.junit.After; @@ -47,13 +45,14 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowActivity; import org.robolectric.shadows.ShadowActivity.IntentForResult; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {SettingsShadowResources.SettingsShadowTheme.class, ShadowUtils.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowUtils.class) public class FingerprintEnrollFindSensorTest { @Mock diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSuggestionActivityTest.java index 834aea5d5fa..93f8f3ab43d 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSuggestionActivityTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSuggestionActivityTest.java @@ -18,9 +18,9 @@ package com.android.settings.biometrics.fingerprint; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; import android.app.admin.DevicePolicyManager; @@ -28,15 +28,14 @@ import android.content.Context; import android.content.pm.PackageManager; import android.hardware.fingerprint.FingerprintManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FingerprintEnrollSuggestionActivityTest { @Mock diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationVideoViewTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationVideoViewTest.java index e8b27a8446f..32bd8d7e665 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationVideoViewTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationVideoViewTest.java @@ -17,7 +17,7 @@ package com.android.settings.biometrics.fingerprint; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -27,15 +27,14 @@ import android.graphics.SurfaceTexture; import android.net.Uri; import android.view.TextureView.SurfaceTextureListener; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FingerprintLocationAnimationVideoViewTest { private FingerprintLocationAnimationVideoView mView; diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintPreferenceTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintPreferenceTest.java index 03b96ede471..116591d758a 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintPreferenceTest.java @@ -29,16 +29,16 @@ import androidx.preference.PreferenceViewHolder; import com.android.settings.R; import com.android.settings.biometrics.fingerprint.FingerprintSettings.FingerprintPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FingerprintPreferenceTest { @Mock diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java index 7606202040a..f4410a36bf2 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java @@ -31,17 +31,17 @@ import android.os.UserManager; import com.android.internal.widget.LockPatternUtils; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FingerprintProfileStatusPreferenceControllerTest { private static final int FAKE_PROFILE_USER_ID = 1234; diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceControllerTest.java index b47fd08d507..18a05fd5a88 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceControllerTest.java @@ -37,19 +37,19 @@ import androidx.preference.Preference; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import java.util.Collections; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FingerprintStatusPreferenceControllerTest { @Mock @@ -123,8 +123,7 @@ public class FingerprintStatusPreferenceControllerTest { when(mFingerprintManager.isHardwareDetected()).thenReturn(true); when(mFingerprintManager.getEnrolledFingerprints(anyInt())) .thenReturn(Collections.singletonList(mock(Fingerprint.class))); - when(mFingerprintManager.hasEnrolledFingerprints(anyInt())) - .thenReturn(true); + when(mFingerprintManager.hasEnrolledFingerprints(anyInt())).thenReturn(true); mController.updateState(mPreference); diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java index b4823c04ea8..76dc736fa13 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java @@ -28,7 +28,6 @@ import android.widget.Button; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowLockPatternUtils; import com.android.settings.testutils.shadow.ShadowUserManager; @@ -36,13 +35,14 @@ 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; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowActivity; import org.robolectric.shadows.ShadowKeyguardManager; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowLockPatternUtils.class, ShadowUserManager.class}) public class FingerprintSuggestionActivityTest { 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 86a5f7117d6..7e971496aa7 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensorTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensorTest.java @@ -29,9 +29,6 @@ import androidx.appcompat.app.AlertDialog; import com.android.settings.R; import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; import com.android.settings.testutils.shadow.ShadowUtils; @@ -42,15 +39,11 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = { - SettingsShadowResources.SettingsShadowTheme.class, - ShadowUtils.class, - ShadowAlertDialogCompat.class, - SettingsShadowResourcesImpl.class -}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = {ShadowUtils.class, ShadowAlertDialogCompat.class}) public class SetupFingerprintEnrollFindSensorTest { @Mock diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java index a06c48d4973..d9d9197f22a 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java @@ -32,7 +32,6 @@ import com.android.settings.biometrics.BiometricEnrollIntroduction; import com.android.settings.password.SetupChooseLockGeneric.SetupChooseLockGenericFragment; import com.android.settings.password.SetupSkipDialog; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowFingerprintManager; import com.android.settings.testutils.shadow.ShadowLockPatternUtils; import com.android.settings.testutils.shadow.ShadowStorageManager; @@ -43,6 +42,7 @@ 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; import org.robolectric.annotation.Config; @@ -50,7 +50,7 @@ import org.robolectric.shadows.ShadowActivity; import org.robolectric.shadows.ShadowActivity.IntentForResult; import org.robolectric.shadows.ShadowKeyguardManager; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = { ShadowFingerprintManager.class, ShadowLockPatternUtils.class, diff --git a/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java b/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java index 0083478039c..2e8d56d08ea 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java @@ -17,23 +17,22 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import android.bluetooth.BluetoothAdapter; import android.content.Context; import android.content.Intent; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AlwaysDiscoverableTest { @Mock diff --git a/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java index 06ce13f5f1f..e57d5aa0ac9 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java @@ -30,7 +30,6 @@ import android.media.AudioManager; import com.android.settings.connecteddevice.DevicePreferenceCallback; import com.android.settings.dashboard.DashboardFragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowAudioManager; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import com.android.settings.testutils.shadow.ShadowCachedBluetoothDeviceManager; @@ -41,6 +40,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadow.api.Shadow; @@ -48,7 +48,7 @@ import org.robolectric.shadow.api.Shadow; import java.util.ArrayList; import java.util.Collection; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowAudioManager.class, ShadowBluetoothAdapter.class, ShadowCachedBluetoothDeviceManager.class}) public class AvailableMediaBluetoothDeviceUpdaterTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java index d8be01f9b78..eaa4c3cc968 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java @@ -18,11 +18,11 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -34,18 +34,15 @@ import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice; import com.android.settingslib.widget.ActionButtonsPreference; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = SettingsShadowBluetoothDevice.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothDetailsButtonsControllerTest extends BluetoothDetailsControllerTestBase { private BluetoothDetailsButtonsController mController; private ActionButtonsPreference mButtonsPref; @@ -139,7 +136,7 @@ public class BluetoothDetailsButtonsControllerTest extends BluetoothDetailsContr mController.onDeviceAttributesChanged(); verify(mButtonsPref).setButton2Text(R.string.bluetooth_device_context_disconnect); - // Click the button and make sure that disconnnect (not connect) gets called. + // Click the button and make sure that disconnect (not connect) gets called. mConnectButton.callOnClick(); verify(mCachedDevice).disconnect(); } diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java index aa3985a5f9a..36efcbdf5cc 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java @@ -16,7 +16,7 @@ package com.android.settings.bluetooth; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -26,17 +26,14 @@ import android.content.Context; import androidx.preference.PreferenceFragmentCompat; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.Config; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = SettingsShadowBluetoothDevice.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothDetailsControllerEventsTest extends BluetoothDetailsControllerTestBase { @Test diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java index 509ebc8420e..73133217229 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java @@ -30,7 +30,6 @@ import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -38,9 +37,10 @@ import org.junit.Before; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothDetailsControllerTestBase { protected Context mContext; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java index e62e338bcc5..00ae6972ce8 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java @@ -18,8 +18,8 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -34,8 +34,6 @@ import androidx.fragment.app.FragmentTransaction; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice; import com.android.settings.testutils.shadow.ShadowEntityHeaderController; import com.android.settings.widget.EntityHeaderController; import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; @@ -49,11 +47,12 @@ import org.mockito.Answers; import org.mockito.ArgumentCaptor; import org.mockito.InOrder; import org.mockito.Mock; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) -@Config(shadows = {SettingsShadowBluetoothDevice.class, ShadowEntityHeaderController.class}) +@Config(shadows = ShadowEntityHeaderController.class) public class BluetoothDetailsHeaderControllerTest extends BluetoothDetailsControllerTestBase { private BluetoothDetailsHeaderController mController; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressControllerTest.java index 4fdef8ba309..9798745f6da 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressControllerTest.java @@ -17,16 +17,13 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice; import com.android.settingslib.widget.FooterPreference; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.Config; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = SettingsShadowBluetoothDevice.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothDetailsMacAddressControllerTest extends BluetoothDetailsControllerTestBase { private BluetoothDetailsMacAddressController mController; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java index 5c4289cc82e..9577fa7b5cf 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -33,8 +33,6 @@ import androidx.preference.PreferenceCategory; import androidx.preference.SwitchPreference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice; import com.android.settings.testutils.shadow.ShadowBluetoothDevice; import com.android.settingslib.bluetooth.A2dpProfile; import com.android.settingslib.bluetooth.LocalBluetoothManager; @@ -46,6 +44,7 @@ import com.android.settingslib.bluetooth.PbapServerProfile; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import java.util.ArrayList; @@ -55,8 +54,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {SettingsShadowBluetoothDevice.class, ShadowBluetoothDevice.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowBluetoothDevice.class) public class BluetoothDetailsProfilesControllerTest extends BluetoothDetailsControllerTestBase { private BluetoothDetailsProfilesController mController; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java index 9651a899a89..21d62bc47de 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java @@ -18,7 +18,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -27,7 +27,6 @@ import android.content.Context; import android.os.Bundle; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.LocalBluetoothManager; @@ -37,9 +36,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothDeviceDetailsFragmentTest { private static final String TEST_ADDRESS = "55:66:77:88:99:AA"; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java index 5d2718c52f3..b49dc1398ca 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java @@ -18,8 +18,8 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -30,7 +30,6 @@ import android.content.Context; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import org.junit.Before; @@ -38,10 +37,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowBluetoothAdapter.class}) public class BluetoothDeviceNamePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java index 12c71936ebd..9e5b617634f 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java @@ -33,8 +33,6 @@ import android.view.ContextThemeWrapper; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; @@ -45,12 +43,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {SettingsShadowResourcesImpl.class, ShadowAlertDialogCompat.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = {ShadowAlertDialogCompat.class}) public class BluetoothDevicePreferenceTest { private static final boolean SHOW_DEVICES_WITHOUT_NAMES = true; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java index 34b2d09716b..f93c61e894b 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java @@ -33,7 +33,6 @@ import androidx.fragment.app.FragmentTransaction; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import org.junit.Before; @@ -42,11 +41,12 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadow.api.Shadow; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowBluetoothAdapter.class}) public class BluetoothDeviceRenamePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java index c93d9653511..b3205006c3c 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java @@ -17,7 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -33,7 +33,6 @@ import androidx.preference.Preference; import com.android.settings.SettingsActivity; import com.android.settings.connecteddevice.DevicePreferenceCallback; import com.android.settings.dashboard.DashboardFragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; @@ -45,6 +44,7 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadow.api.Shadow; @@ -52,7 +52,7 @@ import org.robolectric.shadow.api.Shadow; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowBluetoothAdapter.class}) public class BluetoothDeviceUpdaterTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java index fe10d3e28c8..7d5b874ef43 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java @@ -17,8 +17,8 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -37,8 +37,6 @@ import android.view.View; import androidx.preference.PreferenceViewHolder; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import com.android.settings.widget.SwitchBar; import com.android.settings.widget.SwitchBarController; @@ -54,12 +52,13 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadow.api.Shadow; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {SettingsShadowResources.SettingsShadowTheme.class, ShadowBluetoothAdapter.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowBluetoothAdapter.class) public class BluetoothEnablerTest { private static EnforcedAdmin sFakeEnforcedAdmin; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java index f9129757b52..40489983acc 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java @@ -28,17 +28,16 @@ import android.os.Bundle; import androidx.preference.Preference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothFilesPreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothNameDialogFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothNameDialogFragmentTest.java index 350ec9e3e6b..c3956d31959 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothNameDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothNameDialogFragmentTest.java @@ -20,15 +20,14 @@ import static com.google.common.truth.Truth.assertThat; import android.view.inputmethod.EditorInfo; import android.widget.TextView; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothNameDialogFragmentTest { private TestBluetoothNameDialogFragment mBluetoothNameDialogFragment; @@ -78,5 +77,4 @@ public class BluetoothNameDialogFragmentTest { return 0; } } - } diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java index 5233d840858..6da9bf471f7 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java @@ -25,20 +25,19 @@ import android.bluetooth.BluetoothDevice; import android.content.Context; import android.content.Intent; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; -import com.android.settings.testutils.shadow.ShadowBluetoothPan; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {ShadowBluetoothPan.class, ShadowBluetoothAdapter.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = {ShadowBluetoothAdapter.class}) public class BluetoothPairingControllerTest { private final BluetoothClass mBluetoothClass = new BluetoothClass(BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE); diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java index a9675668c5e..ac89b5b0027 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java @@ -18,9 +18,9 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; @@ -36,7 +36,6 @@ import android.content.res.Resources; import androidx.preference.PreferenceGroup; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import com.android.settingslib.bluetooth.BluetoothDeviceFilter; import com.android.settingslib.bluetooth.CachedBluetoothDevice; @@ -49,11 +48,12 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadow.api.Shadow; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowBluetoothAdapter.class}) public class BluetoothPairingDetailTest { private static final String TEST_DEVICE_ADDRESS = "00:A1:A1:A1:A1:A1"; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java index 7b50e213e9b..be733ec97d4 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java @@ -18,7 +18,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.fail; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -40,8 +40,6 @@ import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.FragmentActivity; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; import org.junit.Before; @@ -49,12 +47,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.androidx.fragment.FragmentController; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {ShadowAlertDialogCompat.class, SettingsShadowResourcesImpl.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowAlertDialogCompat.class) public class BluetoothPairingDialogTest { private static final String FILLER = "text that goes in a view"; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java index 27ea6be8d59..dfad37ae253 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -31,7 +31,6 @@ import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.testutils.DrawableTestHelper; import org.junit.Before; @@ -40,9 +39,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothPairingPreferenceControllerTest { private static final int ORDER = 1; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java index 369d2227dad..4deec561463 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java @@ -32,21 +32,18 @@ import androidx.slice.core.SliceAction; import androidx.slice.widget.SliceLiveData; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SliceTester; -import com.android.settings.testutils.shadow.ShadowLocalBluetoothProfileManager; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {ShadowLocalBluetoothProfileManager.class}) +@RunWith(RobolectricTestRunner.class) public class BluetoothSliceBuilderTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java index d3c195f8f43..2aca4a3d229 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java @@ -18,7 +18,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doCallRealMethod; import static org.mockito.Mockito.doReturn; @@ -30,7 +30,6 @@ import android.bluetooth.BluetoothDevice; import android.content.Context; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener; import com.android.settingslib.bluetooth.LocalBluetoothManager; @@ -41,6 +40,7 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadow.api.Shadow; @@ -48,7 +48,7 @@ import org.robolectric.shadow.api.Shadow; import java.util.HashSet; import java.util.Set; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowBluetoothAdapter.class}) public class BluetoothSummaryUpdaterTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java index e53c86e1c8b..f40cc69c523 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java @@ -23,9 +23,9 @@ import static org.mockito.Mockito.spy; import android.content.Context; import android.provider.Settings; +import android.text.TextUtils; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.utils.AnnotationSpan; import com.android.settings.widget.SwitchWidgetController; import com.android.settingslib.widget.FooterPreference; @@ -35,12 +35,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothSwitchPreferenceControllerTest { - public static final String BLUETOOTH_INFO_STRING = "When Bluetooth is turned on, your device" + private static final String BLUETOOTH_INFO_STRING = "When Bluetooth is turned on, your device" + " can communicate with other nearby Bluetooth devices."; @Mock private RestrictionUtils mRestrictionUtils; @@ -73,7 +74,7 @@ public class BluetoothSwitchPreferenceControllerTest { CharSequence text = AnnotationSpan.linkify( mContext.getText(R.string.bluetooth_scanning_on_info_message), info); - assertThat(mFooterPreference.getTitle()).isEqualTo(text); + assertThat(TextUtils.equals(mFooterPreference.getTitle(), text)).isTrue(); } @Test @@ -83,7 +84,6 @@ public class BluetoothSwitchPreferenceControllerTest { mController.updateText(false); assertThat(mFooterPreference.getTitle()).isEqualTo(BLUETOOTH_INFO_STRING); - } @Test diff --git a/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java index cbded4d9a8c..db4da4fa036 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java @@ -17,7 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -32,7 +32,6 @@ import android.media.AudioManager; import com.android.settings.connecteddevice.DevicePreferenceCallback; import com.android.settings.dashboard.DashboardFragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowAudioManager; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import com.android.settings.testutils.shadow.ShadowCachedBluetoothDeviceManager; @@ -43,6 +42,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadow.api.Shadow; @@ -50,7 +50,7 @@ import org.robolectric.shadow.api.Shadow; import java.util.ArrayList; import java.util.Collection; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowAudioManager.class, ShadowBluetoothAdapter.class, ShadowCachedBluetoothDeviceManager.class}) public class ConnectedBluetoothDeviceUpdaterTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java index 649728ec639..19de2e4b125 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java @@ -18,8 +18,8 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; @@ -32,7 +32,6 @@ import android.content.res.Resources; import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.core.AbstractPreferenceController; @@ -42,12 +41,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowBluetoothAdapter.class}) public class DeviceListPreferenceFragmentTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/DevicePickerFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/DevicePickerFragmentTest.java index 3023d71d58b..feaf6831420 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/DevicePickerFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/DevicePickerFragmentTest.java @@ -18,15 +18,14 @@ package com.android.settings.bluetooth; import static org.mockito.Mockito.verify; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DevicePickerFragmentTest { @Mock diff --git a/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java index d6d31ea05e0..44ffa5494a2 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java @@ -29,8 +29,6 @@ import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.FragmentActivity; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import org.junit.Before; @@ -40,11 +38,10 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; -import org.robolectric.annotation.Config; +import org.robolectric.RobolectricTestRunner; import org.robolectric.shadows.ShadowDialog; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = SettingsShadowResourcesImpl.class) +@RunWith(RobolectricTestRunner.class) public class ForgetDeviceDialogFragmentTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/bluetooth/LocalDeviceNameDialogFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/LocalDeviceNameDialogFragmentTest.java index b455fa2ba20..9a6ad9194ed 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/LocalDeviceNameDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/LocalDeviceNameDialogFragmentTest.java @@ -31,24 +31,24 @@ import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.FragmentActivity; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; import com.android.settingslib.bluetooth.LocalBluetoothManager; 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; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.androidx.fragment.FragmentController; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {ShadowAlertDialogCompat.class, SettingsShadowResourcesImpl.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowAlertDialogCompat.class) public class LocalDeviceNameDialogFragmentTest { @Mock @@ -73,7 +73,8 @@ public class LocalDeviceNameDialogFragmentTest { } @Test - public void diaglogTriggersShowSoftInput() { + @Ignore("b/120505691") + public void dialogTriggersShowSoftInput() { FragmentController.setupFragment(mFragment, FragmentActivity.class, 0 /* containerViewId */, null /* bundle */); AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog(); diff --git a/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java index 945d9b01553..bd7f79e96ee 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java @@ -18,8 +18,8 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -35,9 +35,6 @@ import androidx.fragment.app.FragmentActivity; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; -import com.android.settings.testutils.shadow.ShadowDynamicLayout; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import org.junit.Before; @@ -47,12 +44,11 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.annotation.Config; +import org.robolectric.RobolectricTestRunner; import org.robolectric.shadows.ShadowDialog; import org.robolectric.shadows.androidx.fragment.FragmentController; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {SettingsShadowResourcesImpl.class, ShadowDynamicLayout.class}) +@RunWith(RobolectricTestRunner.class) public class RemoteDeviceNameDialogFragmentTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java index e25e4b22744..03c713680e7 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java @@ -15,7 +15,7 @@ */ package com.android.settings.bluetooth; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -28,7 +28,6 @@ import android.content.Context; import com.android.settings.connecteddevice.DevicePreferenceCallback; import com.android.settings.dashboard.DashboardFragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import com.android.settingslib.bluetooth.CachedBluetoothDevice; @@ -37,10 +36,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowBluetoothAdapter.class}) public class SavedBluetoothDeviceUpdaterTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java b/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java index 80366e2d686..1337f6640e1 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java @@ -15,9 +15,9 @@ */ package com.android.settings.bluetooth; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -26,7 +26,6 @@ import android.content.Context; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; @@ -36,8 +35,9 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class UtilsTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java index 4f02062cc63..e2b1270867e 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java @@ -20,8 +20,7 @@ import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_ import static com.google.common.truth.Truth.assertThat; -import static junit.framework.Assert.assertTrue; - +import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.when; import android.bluetooth.BluetoothAdapter; @@ -34,7 +33,6 @@ import android.text.TextUtils; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedPreference; import org.junit.Before; @@ -42,13 +40,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplicationPackageManager; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowApplicationPackageManager.class) public class AddDevicePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java index 7190874cb24..08f937b2788 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java @@ -28,19 +28,19 @@ import android.provider.Settings; import com.android.settings.R; import com.android.settings.nfc.NfcPreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowNfcAdapter; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowNfcAdapter.class) public class AdvancedConnectedDeviceControllerTest { diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java index a1e7f222dbf..658a952012d 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java @@ -19,8 +19,6 @@ import static com.google.common.truth.Truth.assertThat; import android.provider.SearchIndexableResource; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.ShadowBluetoothPan; import com.android.settings.testutils.shadow.ShadowConnectivityManager; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settingslib.drawer.CategoryKey; @@ -29,15 +27,14 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.List; -; - -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {ShadowBluetoothPan.class, ShadowUserManager.class, +@RunWith(RobolectricTestRunner.class) +@Config(shadows = {ShadowUserManager.class, ShadowConnectivityManager.class}) public class AdvancedConnectedDeviceDashboardFragmentTest { diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java index dc2459b3304..8470ef9c252 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java @@ -21,7 +21,7 @@ import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_ import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -38,24 +38,26 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.bluetooth.AvailableMediaBluetoothDeviceUpdater; +import com.android.settings.bluetooth.Utils; import com.android.settings.dashboard.DashboardFragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowAudioManager; import com.android.settings.testutils.shadow.ShadowBluetoothUtils; import com.android.settingslib.bluetooth.BluetoothCallback; import com.android.settingslib.bluetooth.BluetoothEventManager; import com.android.settingslib.bluetooth.LocalBluetoothManager; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowAudioManager.class, ShadowBluetoothUtils.class}) public class AvailableMediaDeviceGroupControllerTest { @@ -97,7 +99,7 @@ public class AvailableMediaDeviceGroupControllerTest { doReturn(true).when(mPackageManager).hasSystemFeature(PackageManager.FEATURE_BLUETOOTH); ShadowBluetoothUtils.sLocalBluetoothManager = mLocalManager; - mLocalBluetoothManager = ShadowBluetoothUtils.getLocalBtManager(mContext); + mLocalBluetoothManager = Utils.getLocalBtManager(mContext); mAudioManager = mContext.getSystemService(AudioManager.class); doReturn(mEventManager).when(mLocalBluetoothManager).getEventManager(); @@ -107,6 +109,11 @@ public class AvailableMediaDeviceGroupControllerTest { mAvailableMediaDeviceGroupController.mPreferenceGroup = mPreferenceGroup; } + @After + public void tearDown() { + ShadowBluetoothUtils.reset(); + } + @Test public void onDeviceAdded_firstAdd_becomeVisibleAndPreferenceAdded() { mAvailableMediaDeviceGroupController.onDeviceAdded(mPreference); diff --git a/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardFragmentTest.java index e192f8969cf..e119c18c5bc 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardFragmentTest.java @@ -23,16 +23,16 @@ import android.text.TextUtils; import com.android.settings.R; import com.android.settings.search.SearchIndexableRaw; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothDashboardFragmentTest { private Context mContext; @@ -52,8 +52,6 @@ public class BluetoothDashboardFragmentTest { raw -> TextUtils.equals(raw.title, mContext.getString(R.string.bluetooth_settings))).findFirst().get(); - assertThat(fragmentResult).isNotNull(); } - } diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java index eecbca5afe2..df8776128d7 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java @@ -30,9 +30,7 @@ import android.content.pm.PackageManager; import android.provider.SearchIndexableResource; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; -import com.android.settings.testutils.shadow.ShadowBluetoothPan; import com.android.settings.testutils.shadow.ShadowConnectivityManager; import com.android.settings.testutils.shadow.ShadowUserManager; @@ -41,15 +39,17 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {ShadowBluetoothPan.class, ShadowUserManager.class, +@RunWith(RobolectricTestRunner.class) +@Config(shadows = {ShadowUserManager.class, ShadowConnectivityManager.class, ShadowBluetoothAdapter.class}) public class ConnectedDeviceDashboardFragmentTest { + @Mock private PackageManager mPackageManager; private Context mContext; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java index a752a6cbfc7..c9e2644b1b3 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java @@ -20,7 +20,7 @@ import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_ import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -38,7 +38,6 @@ import com.android.settings.bluetooth.ConnectedBluetoothDeviceUpdater; import com.android.settings.connecteddevice.dock.DockUpdater; import com.android.settings.connecteddevice.usb.ConnectedUsbDeviceUpdater; import com.android.settings.dashboard.DashboardFragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -46,12 +45,13 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplicationPackageManager; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowApplicationPackageManager.class) public class ConnectedDeviceGroupControllerTest { diff --git a/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java index 913e7d91325..3cc125b4d25 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java @@ -35,9 +35,7 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.bluetooth.AlwaysDiscoverable; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; -import com.android.settings.testutils.shadow.ShadowBluetoothPan; import com.android.settingslib.widget.FooterPreference; import com.android.settingslib.widget.FooterPreferenceMixinCompat; @@ -46,6 +44,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.annotation.Config; @@ -54,8 +53,8 @@ import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {ShadowBluetoothPan.class, ShadowBluetoothAdapter.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowBluetoothAdapter.class) public class DiscoverableFooterPreferenceControllerTest { private static final String DEVICE_NAME = "device name"; private static final String KEY = "discoverable_footer_preference"; @@ -169,7 +168,7 @@ public class DiscoverableFooterPreferenceControllerTest { * Return a list of all the registered broadcast receivers */ private List getRegisteredBroadcastReceivers() { - List registeredBroadcastReceivers = new ArrayList(); + List registeredBroadcastReceivers = new ArrayList<>(); List registeredReceivers = mShadowApplication.getRegisteredReceivers(); for (ShadowApplication.Wrapper wrapper : registeredReceivers) { diff --git a/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java index 52b2e95593c..48f734d0e72 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java @@ -35,16 +35,16 @@ import androidx.preference.PreferenceManager; import com.android.settings.bluetooth.BluetoothDeviceUpdater; import com.android.settings.connecteddevice.dock.DockUpdater; import com.android.settings.dashboard.DashboardFragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PreviouslyConnectedDevicePreferenceControllerTest { private final String KEY = "test_key"; @@ -137,5 +137,4 @@ public class PreviouslyConnectedDevicePreferenceControllerTest { assertThat(mPreferenceGroup.isVisible()).isFalse(); assertThat(mPreferenceGroup.getPreferenceCount()).isEqualTo(0); } - } diff --git a/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java index e85626df5ed..c386719e23b 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java @@ -33,7 +33,6 @@ import androidx.preference.PreferenceManager; import com.android.settings.bluetooth.BluetoothDeviceUpdater; import com.android.settings.connecteddevice.dock.DockUpdater; import com.android.settings.dashboard.DashboardFragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -42,11 +41,11 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SavedDeviceGroupControllerTest { - private static final String PREFERENCE_KEY_1 = "pref_key_1"; @Mock private DashboardFragment mDashboardFragment; @@ -54,8 +53,6 @@ public class SavedDeviceGroupControllerTest { private BluetoothDeviceUpdater mBluetoothDeviceUpdater; @Mock private DockUpdater mSavedDockUpdater; - @Mock(answer = Answers.RETURNS_DEEP_STUBS) - private PreferenceManager mPreferenceManager; @Mock private PackageManager mPackageManager; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceControllerTest.java index 8816bec88f3..f6b18a31810 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceControllerTest.java @@ -21,17 +21,17 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TopLevelConnectedDevicesPreferenceControllerTest { private Context mContext; @@ -54,7 +54,7 @@ public class TopLevelConnectedDevicesPreferenceControllerTest { private static class ShadowAdvancedConnectedDeviceController { @Implementation - public static int getConnectedDevicesSummaryResourceId(Context context) { + protected static int getConnectedDevicesSummaryResourceId(Context context) { return R.string.settings_label_launcher; } } diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdaterTest.java index 643d6b2d838..b698b3aa366 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdaterTest.java @@ -27,7 +27,6 @@ import android.hardware.usb.UsbPort; import com.android.settings.R; import com.android.settings.connecteddevice.DevicePreferenceCallback; import com.android.settings.dashboard.DashboardFragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.testutils.DrawableTestHelper; import org.junit.Before; @@ -35,9 +34,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ConnectedUsbDeviceUpdaterTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java index 9ad73bedb6e..333d2b6cc52 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java @@ -33,15 +33,14 @@ import android.net.ConnectivityManager; import android.os.UserHandle; import android.os.UserManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class UsbBackendTest { @Mock(answer = RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiverTest.java index 7317ea99216..1689ee7344d 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiverTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiverTest.java @@ -25,18 +25,17 @@ import android.hardware.usb.UsbManager; import android.hardware.usb.UsbPort; import android.hardware.usb.UsbPortStatus; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.shadows.ShadowApplication.Wrapper; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class UsbConnectionBroadcastReceiverTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java index 2c619dc4056..d8663fcde93 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java @@ -20,19 +20,15 @@ import static android.net.ConnectivityManager.TETHERING_USB; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Mockito.doNothing; +import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; -import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import android.hardware.usb.UsbManager; import android.net.ConnectivityManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUtils; import org.junit.Before; @@ -40,11 +36,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -import org.robolectric.util.FragmentTestUtil; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class UsbDefaultFragmentTest { @Mock diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java index dfd4eae7546..3eda3d1ea70 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java @@ -33,7 +33,6 @@ import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.RadioButtonPreference; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -43,9 +42,10 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class UsbDetailsDataRoleControllerTest { private UsbDetailsDataRoleController mDetailsDataRoleController; 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 679a2a9fbee..fc93a58e677 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java @@ -32,7 +32,6 @@ import android.hardware.usb.UsbManager; import android.hardware.usb.UsbPort; import android.net.ConnectivityManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUtils; import com.android.settings.widget.RadioButtonPreference; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -42,6 +41,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @@ -54,7 +54,7 @@ import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class UsbDetailsFunctionsControllerTest { private UsbDetailsFunctionsController mDetailsFunctionsController; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java index 2aa38d7188f..d72214f1afd 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java @@ -31,7 +31,6 @@ import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowEntityHeaderController; import com.android.settings.widget.EntityHeaderController; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -46,10 +45,11 @@ import org.mockito.Answers; import org.mockito.ArgumentMatcher; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowEntityHeaderController.class) public class UsbDetailsHeaderControllerTest { diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleControllerTest.java index 856ac193d22..38c92c3a2d9 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleControllerTest.java @@ -35,7 +35,6 @@ import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -44,9 +43,10 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class UsbDetailsPowerRoleControllerTest { private UsbDetailsPowerRoleController mDetailsPowerRoleController; @@ -201,7 +201,6 @@ public class UsbDetailsPowerRoleControllerTest { .isEqualTo(mContext.getString(R.string.usb_switching_failed)); } - @Test public void onClickDevice_timedOut_shouldShowFailureText() { mDetailsPowerRoleController.displayPreference(mScreen); @@ -222,7 +221,6 @@ public class UsbDetailsPowerRoleControllerTest { .isEqualTo(mContext.getString(R.string.usb_switching_failed)); } - private SwitchPreference getPreference() { return (SwitchPreference) mPreference.getPreference(0); } diff --git a/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java index 044ecc9961b..fc18f6008ad 100644 --- a/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java @@ -34,17 +34,17 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.slices.SliceData; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BasePreferenceControllerTest { private final String KEY = "fake_key"; @@ -207,9 +207,9 @@ public class BasePreferenceControllerTest { private class FakeBasePreferenceController extends BasePreferenceController { - public int mAvailable; + private int mAvailable; - public FakeBasePreferenceController(Context context, String preferenceKey) { + private FakeBasePreferenceController(Context context, String preferenceKey) { super(context, preferenceKey); mAvailable = AVAILABLE; } @@ -219,7 +219,7 @@ public class BasePreferenceControllerTest { return mAvailable; } - public void setAvailability(int availability) { + private void setAvailability(int availability) { mAvailable = availability; } } diff --git a/tests/robotests/src/com/android/settings/core/InstrumentedActivityTest.java b/tests/robotests/src/com/android/settings/core/InstrumentedActivityTest.java index 394437f9382..d74fab3ca4b 100644 --- a/tests/robotests/src/com/android/settings/core/InstrumentedActivityTest.java +++ b/tests/robotests/src/com/android/settings/core/InstrumentedActivityTest.java @@ -16,13 +16,12 @@ package com.android.settings.core; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class InstrumentedActivityTest { /** diff --git a/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java index 6f309de2298..763cf156cee 100644 --- a/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java @@ -31,16 +31,16 @@ import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class InstrumentedPreferenceFragmentTest { @Mock diff --git a/tests/robotests/src/com/android/settings/core/PreferenceControllerListHelperTest.java b/tests/robotests/src/com/android/settings/core/PreferenceControllerListHelperTest.java index 92879763fa0..68dfb7952ce 100644 --- a/tests/robotests/src/com/android/settings/core/PreferenceControllerListHelperTest.java +++ b/tests/robotests/src/com/android/settings/core/PreferenceControllerListHelperTest.java @@ -22,19 +22,19 @@ import android.content.Context; import com.android.settings.R; import com.android.settings.slices.FakePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.AbstractPreferenceController; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PreferenceControllerListHelperTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/core/PreferenceXmlParserUtilsTest.java b/tests/robotests/src/com/android/settings/core/PreferenceXmlParserUtilsTest.java index ebf325273a0..9627a489c54 100644 --- a/tests/robotests/src/com/android/settings/core/PreferenceXmlParserUtilsTest.java +++ b/tests/robotests/src/com/android/settings/core/PreferenceXmlParserUtilsTest.java @@ -34,11 +34,12 @@ import android.util.Xml; import com.android.settings.R; import com.android.settings.core.PreferenceXmlParserUtils.MetadataFlag; -import com.android.settings.testutils.SettingsRobolectricTestRunner; +import java.util.Objects; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.xmlpull.v1.XmlPullParser; @@ -54,7 +55,7 @@ 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 matchin replacement attribute. */ -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PreferenceXmlParserUtilsTest { private Context mContext; @@ -370,7 +371,14 @@ public class PreferenceXmlParserUtilsTest { while ((type = parser.next()) != XmlPullParser.END_DOCUMENT && type != XmlPullParser.START_TAG) { } - while (parser.getName() != xmlType && parser.next() != XmlPullParser.END_DOCUMENT) { + while (true) { + if (Objects.equals(parser.getName(), xmlType)) { + break; + } + final int nextEvent = parser.next(); + if (nextEvent == XmlPullParser.END_DOCUMENT) { + break; + } } } catch (Exception e) { diff --git a/tests/robotests/src/com/android/settings/core/SettingsSliderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/SettingsSliderPreferenceControllerTest.java index 3bcc2a2f3ff..ba9cd5d8a22 100644 --- a/tests/robotests/src/com/android/settings/core/SettingsSliderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/core/SettingsSliderPreferenceControllerTest.java @@ -19,15 +19,15 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import com.android.settings.slices.SliceData; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.SeekBarPreference; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SettingsSliderPreferenceControllerTest { private FakeSliderPreferenceController mSliderController; @@ -65,8 +65,7 @@ public class SettingsSliderPreferenceControllerTest { @Test public void testSliceType_returnsSliceType() { - assertThat(mSliderController.getSliceType()).isEqualTo( - SliceData.SliceType.SLIDER); + assertThat(mSliderController.getSliceType()).isEqualTo(SliceData.SliceType.SLIDER); } private class FakeSliderPreferenceController extends SliderPreferenceController { @@ -74,7 +73,7 @@ public class SettingsSliderPreferenceControllerTest { private final int MAX_STEPS = 2112; private int mPosition; - public FakeSliderPreferenceController(Context context, String key) { + private FakeSliderPreferenceController(Context context, String key) { super(context, key); } diff --git a/tests/robotests/src/com/android/settings/core/SliderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/SliderPreferenceControllerTest.java index c57c384ab19..dbe7a14bb68 100644 --- a/tests/robotests/src/com/android/settings/core/SliderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/core/SliderPreferenceControllerTest.java @@ -21,14 +21,14 @@ import android.content.Context; import androidx.preference.SeekBarPreference; import com.android.settings.slices.SliceData; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SliderPreferenceControllerTest { private FakeSlider mSliderController; @@ -64,8 +64,7 @@ public class SliderPreferenceControllerTest { @Test public void testSliceType_returnsSliceType() { - assertThat(mSliderController.getSliceType()).isEqualTo( - SliceData.SliceType.SLIDER); + assertThat(mSliderController.getSliceType()).isEqualTo(SliceData.SliceType.SLIDER); } private class FakeSlider extends SliderPreferenceController { @@ -73,7 +72,7 @@ public class SliderPreferenceControllerTest { private final int MAX_STEPS = 2112; private int mPosition; - public FakeSlider(Context context, String key) { + private FakeSlider(Context context, String key) { super(context, key); } diff --git a/tests/robotests/src/com/android/settings/core/SubSettingLauncherTest.java b/tests/robotests/src/com/android/settings/core/SubSettingLauncherTest.java index d33d3fefc16..8f9c33142d7 100644 --- a/tests/robotests/src/com/android/settings/core/SubSettingLauncherTest.java +++ b/tests/robotests/src/com/android/settings/core/SubSettingLauncherTest.java @@ -34,7 +34,6 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; import com.android.settings.SettingsActivity; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import org.junit.Before; @@ -43,9 +42,10 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SubSettingLauncherTest { @Mock diff --git a/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java index 53fe9a8b454..7cda34a16ad 100644 --- a/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java @@ -22,20 +22,20 @@ import android.content.Context; import androidx.preference.SwitchPreference; import com.android.settings.slices.SliceData; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TogglePreferenceControllerTest { - FakeToggle mToggleController; + private FakeToggle mToggleController; - Context mContext; - SwitchPreference mPreference; + private Context mContext; + private SwitchPreference mPreference; @Before public void setUp() { @@ -94,7 +94,7 @@ public class TogglePreferenceControllerTest { private boolean checkedFlag; - public FakeToggle(Context context, String preferenceKey) { + private FakeToggle(Context context, String preferenceKey) { super(context, preferenceKey); } diff --git a/tests/robotests/src/com/android/settings/core/XmlControllerAttributeTest.java b/tests/robotests/src/com/android/settings/core/XmlControllerAttributeTest.java index 078393f0df9..9373edabab0 100644 --- a/tests/robotests/src/com/android/settings/core/XmlControllerAttributeTest.java +++ b/tests/robotests/src/com/android/settings/core/XmlControllerAttributeTest.java @@ -16,11 +16,11 @@ import com.android.settings.search.SearchFeatureProvider; import com.android.settings.search.SearchFeatureProviderImpl; import com.android.settings.security.SecuritySettings; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.xmlpull.v1.XmlPullParser; @@ -32,7 +32,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class XmlControllerAttributeTest { // List of classes that are too hard to mock in order to retrieve xml information. @@ -53,8 +53,8 @@ public class XmlControllerAttributeTest { private static final String BAD_CLASSNAME_ERROR = "The following controllers set in the XML did not have valid class names:\n"; - Context mContext; - SearchFeatureProvider mSearchProvider; + private Context mContext; + private SearchFeatureProvider mSearchProvider; @Before public void setUp() { @@ -64,7 +64,7 @@ public class XmlControllerAttributeTest { } @Test - public void testAllIndexableXML_onlyValidBasePreferenceControllersAdded() { + public void testAllIndexableXML_onlyValidBasePreferenceControllersAdded() throws Exception { Set xmlSet = getIndexableXml(); xmlSet.addAll(whitelistXml); @@ -140,37 +140,34 @@ public class XmlControllerAttributeTest { return xmlResSet; } - private List getXmlControllers(int xmlResId) { + private List getXmlControllers(int xmlResId) throws Exception { List xmlControllers = new ArrayList<>(); XmlResourceParser parser; - try { - parser = mContext.getResources().getXml(xmlResId); + parser = mContext.getResources().getXml(xmlResId); + + int type; + while ((type = parser.next()) != XmlPullParser.END_DOCUMENT + && type != XmlPullParser.START_TAG) { + // Parse next until start tag is found + } - int type; - while ((type = parser.next()) != XmlPullParser.END_DOCUMENT - && type != XmlPullParser.START_TAG) { - // Parse next until start tag is found + final int outerDepth = parser.getDepth(); + final AttributeSet attrs = Xml.asAttributeSet(parser); + String controllerClassName; + while ((type = parser.next()) != XmlPullParser.END_DOCUMENT + && (type != XmlPullParser.END_TAG || parser.getDepth() > outerDepth)) { + if (type == XmlPullParser.END_TAG || type == XmlPullParser.TEXT) { + continue; } - final int outerDepth = parser.getDepth(); - final AttributeSet attrs = Xml.asAttributeSet(parser); - String controllerClassName; - while ((type = parser.next()) != XmlPullParser.END_DOCUMENT - && (type != XmlPullParser.END_TAG || parser.getDepth() > outerDepth)) { - if (type == XmlPullParser.END_TAG || type == XmlPullParser.TEXT) { - continue; - } - - controllerClassName = PreferenceXmlParserUtils.getController(mContext, attrs); - // If controller is not indexed, then it is not compatible with - if (!TextUtils.isEmpty(controllerClassName)) { - xmlControllers.add(controllerClassName); - } + controllerClassName = PreferenceXmlParserUtils.getController(mContext, attrs); + // If controller is not indexed, then it is not compatible with + if (!TextUtils.isEmpty(controllerClassName)) { + xmlControllers.add(controllerClassName); } - } catch (Exception e) { - // Assume an issue with robolectric resources } + return xmlControllers; } diff --git a/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java b/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java index 4ddf53fe595..4062bfb8f6a 100644 --- a/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java +++ b/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java @@ -22,19 +22,19 @@ import com.android.settings.core.BasePreferenceControllerSignatureInspector; import com.android.settings.core.instrumentation.InstrumentableFragmentCodeInspector; import com.android.settings.search.SearchIndexProviderCodeInspector; import com.android.settings.slices.SliceControllerInXmlCodeInspector; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import java.util.List; +import org.robolectric.RobolectricTestRunner; /** * Test suite that scans all classes in app package, and performs different types of code inspection * for conformance. */ -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class CodeInspectionTest { private List> mClasses; diff --git a/tests/robotests/src/com/android/settings/core/codeinspection/LifecycleObserverCodeInspector.java b/tests/robotests/src/com/android/settings/core/codeinspection/LifecycleObserverCodeInspector.java index d08a460b280..988afe6bb59 100644 --- a/tests/robotests/src/com/android/settings/core/codeinspection/LifecycleObserverCodeInspector.java +++ b/tests/robotests/src/com/android/settings/core/codeinspection/LifecycleObserverCodeInspector.java @@ -16,7 +16,7 @@ package com.android.settings.core.codeinspection; -import static junit.framework.Assert.fail; +import static org.junit.Assert.fail; import android.util.ArraySet; diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentedDialogFragmentTest.java b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentedDialogFragmentTest.java index 644f2497eee..c7557a2652b 100644 --- a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentedDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentedDialogFragmentTest.java @@ -19,15 +19,14 @@ import static com.google.common.truth.Truth.assertThat; import android.os.Bundle; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class InstrumentedDialogFragmentTest { public static class TestDialogFragment extends InstrumentedDialogFragment { diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java b/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java index 17fa381c872..9b1c4110b6a 100644 --- a/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java +++ b/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java @@ -20,16 +20,16 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import com.android.settings.overlay.FeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class MetricsFeatureProviderTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/dashboard/CategoryManagerTest.java b/tests/robotests/src/com/android/settings/dashboard/CategoryManagerTest.java index d8fb65df4e0..0de212d73d0 100644 --- a/tests/robotests/src/com/android/settings/dashboard/CategoryManagerTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/CategoryManagerTest.java @@ -27,7 +27,6 @@ import android.content.pm.ApplicationInfo; import android.os.Bundle; import android.util.Pair; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.drawer.CategoryKey; import com.android.settingslib.drawer.DashboardCategory; import com.android.settingslib.drawer.Tile; @@ -35,13 +34,13 @@ import com.android.settingslib.drawer.Tile; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.shadows.ShadowApplication; import java.util.HashMap; import java.util.Map; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class CategoryManagerTest { private ActivityInfo mActivityInfo; diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java index 3ada961244d..2aa6ae22ff8 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java @@ -26,9 +26,9 @@ import static com.android.settingslib.drawer.TileUtils.PROFILE_PRIMARY; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -55,7 +55,6 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowThreadUtils; import com.android.settings.testutils.shadow.ShadowTileUtils; import com.android.settings.testutils.shadow.ShadowUserManager; @@ -71,6 +70,7 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.annotation.Config; @@ -79,7 +79,7 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowUserManager.class) public class DashboardFeatureProviderImplTest { diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentRegistryTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentRegistryTest.java index 1f68e2f04ec..c6b24658dbd 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentRegistryTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentRegistryTest.java @@ -18,12 +18,11 @@ package com.android.settings.dashboard; import static com.google.common.truth.Truth.assertThat; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DashboardFragmentRegistryTest { @Test public void pageAndKeyShouldHave1to1Mapping() { diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java index 12154636b05..afbb658f9ec 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java @@ -39,7 +39,6 @@ import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin; @@ -51,13 +50,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DashboardFragmentTest { @Mock diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java index d5636a16d5b..8b4686bfc9a 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java @@ -19,7 +19,7 @@ package com.android.settings.dashboard; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Answers.RETURNS_DEEP_STUBS; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.when; import android.content.Context; @@ -27,16 +27,15 @@ import android.content.Context; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DashboardTilePlaceholderPreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java b/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java index 3726fb4d2bd..9a5bef21fe8 100644 --- a/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java @@ -29,7 +29,6 @@ import android.content.pm.ActivityInfo; import android.os.Bundle; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.drawer.CategoryKey; import com.android.settingslib.drawer.DashboardCategory; import com.android.settingslib.drawer.Tile; @@ -39,9 +38,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SummaryLoaderTest { private static final String SUMMARY_1 = "summary1"; diff --git a/tests/robotests/src/com/android/settings/dashboard/profileselector/ProfileSelectDialogTest.java b/tests/robotests/src/com/android/settings/dashboard/profileselector/ProfileSelectDialogTest.java index 8d7f841fe49..2aee0dd347f 100644 --- a/tests/robotests/src/com/android/settings/dashboard/profileselector/ProfileSelectDialogTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/profileselector/ProfileSelectDialogTest.java @@ -29,7 +29,6 @@ import android.content.pm.UserInfo; import android.os.UserHandle; import android.os.UserManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.drawer.CategoryKey; import com.android.settingslib.drawer.Tile; @@ -38,8 +37,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ProfileSelectDialogTest { private static final UserHandle NORMAL_USER = UserHandle.of(1111); @@ -62,7 +62,6 @@ public class ProfileSelectDialogTest { mActivityInfo = new ActivityInfo(); mActivityInfo.packageName = "pkg"; mActivityInfo.name = "cls"; - } @Test diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java index 3c97f489360..4bc4e79ab86 100644 --- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java @@ -28,29 +28,24 @@ import android.hardware.fingerprint.FingerprintManager; import android.service.settings.suggestions.Suggestion; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settings.testutils.shadow.ShadowSecureSettings; -import com.android.settingslib.suggestions.SuggestionControllerMixinCompat; -import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowSecureSettings.class) public class SuggestionFeatureProviderImplTest { @Mock private Context mContext; @Mock - private SuggestionControllerMixinCompat mSuggestionControllerMixin; - @Mock private Suggestion mSuggestion; @Mock private ActivityManager mActivityManager; @@ -60,13 +55,12 @@ public class SuggestionFeatureProviderImplTest { private FingerprintManager mFingerprintManager; private ActivityInfo mActivityInfo; - private FakeFeatureFactory mFactory; private SuggestionFeatureProviderImpl mProvider; @Before public void setUp() { MockitoAnnotations.initMocks(this); - mFactory = FakeFeatureFactory.setupForTest(); + FakeFeatureFactory.setupForTest(); mActivityInfo = new ActivityInfo(); mActivityInfo.packageName = "pkg"; mActivityInfo.name = "class"; @@ -82,11 +76,6 @@ public class SuggestionFeatureProviderImplTest { mProvider = new SuggestionFeatureProviderImpl(mContext); } - @After - public void tearDown() { - SettingsShadowResources.reset(); - } - @Test public void getSuggestionServiceComponentName_shouldReturnAndroidPackage() { assertThat(mProvider.getSuggestionServiceComponent().getPackageName()) diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionStateProviderTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionStateProviderTest.java index 3a827960a32..9a9adf49e00 100644 --- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionStateProviderTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionStateProviderTest.java @@ -18,7 +18,7 @@ package com.android.settings.dashboard.suggestions; import static android.content.Intent.EXTRA_COMPONENT_NAME; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; import android.content.ComponentName; @@ -26,15 +26,15 @@ import android.content.Context; import android.os.Bundle; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SuggestionStateProviderTest { private SuggestionStateProvider mProvider; diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java index 99a3629c05a..15f6c45f7a8 100644 --- a/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java @@ -23,7 +23,6 @@ import static org.mockito.Mockito.when; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.AppItem; import com.android.settingslib.net.UidDetail; import com.android.settingslib.net.UidDetailProvider; @@ -33,9 +32,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppDataUsagePreferenceTest { @Mock diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java index 333c706ffe1..37bb3cdfbc5 100644 --- a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java +++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java @@ -16,11 +16,10 @@ package com.android.settings.datausage; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; @@ -41,7 +40,6 @@ import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowEntityHeaderController; import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal; import com.android.settings.widget.EntityHeaderController; @@ -57,6 +55,7 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; @@ -64,7 +63,7 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowEntityHeaderController.class, ShadowRestrictedLockUtilsInternal.class}) public class AppDataUsageTest { @@ -105,8 +104,8 @@ public class AppDataUsageTest { } @Test - public void bindAppHeader_workApp_shouldSetWorkAppUid() throws - PackageManager.NameNotFoundException { + public void bindAppHeader_workApp_shouldSetWorkAppUid() + throws PackageManager.NameNotFoundException { final int fakeUserId = 100; mFragment = spy(new AppDataUsage()); diff --git a/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java b/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java index e3034f88c21..5efeaf256ee 100644 --- a/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java +++ b/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java @@ -18,8 +18,8 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -31,16 +31,15 @@ import android.util.ArraySet; import androidx.preference.Preference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppPrefLoaderTest { @Mock diff --git a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java index 1560af3261b..33ae0645d45 100644 --- a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java +++ b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java @@ -18,12 +18,12 @@ package com.android.settings.datausage; import static android.net.NetworkPolicy.CYCLE_NONE; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.nullable; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -45,7 +45,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceManager; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.NetworkPolicyEditor; import com.android.settingslib.widget.FooterPreference; import com.android.settingslib.widget.FooterPreferenceMixinCompat; @@ -55,19 +54,20 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BillingCycleSettingsTest { private static final int LIMIT_BYTES = 123; @Mock - BillingCycleSettings mMockBillingCycleSettings; - BillingCycleSettings.ConfirmLimitFragment mConfirmLimitFragment; + private BillingCycleSettings mMockBillingCycleSettings; + private BillingCycleSettings.ConfirmLimitFragment mConfirmLimitFragment; @Mock - PreferenceManager mMockPreferenceManager; + private PreferenceManager mMockPreferenceManager; @Mock private NetworkPolicyEditor mNetworkPolicyEditor; @Mock @@ -87,7 +87,7 @@ public class BillingCycleSettingsTest { @Mock private SwitchPreference mEnableDataLimit; - SharedPreferences mSharedPreferences; + private SharedPreferences mSharedPreferences; @Before public void setUp() { @@ -167,5 +167,4 @@ public class BillingCycleSettingsTest { assertThat(billingCycleSettings.mNetworkTemplate).isNotNull(); } - } \ No newline at end of file diff --git a/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java index 744096622fd..9b14e192c2d 100644 --- a/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java @@ -29,16 +29,15 @@ import android.widget.LinearLayout; import androidx.preference.PreferenceViewHolder; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class CellDataPreferenceTest { @Mock @@ -72,8 +71,7 @@ public class CellDataPreferenceTest { mListener.onSubscriptionsChanged(); assertThat(mPreference.isEnabled()).isFalse(); - when(mSubscriptionManager.getActiveSubscriptionInfo(anyInt())) - .thenReturn(mSubInfo); + when(mSubscriptionManager.getActiveSubscriptionInfo(anyInt())).thenReturn(mSubInfo); mListener.onSubscriptionsChanged(); assertThat(mPreference.isEnabled()).isTrue(); } diff --git a/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java index 0f9aed118e7..39bf9cfa412 100644 --- a/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java @@ -23,7 +23,6 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.util.SparseIntArray; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.UsageView; import com.android.settingslib.net.NetworkCycleChartData; import com.android.settingslib.net.NetworkCycleData; @@ -33,13 +32,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ChartDataUsagePreferenceTest { // Test cycle start date, 20 Mar 2018 22:00: GMT diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java index fcbffbeaf5a..6c892019433 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java @@ -5,14 +5,14 @@ import static com.google.common.truth.Truth.assertThat; import android.net.NetworkPolicy; import android.net.NetworkTemplate; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.net.DataUsageController.DataUsageInfo; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DataUsageInfoControllerTest { private static final int NEGATIVE = -1; diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java index 7a10d708b86..427550cdd6a 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java @@ -32,7 +32,6 @@ import android.os.Bundle; import android.provider.Settings; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.NetworkPolicyEditor; import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin; @@ -41,12 +40,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.util.ReflectionHelpers; import androidx.fragment.app.FragmentActivity; import androidx.preference.PreferenceManager; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DataUsageListTest { @Mock diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsagePreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsagePreferenceTest.java index 151bc7dfa83..ff8ef9327e7 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsagePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsagePreferenceTest.java @@ -16,7 +16,7 @@ package com.android.settings.datausage; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -26,7 +26,6 @@ import android.content.Context; import android.content.Intent; import android.net.NetworkTemplate; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.net.DataUsageController; import org.junit.Before; @@ -34,9 +33,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DataUsagePreferenceTest { @Mock @@ -52,7 +52,6 @@ public class DataUsagePreferenceTest { mContext = RuntimeEnvironment.application; mPreference = spy(new DataUsagePreference(mContext, null /* attrs */)); doReturn(mController).when(mPreference).getDataUsageController(); - } @Test diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java index 517154867c5..d1cb63ed177 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java @@ -23,7 +23,7 @@ import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_U import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -44,7 +44,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowEntityHeaderController; import com.android.settings.widget.EntityHeaderController; import com.android.settingslib.NetworkPolicyEditor; @@ -60,12 +59,13 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.concurrent.TimeUnit; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowEntityHeaderController.class) public class DataUsageSummaryPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java index 855e40bb948..ae11954d838 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java @@ -42,8 +42,6 @@ import androidx.preference.PreferenceViewHolder; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.SubSettings; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settingslib.Utils; import org.junit.Before; @@ -51,14 +49,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.Shadows; -import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowActivity; import java.util.concurrent.TimeUnit; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = SettingsShadowResourcesImpl.class) +@RunWith(RobolectricTestRunner.class) public class DataUsageSummaryPreferenceTest { private static final long CYCLE_DURATION_MILLIS = 1000000000L; @@ -356,7 +353,6 @@ public class DataUsageSummaryPreferenceTest { assertThat(mProgressBar.getVisibility()).isEqualTo(View.VISIBLE); } - @Test public void testSetProgress_updatesProgressBar() { setValidLabels(); diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java index d52793e4057..66f916e9962 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java @@ -18,10 +18,10 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.endsWith; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.endsWith; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; @@ -35,34 +35,29 @@ import android.net.NetworkPolicyManager; import androidx.fragment.app.FragmentActivity; import com.android.settings.dashboard.SummaryLoader; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowDashboardFragment; import com.android.settings.testutils.shadow.ShadowDataUsageUtils; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settings.testutils.shadow.ShadowUtils; -import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; @Config(shadows = { - SettingsShadowResourcesImpl.class, - SettingsShadowResources.SettingsShadowTheme.class, ShadowUtils.class, ShadowDataUsageUtils.class, ShadowDashboardFragment.class, ShadowUserManager.class, }) -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DataUsageSummaryTest { @Mock @@ -97,8 +92,6 @@ public class DataUsageSummaryTest { @Test public void formatUsage_shouldLookLikeFormatFileSize() { - SettingsShadowResources.overrideResource(com.android.internal.R.string.fileSizeSuffix, - "%1$s %2$s"); final long usage = 2147483648L; // 2GB final String formattedUsage = DataUsageSummary.formatUsage(mContext, "^1", usage).toString(); diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java index 4bd584e7e91..aa5db229957 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java @@ -18,9 +18,9 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -30,17 +30,16 @@ import android.net.ConnectivityManager; import android.telephony.TelephonyManager; import android.util.DataUnit; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public final class DataUsageUtilsTest { @Mock diff --git a/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceControllerTest.java index 983b96d8fb2..84dc7393638 100644 --- a/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceControllerTest.java @@ -19,8 +19,8 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; @@ -41,7 +41,6 @@ import com.android.settings.R; import com.android.settings.applications.AppStateBaseBridge; import com.android.settings.datausage.AppStateDataUsageBridge.DataUsageState; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowRestrictedLockUtils; import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal; import com.android.settingslib.applications.ApplicationsState; @@ -52,6 +51,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implements; @@ -59,7 +59,7 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = { ShadowRestrictedLockUtils.class, ShadowRestrictedLockUtilsInternal.class, diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java index f1795f3d0e6..183858e7eea 100644 --- a/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java @@ -25,20 +25,19 @@ import android.text.format.DateFormat; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import java.util.List; import java.util.Locale; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AutoTimeFormatPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java index 4d1ba380a5e..f75c04ca9e4 100644 --- a/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java @@ -23,7 +23,6 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.provider.Settings; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedSwitchPreference; import org.junit.Before; @@ -31,9 +30,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AutoTimePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java index 11b2efdfc07..8a68f38fcfe 100644 --- a/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java @@ -27,7 +27,6 @@ import android.provider.Settings; import androidx.preference.Preference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowConnectivityManager; import org.junit.Before; @@ -35,10 +34,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowConnectivityManager.class) public class AutoTimeZonePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java index 0f5e0880b95..e0770aa8c57 100644 --- a/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java @@ -24,7 +24,6 @@ import static org.mockito.Mockito.when; import android.app.AlarmManager; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedPreference; import org.junit.Before; @@ -32,9 +31,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DatePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java b/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java index ee495d361f6..270b8741185 100644 --- a/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java +++ b/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java @@ -25,7 +25,6 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.content.Intent; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; @@ -35,9 +34,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TimeChangeListenerMixinTest { @Mock diff --git a/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java index 5180455fc49..ec47a5496b5 100644 --- a/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java @@ -18,8 +18,6 @@ package com.android.settings.datetime; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Answers.RETURNS_DEEP_STUBS; - import android.content.Context; import android.content.Intent; import android.provider.Settings; @@ -27,23 +25,20 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TimeFormatPreferenceControllerTest { - @Mock(answer = RETURNS_DEEP_STUBS) - private PreferenceScreen mScreen; @Mock private UpdateTimeAndDateCallback mCallback; diff --git a/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java index d73c8db54f1..07975e3f0c2 100644 --- a/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java @@ -23,7 +23,6 @@ import static org.mockito.Mockito.when; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedPreference; import org.junit.Before; @@ -31,9 +30,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TimePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java index a8c09f26006..f94e8d1aa54 100644 --- a/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java @@ -24,7 +24,6 @@ import static org.mockito.Mockito.when; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedPreference; import org.junit.Before; @@ -32,9 +31,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TimeZonePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapterTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapterTest.java index 365bfa2a33c..4f23b60c38d 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapterTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapterTest.java @@ -20,8 +20,6 @@ import static com.google.common.truth.Truth.assertThat; import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; @@ -30,8 +28,9 @@ import java.util.List; import java.util.Locale; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BaseTimeZoneAdapterTest { @Test @@ -48,7 +47,7 @@ public class BaseTimeZoneAdapterTest { items.add(secretCountry); TestTimeZoneAdapter adapter = new TestTimeZoneAdapter(items); - assertSearch(adapter, "", items.toArray(new TestItem[items.size()])); + assertSearch(adapter, "", items.toArray(new TestItem[0])); assertSearch(adapter, "Unit", US, UK); assertSearch(adapter, "kon", HK); assertSearch(adapter, "brit", UK); @@ -71,7 +70,7 @@ public class BaseTimeZoneAdapterTest { private final CountDownLatch mLatch = new CountDownLatch(1); private final TestTimeZoneAdapter mAdapter; - public Observer(TestTimeZoneAdapter adapter) { + private Observer(TestTimeZoneAdapter adapter) { mAdapter = adapter; mAdapter.registerAdapterDataObserver(this); } @@ -82,14 +81,14 @@ public class BaseTimeZoneAdapterTest { mLatch.countDown(); } - public void await() throws InterruptedException { + private void await() throws InterruptedException { mLatch.await(2L, TimeUnit.SECONDS); } } private static class TestTimeZoneAdapter extends BaseTimeZoneAdapter { - public TestTimeZoneAdapter(List items) { + private TestTimeZoneAdapter(List items) { super(items, position -> {}, Locale.US, false /* showItemSummary */, null /* headerText */); } diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPickerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPickerTest.java index daa46a54ee1..c892be84ee0 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPickerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPickerTest.java @@ -22,12 +22,12 @@ import android.content.Context; import android.icu.util.TimeZone; import com.android.settings.datetime.timezone.model.TimeZoneData; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.google.common.truth.Truth; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; @@ -37,16 +37,16 @@ import java.util.Arrays; import java.util.List; import java.util.Locale; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = { BaseTimeZoneInfoPickerTest.ShadowDataFormat.class }) public class BaseTimeZoneInfoPickerTest { @Implements(android.text.format.DateFormat.class) public static class ShadowDataFormat { - public static String sTimeFormatString = ""; + private static String sTimeFormatString = ""; @Implementation - public static String getTimeFormatString(Context context) { + protected static String getTimeFormatString(Context context) { return sTimeFormatString; } } @@ -76,7 +76,7 @@ public class BaseTimeZoneInfoPickerTest { public static class TestBaseTimeZoneInfoPicker extends BaseTimeZoneInfoPicker { - public TestBaseTimeZoneInfoPicker() { + private TestBaseTimeZoneInfoPicker() { super(0, 0, false, false); } 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 06d2b2bca7d..865c2eba383 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceControllerTest.java @@ -23,14 +23,13 @@ import android.content.Context; import androidx.preference.Preference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BaseTimeZonePreferenceControllerTest { private Activity mActivity; @@ -68,7 +67,7 @@ public class BaseTimeZonePreferenceControllerTest { private final Preference mTestPreference; - public TestPreferenceController(Context context, String preferenceKey) { + private TestPreferenceController(Context context, String preferenceKey) { super(context, preferenceKey); mTestPreference = new Preference(context); mTestPreference.setKey(preferenceKey); @@ -76,7 +75,7 @@ public class BaseTimeZonePreferenceControllerTest { } private static class TestPreference extends Preference { - public TestPreference(Context context, String preferenceKey) { + private TestPreference(Context context, String preferenceKey) { super(context); setKey(preferenceKey); } @@ -91,9 +90,8 @@ public class BaseTimeZonePreferenceControllerTest { isClicked = true; } - public boolean isClicked() { + private boolean isClicked() { return isClicked; } - } } diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java index d7a54dbe215..1207621cc3e 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java @@ -25,13 +25,13 @@ import android.content.Context; import com.android.settings.datetime.timezone.BaseTimeZoneAdapter.AdapterItem; import com.android.settings.datetime.timezone.model.TimeZoneData; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import libcore.timezone.CountryZonesFinder; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.Collections; @@ -39,14 +39,14 @@ import java.util.List; import java.util.Locale; import java.util.stream.Collectors; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FixedOffsetPickerTest { private CountryZonesFinder mFinder; @Before public void setUp() { - List regionList = Collections.emptyList(); + List regionList = Collections.emptyList(); mFinder = mock(CountryZonesFinder.class); when(mFinder.lookupAllCountryIsoCodes()).thenReturn(regionList); } 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 6802e8aa30a..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,14 +23,13 @@ import android.icu.util.TimeZone; import androidx.preference.Preference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FixedOffsetPreferenceControllerTest { private Activity mActivity; 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 f33311523dc..ea0be2458d6 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/RegionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/RegionPreferenceControllerTest.java @@ -22,14 +22,13 @@ import android.app.Activity; import androidx.preference.Preference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RegionPreferenceControllerTest { private Activity mActivity; @@ -47,6 +46,5 @@ public class RegionPreferenceControllerTest { controller.updateState(preference); assertThat(controller.getSummary()).isEqualTo("United States"); assertThat(preference.getSummary()).isEqualTo("United States"); - } } 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 08759a2303a..c0553a58ac5 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java @@ -32,13 +32,13 @@ 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.testutils.SettingsRobolectricTestRunner; import libcore.timezone.CountryZonesFinder; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; @@ -49,7 +49,7 @@ import java.util.Arrays; import java.util.List; import java.util.Locale; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = { RegionSearchPickerTest.ShadowBaseTimeZonePicker.class, RegionSearchPickerTest.ShadowFragment.class, @@ -59,7 +59,7 @@ public class RegionSearchPickerTest { @Test public void createAdapter_matchRegionName() { - List regionList = new ArrayList(); + List regionList = new ArrayList<>(); regionList.add("US"); CountryZonesFinder finder = mock(CountryZonesFinder.class); when(finder.lookupAllCountryIsoCodes()).thenReturn(regionList); @@ -78,7 +78,7 @@ public class RegionSearchPickerTest { // http://b/75322108 @Test public void clickItemView_duringRegionSearch_shouldNotCrash() { - List regionList = new ArrayList(); + List regionList = new ArrayList<>(); regionList.add("US"); CountryZonesFinder finder = mock(CountryZonesFinder.class); when(finder.lookupAllCountryIsoCodes()).thenReturn(regionList); diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePickerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePickerTest.java index 220e677f907..dd734bb6c62 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePickerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePickerTest.java @@ -22,7 +22,6 @@ import android.icu.text.Collator; import com.android.settings.datetime.timezone.RegionZonePicker.TimeZoneInfoComparator; import com.android.settings.datetime.timezone.TimeZoneInfo.Formatter; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Test; import org.junit.runner.RunWith; @@ -32,8 +31,9 @@ import java.util.Collections; import java.util.Date; import java.util.List; import java.util.Locale; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RegionZonePickerTest { @Test @@ -53,5 +53,4 @@ public class RegionZonePickerTest { Collections.sort(list, comparator); assertThat(list).isEqualTo(Arrays.asList(timeZone1, timeZone2, timeZone3, timeZone4)); } - } 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 3c98985c12b..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,14 +23,13 @@ import android.icu.util.TimeZone; import androidx.preference.Preference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RegionZonePreferenceControllerTest { private Activity mActivity; @@ -59,6 +58,5 @@ public class RegionZonePreferenceControllerTest { assertThat(controller.getSummary().toString()).isEqualTo(expectedSummary); assertThat(preference.getSummary().toString()).isEqualTo(expectedSummary); assertThat(preference.isEnabled()).isFalse(); - } } diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/SpannableUtilTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/SpannableUtilTest.java index 4793118b955..b9a3056ae91 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/SpannableUtilTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/SpannableUtilTest.java @@ -21,13 +21,13 @@ import static com.google.common.truth.Truth.assertThat; import android.text.Spannable; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SpannableUtilTest { @Test diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceControllerTest.java index 948a92725a2..5bbd01e2fad 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceControllerTest.java @@ -22,16 +22,16 @@ import static org.mockito.Mockito.spy; import androidx.preference.Preference; import com.android.settings.datetime.timezone.TimeZoneInfo.Formatter; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.Date; import java.util.Locale; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TimeZoneInfoPreferenceControllerTest { @Test diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoTest.java index 32975bc1f05..fd8b81f5c0e 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoTest.java @@ -19,15 +19,15 @@ package com.android.settings.datetime.timezone; import static com.google.common.truth.Truth.assertThat; import com.android.settings.datetime.timezone.TimeZoneInfo.Formatter; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Test; import org.junit.runner.RunWith; import java.util.Date; import java.util.Locale; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TimeZoneInfoTest { @Test diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneSettingsTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneSettingsTest.java index 51d4a4b53a1..f0f304b733d 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneSettingsTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneSettingsTest.java @@ -22,24 +22,18 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import com.android.settings.datetime.timezone.model.TimeZoneData; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settingslib.core.AbstractPreferenceController; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import java.util.Arrays; import java.util.HashSet; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = { - SettingsShadowResources.class, - SettingsShadowResources.SettingsShadowTheme.class, - }) +@RunWith(RobolectricTestRunner.class) public class TimeZoneSettingsTest { @Test diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java index 0310c76dff9..253b537ab92 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java @@ -21,8 +21,6 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import libcore.timezone.CountryTimeZones; import libcore.timezone.CountryTimeZones.TimeZoneMapping; import libcore.timezone.CountryZonesFinder; @@ -34,8 +32,9 @@ import org.junit.runner.RunWith; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TimeZoneDataTest { private CountryZonesFinder mCountryZonesFinder; diff --git a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java index b6a93227262..19ecc5444d1 100644 --- a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java @@ -11,7 +11,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Ignore; @@ -19,10 +18,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AutomaticStorageManagerDescriptionPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java index 073078b4654..bd067441802 100644 --- a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java @@ -18,8 +18,8 @@ package com.android.settings.deletionhelper; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -34,7 +34,6 @@ import androidx.preference.Preference; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.SwitchBar; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; @@ -44,9 +43,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AutomaticStorageManagerSwitchBarControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java index 2ed09420765..bc495f65886 100644 --- a/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java @@ -35,7 +35,6 @@ import androidx.lifecycle.LifecycleOwner; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -43,9 +42,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AbstractBluetoothA2dpPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java index e472dbb14a7..2e63f5a4e63 100644 --- a/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java @@ -24,22 +24,20 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; -import android.os.UserManager; import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AdbPreferenceControllerTest { @Mock @@ -47,8 +45,6 @@ public class AdbPreferenceControllerTest { @Mock private PreferenceScreen mPreferenceScreen; @Mock - private UserManager mUserManager; - @Mock private DevelopmentSettingsDashboardFragment mFragment; private Context mContext; diff --git a/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java index 2175f39a170..51bc103d0ea 100644 --- a/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java @@ -32,16 +32,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AllowAppsOnExternalPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/AllowBackgroundActivityStartsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AllowBackgroundActivityStartsPreferenceControllerTest.java index 8b9b14f1e58..41a3b60b437 100644 --- a/tests/robotests/src/com/android/settings/development/AllowBackgroundActivityStartsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AllowBackgroundActivityStartsPreferenceControllerTest.java @@ -24,19 +24,18 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AllowBackgroundActivityStartsPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java index accd05b8a10..3b7ff9fa077 100644 --- a/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java @@ -32,17 +32,17 @@ import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AnimatorDurationScalePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java index e1fc149a19e..bccb7b26109 100644 --- a/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java @@ -32,16 +32,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppsNotRespondingPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java index 6878c324107..82ca52a58f4 100644 --- a/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java @@ -29,16 +29,16 @@ import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BackgroundProcessLimitPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java index 69c8d2b506d..a1d479ff3ac 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java @@ -30,16 +30,15 @@ import android.os.SystemProperties; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothA2dpHwOffloadPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java index 9cc74369bea..2664bf95994 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java @@ -30,16 +30,15 @@ import android.os.SystemProperties; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothAbsoluteVolumePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java index a4da1973db6..8c5cfd04fda 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java @@ -29,7 +29,6 @@ import androidx.lifecycle.LifecycleOwner; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -37,9 +36,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothAudioBitsPerSamplePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java index eb1737b2b64..d9a26711115 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java @@ -29,7 +29,6 @@ import androidx.lifecycle.LifecycleOwner; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -37,9 +36,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothAudioChannelModePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java index 23eea32dc9c..7be8a8879e7 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java @@ -29,7 +29,6 @@ import androidx.lifecycle.LifecycleOwner; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -37,9 +36,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothAudioCodecPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java index 516c8b28af5..93d92fdc508 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java @@ -29,7 +29,6 @@ import androidx.lifecycle.LifecycleOwner; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -37,9 +36,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothAudioQualityPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java index cb9337f4820..3b469c5fdb1 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java @@ -29,7 +29,6 @@ import androidx.lifecycle.LifecycleOwner; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -37,9 +36,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothAudioSampleRatePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java index 2d0c70a938c..3677f810aa8 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java @@ -32,16 +32,16 @@ import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothAvrcpVersionPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java index 9750d3a4ae7..7f9bc6c2240 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java @@ -30,16 +30,15 @@ import android.os.SystemProperties; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothDeviceNoNamePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java index 030aaa2f871..98dc656d5f5 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java @@ -32,7 +32,6 @@ import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -40,9 +39,10 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.mockito.Spy; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothMaxConnectedAudioDevicesPreferenceControllerTest { private static final int TEST_MAX_CONNECTED_AUDIO_DEVICES = 3; diff --git a/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java index 0d75bdb5be7..88cb29569d8 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java @@ -30,15 +30,14 @@ import android.os.SystemProperties; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothSnoopLogPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java index b4ee99cb319..604dcb7a783 100644 --- a/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java @@ -23,7 +23,7 @@ import static com.android.settings.development.BugReportInPowerPreferenceControl import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -35,16 +35,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BugReportInPowerPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java index 39fd368593a..2d09c7d4e10 100644 --- a/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java @@ -18,21 +18,20 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BugReportPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java index d39a8c2b8fd..aa9cb46db15 100644 --- a/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java @@ -31,17 +31,16 @@ import android.os.SystemProperties; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class CameraLaserSensorPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/CbrsDataSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/CbrsDataSwitchPreferenceControllerTest.java index af929fd8769..d955a6eab80 100644 --- a/tests/robotests/src/com/android/settings/development/CbrsDataSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/CbrsDataSwitchPreferenceControllerTest.java @@ -25,16 +25,15 @@ import android.telephony.TelephonyManager; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public final class CbrsDataSwitchPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java index 6ab4d4c1dc9..3dc6ad9ba1f 100644 --- a/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java @@ -36,7 +36,6 @@ import androidx.fragment.app.Fragment; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUtils; import org.junit.After; @@ -45,13 +44,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowUtils.class) public class ClearAdbKeysPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java index 8d9549ab623..cf84618a6f4 100644 --- a/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java @@ -30,17 +30,16 @@ import android.os.SystemProperties; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class CoolColorTemperaturePreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java index d2019280a65..20d7971d9f5 100644 --- a/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java @@ -29,16 +29,16 @@ import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DebugGpuOverdrawPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java index a3728602796..d3f3c7e0763 100644 --- a/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java @@ -29,16 +29,16 @@ import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DebugNonRectClipOperationsPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java index 790b46a4c02..b265113c92b 100644 --- a/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java @@ -27,16 +27,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DebugViewAttributesPreferenceControllerTest { @Mock @@ -105,5 +104,4 @@ public class DebugViewAttributesPreferenceControllerTest { verify(mPreference).setEnabled(false); verify(mPreference).setChecked(false); } - } diff --git a/tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java index e6e8cb9e850..108ec19ca6e 100644 --- a/tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java @@ -34,16 +34,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DesktopModePreferenceControllerTest { private static final String ENG_BUILD_TYPE = "eng"; diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java index 5eb21bdadc6..83a48809681 100644 --- a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java @@ -33,11 +33,7 @@ import androidx.fragment.app.FragmentActivity; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; -import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settings.widget.SwitchBar; import com.android.settings.widget.ToggleSwitch; import com.android.settingslib.development.AbstractEnableAdbPreferenceController; @@ -48,18 +44,20 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import org.robolectric.shadows.androidx.fragment.FragmentController; +import org.robolectric.shadow.api.Shadow; +import org.robolectric.shadows.ShadowUserManager; import org.robolectric.util.ReflectionHelpers; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {ShadowUserManager.class, ShadowAlertDialogCompat.class, - SettingsShadowResourcesImpl.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = {ShadowUserManager.class, ShadowAlertDialogCompat.class}) public class DevelopmentSettingsDashboardFragmentTest { private ToggleSwitch mSwitch; @@ -75,7 +73,7 @@ public class DevelopmentSettingsDashboardFragmentTest { mSwitch = switchBar.getSwitch(); mDashboard = spy(new DevelopmentSettingsDashboardFragment()); ReflectionHelpers.setField(mDashboard, "mSwitchBar", switchBar); - mShadowUserManager = ShadowUserManager.getShadow(); + mShadowUserManager = Shadow.extract(mContext.getSystemService(Context.USER_SERVICE)); mShadowUserManager.setIsAdminUser(true); } @@ -106,7 +104,6 @@ public class DevelopmentSettingsDashboardFragmentTest { } @Test - @Config(shadows = SettingsShadowResources.SettingsShadowTheme.class) public void searchIndex_pageDisabledBySetting_shouldAddAllKeysToNonIndexable() { final Context appContext = RuntimeEnvironment.application; DevelopmentSettingsEnabler.setDevelopmentSettingsEnabled(appContext, false); @@ -119,7 +116,6 @@ public class DevelopmentSettingsDashboardFragmentTest { } @Test - @Config(shadows = SettingsShadowResources.SettingsShadowTheme.class) public void searchIndex_pageDisabledForNonAdmin_shouldAddAllKeysToNonIndexable() { final Context appContext = RuntimeEnvironment.application; DevelopmentSettingsEnabler.setDevelopmentSettingsEnabled(appContext, true); @@ -289,7 +285,7 @@ public class DevelopmentSettingsDashboardFragmentTest { } @Implementation - public static void show(DevelopmentSettingsDashboardFragment host) { + protected static void show(DevelopmentSettingsDashboardFragment host) { mShown = true; } } @@ -309,7 +305,7 @@ public class DevelopmentSettingsDashboardFragmentTest { @Implements(PictureColorModePreferenceController.class) public static class ShadowPictureColorModePreferenceController { @Implementation - public boolean isAvailable() { + protected boolean isAvailable() { return true; } } @@ -317,16 +313,15 @@ public class DevelopmentSettingsDashboardFragmentTest { @Implements(AbstractEnableAdbPreferenceController.class) public static class ShadowAdbPreferenceController { @Implementation - public boolean isAvailable() { + protected boolean isAvailable() { return true; } } @Implements(ClearAdbKeysPreferenceController.class) public static class ShadowClearAdbKeysPreferenceController { - @Implementation - public boolean isAvailable() { + protected boolean isAvailable() { return true; } } diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDisabledActivityTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDisabledActivityTest.java index 48017919f44..6b4068d1d8c 100644 --- a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDisabledActivityTest.java +++ b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDisabledActivityTest.java @@ -21,15 +21,15 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowToast; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DevelopmentSettingsDisabledActivityTest { @Test diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java index da0dcaf9ef5..4e5716f93c9 100644 --- a/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java @@ -27,7 +27,6 @@ import android.content.Context; import androidx.lifecycle.LifecycleOwner; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settings.testutils.shadow.ShadowUtils; import com.android.settings.widget.SwitchBar; @@ -40,13 +39,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowUtils.class, ShadowUserManager.class}) public class DevelopmentSwitchBarControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java index 5c76e086a10..d5c0b5d4d99 100644 --- a/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java @@ -27,16 +27,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DisableAutomaticUpdatesPreferenceControllerTest { @Mock @@ -99,7 +98,6 @@ public class DisableAutomaticUpdatesPreferenceControllerTest { verify(mPreference).setChecked(false); } - @Test public void onDeveloperOptionsDisabled_shouldDisablePreference() { mController.onDeveloperOptionsDisabled(); diff --git a/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java index 1b25460355b..34112fd6a18 100644 --- a/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java @@ -36,8 +36,6 @@ import android.view.DisplayCutout; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -46,8 +44,9 @@ import org.mockito.MockitoAnnotations; import java.util.ArrayList; import java.util.Arrays; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EmulateDisplayCutoutPreferenceControllerTest { private static final OverlayInfo ONE_DISABLED = createFakeOverlay("emulation.one", false, 1); @@ -86,14 +85,14 @@ public class EmulateDisplayCutoutPreferenceControllerTest { } @Test - public void isAvailable_true() throws Exception { + public void isAvailable_true() { mockCurrentOverlays(ONE_DISABLED, TWO_DISABLED); assertThat(createController().isAvailable()).isTrue(); } @Test - public void isAvailable_false() throws Exception { + public void isAvailable_false() { mockCurrentOverlays(); assertThat(createController().isAvailable()).isFalse(); @@ -119,7 +118,7 @@ public class EmulateDisplayCutoutPreferenceControllerTest { } @Test - public void updateState_enabled() throws Exception { + public void updateState_enabled() { mockCurrentOverlays(ONE_DISABLED, TWO_ENABLED); mController.updateState(null); @@ -128,7 +127,7 @@ public class EmulateDisplayCutoutPreferenceControllerTest { } @Test - public void updateState_disabled() throws Exception { + public void updateState_disabled() { mockCurrentOverlays(ONE_DISABLED, TWO_DISABLED); mController.updateState(null); @@ -137,7 +136,7 @@ public class EmulateDisplayCutoutPreferenceControllerTest { } @Test - public void ordered_by_priority() throws Exception { + public void ordered_by_priority() { mockCurrentOverlays(TWO_DISABLED, ONE_DISABLED); mController.updateState(null); diff --git a/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java index 1319c979fce..985e80892d2 100644 --- a/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java @@ -32,16 +32,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EnableGnssRawMeasFullTrackingPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java index 21d14ca3fa2..80f348b9be4 100644 --- a/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java @@ -32,16 +32,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EnableGpuDebugLayersPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java index 8bbb7e2f0fb..68cbd320303 100644 --- a/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java @@ -36,17 +36,17 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FileEncryptionPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/ForceDarkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ForceDarkPreferenceControllerTest.java index 8646e34779f..0a99b94a79e 100644 --- a/tests/robotests/src/com/android/settings/development/ForceDarkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ForceDarkPreferenceControllerTest.java @@ -28,16 +28,15 @@ import android.view.ThreadedRenderer; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ForceDarkPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java index a238e7630e8..1cf58de56d4 100644 --- a/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java @@ -27,16 +27,15 @@ import android.os.SystemProperties; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ForceMSAAPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java index 08fb23e885f..6162483c3ec 100644 --- a/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java @@ -33,16 +33,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FreeformWindowsPreferenceControllerTest { private static final String ENG_BUILD_TYPE = "eng"; @@ -74,7 +73,7 @@ public class FreeformWindowsPreferenceControllerTest { } @Test - public void isAvaiable_userBuild_shouldBeTrue() { + public void isAvailable_userBuild_shouldBeTrue() { mController = spy(mController); doReturn(USER_BUILD_TYPE).when(mController).getBuildType(); diff --git a/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java index d2e2d31ce56..44181607c73 100644 --- a/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java @@ -28,16 +28,15 @@ import android.view.ThreadedRenderer; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class GpuViewUpdatesPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java index 9ab7cec4a11..38f674a5c04 100644 --- a/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java @@ -27,16 +27,15 @@ import android.view.ThreadedRenderer; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class HardwareLayersUpdatesPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java index 9a69acfb220..424ec5ffe88 100644 --- a/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java @@ -36,7 +36,6 @@ import android.os.RemoteException; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowParcel; import org.junit.Before; @@ -44,10 +43,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class HardwareOverlaysPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java index 9a80bea96cc..48289427fc5 100644 --- a/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java @@ -33,16 +33,16 @@ import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class HdcpCheckingPreferenceControllerTest { private static final String USER_DEBUG = "userdebug"; diff --git a/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java index 05aee64eac0..43f40af192c 100644 --- a/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java @@ -31,16 +31,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class KeepActivitiesPreferenceControllerTest { private static final int SETTING_VALUE_ON = 1; diff --git a/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java index b0af1d5676e..5297ef56964 100644 --- a/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java @@ -16,17 +16,17 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LocalBackupPasswordPreferenceControllerTest { @Mock @@ -47,8 +47,7 @@ public class LocalBackupPasswordPreferenceControllerTest { mContext = RuntimeEnvironment.application; mController = spy(new LocalBackupPasswordPreferenceController(mContext)); ReflectionHelpers.setField(mController, "mUserManager", mUserManager); - when(mScreen.findPreference(mController.getPreferenceKey())) - .thenReturn(mPreference); + when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); } @Test diff --git a/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java index 04de34822ae..6f789701cf2 100644 --- a/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java @@ -32,15 +32,14 @@ import android.os.UserManager; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LocalTerminalPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java index afbd806bb40..325f4262f3d 100644 --- a/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java @@ -27,7 +27,6 @@ import androidx.lifecycle.LifecycleOwner; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -35,9 +34,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LogPersistPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java index aee0ba81900..0ac1c738ff6 100644 --- a/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java @@ -24,7 +24,6 @@ import android.content.Context; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.R; import org.junit.Before; @@ -32,9 +31,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LogdSizePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/MemoryUsagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/MemoryUsagePreferenceControllerTest.java index 481e59869b2..fa08653c8db 100644 --- a/tests/robotests/src/com/android/settings/development/MemoryUsagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/MemoryUsagePreferenceControllerTest.java @@ -27,16 +27,16 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.applications.ProcStatsData; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class MemoryUsagePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java index a578429d63c..a5b7b8e4482 100644 --- a/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java @@ -27,16 +27,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class MobileDataAlwaysOnPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java index f6214aea988..b0de02470ff 100644 --- a/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java @@ -24,19 +24,19 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; import java.util.Collections; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class MockLocationAppPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java index 965f756d6b9..7d08c66bb6c 100644 --- a/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java @@ -29,16 +29,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NotificationChannelWarningsPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java index 03f82000fea..08502ddec66 100644 --- a/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java @@ -38,7 +38,6 @@ import android.telephony.TelephonyManager; import androidx.fragment.app.FragmentManager; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedSwitchPreference; import org.junit.Before; @@ -47,8 +46,9 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class OemUnlockPreferenceControllerTest { @Mock @@ -187,7 +187,6 @@ public class OemUnlockPreferenceControllerTest { mController.onDeveloperOptionsEnabled(); verify(mPreference).checkRestrictionAndSetDisabled(UserManager.DISALLOW_FACTORY_RESET); - } @Test diff --git a/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java index 8140c324de0..5cdb8e70bf5 100644 --- a/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java @@ -33,7 +33,6 @@ import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -41,8 +40,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PictureColorModePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java index 768ccec1c6a..2984b34b922 100644 --- a/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java @@ -27,16 +27,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PointerLocationPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java index 1708068d359..3fd480a259f 100644 --- a/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java @@ -29,16 +29,16 @@ import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ProfileGpuRenderingPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java index 046636b9f32..9a69a0a62dd 100644 --- a/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java @@ -27,16 +27,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ResizableActivityPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java index f79cbe0bf51..c5fcfa8057f 100644 --- a/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java @@ -29,16 +29,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RtlLayoutPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java index 6b083da5d79..16bb62644e6 100644 --- a/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java @@ -29,16 +29,16 @@ import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SecondaryDisplayPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java index 0d9eeda33a0..2c85bb01c06 100644 --- a/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java @@ -37,17 +37,17 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SelectDebugAppPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java index 04b0b3f1ab6..c5078cbb374 100644 --- a/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java @@ -28,17 +28,16 @@ import android.os.RemoteException; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ShortcutManagerThrottlingPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java index 2acd44ad092..6674cd5f062 100644 --- a/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java @@ -31,16 +31,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ShowFirstCrashDialogPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java index 38ec01b80de..5c5bc8bef61 100644 --- a/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java @@ -27,16 +27,15 @@ import android.view.View; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ShowLayoutBoundsPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java index e768e522d87..e08dd1c7ec1 100644 --- a/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java @@ -36,7 +36,6 @@ import android.os.RemoteException; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowParcel; import org.junit.Before; @@ -44,10 +43,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ShowSurfaceUpdatesPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java index b6d02caf11e..c97eab6f096 100644 --- a/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java @@ -27,16 +27,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ShowTapsPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java index 633e8e4055d..93fc90dfde9 100644 --- a/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java @@ -35,16 +35,16 @@ import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SimulateColorSpacePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/SmsAccessRestrictionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SmsAccessRestrictionPreferenceControllerTest.java index 7a0dd682526..ecfe35af695 100644 --- a/tests/robotests/src/com/android/settings/development/SmsAccessRestrictionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/SmsAccessRestrictionPreferenceControllerTest.java @@ -16,7 +16,6 @@ package com.android.settings.development; - import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.verify; @@ -25,19 +24,18 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SmsAccessRestrictionPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java index 97b4bf0ff93..9dfe4e25cf4 100644 --- a/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java @@ -30,7 +30,6 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedSwitchPreference; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -41,9 +40,10 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class StayAwakePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java index 3fceb1c7992..475c980e3ab 100644 --- a/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java @@ -29,17 +29,16 @@ import android.view.IWindowManager; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class StrictModePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java index dc1d6223eb5..6e347f5100c 100644 --- a/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java @@ -27,16 +27,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TetheringHardwareAccelPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java index 8bd43745a75..f06aa8de99d 100644 --- a/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java @@ -33,17 +33,17 @@ import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TransitionAnimationScalePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/UpdatedGfxDriverDevOptInPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/UpdatedGfxDriverDevOptInPreferenceControllerTest.java index 307191200cb..e92f1a56be9 100644 --- a/tests/robotests/src/com/android/settings/development/UpdatedGfxDriverDevOptInPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/UpdatedGfxDriverDevOptInPreferenceControllerTest.java @@ -34,17 +34,16 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class UpdatedGfxDriverDevOptInPreferenceControllerTest { @Mock @@ -72,7 +71,6 @@ public class UpdatedGfxDriverDevOptInPreferenceControllerTest { @Test public void handlePreferenceTreeClick_preferenceClicked_launchActivity() { final Intent activityStartIntent = new Intent(mContext, AppPicker.class); - final String preferenceKey = mController.getPreferenceKey(); doReturn(activityStartIntent).when(mController).getActivityStartIntent(); mController.handlePreferenceTreeClick(mPreference); diff --git a/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java index 0c82bb46574..affae700d46 100644 --- a/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java @@ -27,16 +27,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class UsbAudioRoutingPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java index fa04d69225f..f0961f1202f 100644 --- a/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java @@ -17,15 +17,14 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; -import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.provider.Settings; @@ -33,7 +32,6 @@ import android.provider.Settings.Global; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import com.android.settingslib.RestrictedSwitchPreference; @@ -42,13 +40,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; import java.util.Collections; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class VerifyAppsOverUsbPreferenceControllerTest { @Mock @@ -91,7 +90,7 @@ public class VerifyAppsOverUsbPreferenceControllerTest { final List resolveInfos = nonEmpty ? Collections.singletonList(mock(ResolveInfo.class)) : Collections.emptyList(); - when(mPackageManager.queryBroadcastReceivers((Intent) any(), anyInt())) + when(mPackageManager.queryBroadcastReceivers(any(), anyInt())) .thenReturn(resolveInfos); } diff --git a/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java index 87d11350404..b4d06face90 100644 --- a/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java @@ -40,16 +40,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WaitForDebuggerPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java index cc60b87845b..b13d922f70d 100644 --- a/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java @@ -27,7 +27,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.webview.WebViewUpdateServiceWrapper; import com.android.settingslib.applications.DefaultAppInfo; @@ -36,10 +35,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WebViewAppPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java index e749ea64b3a..60e7d47feea 100644 --- a/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java @@ -31,17 +31,16 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiConnectedMacRandomizationPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java index f7124230e52..69cfe54c438 100644 --- a/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java @@ -27,16 +27,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiDisplayCertificationPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java index daeff01ea63..c4041e04c51 100644 --- a/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java @@ -25,15 +25,14 @@ import android.net.wifi.WifiManager; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiVerboseLoggingPreferenceControllerTest { @Mock private Context mContext; diff --git a/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java index 322eed78936..4d8d3e8e72c 100644 --- a/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java @@ -33,17 +33,17 @@ import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WindowAnimationScalePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/autofill/AutofillLoggingLevelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/autofill/AutofillLoggingLevelPreferenceControllerTest.java index 1268797db19..f79419fde07 100644 --- a/tests/robotests/src/com/android/settings/development/autofill/AutofillLoggingLevelPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/autofill/AutofillLoggingLevelPreferenceControllerTest.java @@ -33,7 +33,6 @@ import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.After; @@ -42,13 +41,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import org.robolectric.annotation.Resetter; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AutofillLoggingLevelPreferenceControllerTest { private static final int IDX_OFF = 0; @@ -133,7 +133,7 @@ public class AutofillLoggingLevelPreferenceControllerTest { } @Test - public void onSettingsChange_off() throws Exception { + public void onSettingsChange_off() { mHelper.setLoggingLevel(AutofillManager.NO_LOGGING); mController.updateState(mPreference); @@ -143,7 +143,7 @@ public class AutofillLoggingLevelPreferenceControllerTest { } @Test - public void onSettingsChange_debug() throws Exception { + public void onSettingsChange_debug() { mHelper.setLoggingLevel(AutofillManager.FLAG_ADD_CLIENT_DEBUG); mController.updateState(mPreference); @@ -153,7 +153,7 @@ public class AutofillLoggingLevelPreferenceControllerTest { } @Test - public void onSettingsChange_verbose() throws Exception { + public void onSettingsChange_verbose() { mHelper.setLoggingLevel(AutofillManager.FLAG_ADD_CLIENT_VERBOSE); mController.updateState(mPreference); diff --git a/tests/robotests/src/com/android/settings/development/autofill/AutofillResetOptionsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/autofill/AutofillResetOptionsPreferenceControllerTest.java index f95cb35cd85..02c7471af0c 100644 --- a/tests/robotests/src/com/android/settings/development/autofill/AutofillResetOptionsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/autofill/AutofillResetOptionsPreferenceControllerTest.java @@ -26,16 +26,15 @@ import android.view.autofill.AutofillManager; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AutofillResetOptionsPreferenceControllerTest { @Mock @@ -83,11 +82,9 @@ public class AutofillResetOptionsPreferenceControllerTest { assertThat(mController.handlePreferenceTreeClick(mPreference)).isTrue(); - assertThat(mHelper.getLoggingLevel()) - .isEqualTo(AutofillManager.DEFAULT_LOGGING_LEVEL); + assertThat(mHelper.getLoggingLevel()).isEqualTo(AutofillManager.DEFAULT_LOGGING_LEVEL); assertThat(mHelper.getMaxPartitionsSize()) .isEqualTo(AutofillManager.DEFAULT_MAX_PARTITIONS_SIZE); - assertThat(mHelper.getMaxVisibleDatasets()) - .isEqualTo(0); + assertThat(mHelper.getMaxVisibleDatasets()).isEqualTo(0); } } diff --git a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPersistentTest.java b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPersistentTest.java index bf0cf091fa0..7d7e36bef16 100644 --- a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPersistentTest.java +++ b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPersistentTest.java @@ -22,15 +22,14 @@ import android.os.SystemProperties; import android.provider.Settings; import android.util.FeatureFlagUtils; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FeatureFlagPersistentTest { private static final String TEST_FEATURE_NAME = "test_feature"; diff --git a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java index 24fe7336c12..2e15967d835 100644 --- a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java @@ -20,7 +20,7 @@ import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -30,16 +30,15 @@ import android.content.Context; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FeatureFlagPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceTest.java b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceTest.java index 9f05ec4bdc5..8afff8af7e4 100644 --- a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceTest.java @@ -20,14 +20,13 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FeatureFlagPreferenceTest { private static final String KEY = "feature_key"; diff --git a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagsDashboardTest.java b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagsDashboardTest.java index c50f58a35b9..fb6c988ad57 100644 --- a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagsDashboardTest.java +++ b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagsDashboardTest.java @@ -20,13 +20,13 @@ import static com.google.common.truth.Truth.assertThat; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FeatureFlagsDashboardTest { private FeatureFlagsDashboard mDashboard; diff --git a/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java index c3ef73bc820..8b006fcdabd 100644 --- a/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.development.qstile; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -38,7 +38,6 @@ import androidx.preference.SwitchPreference; import com.android.internal.statusbar.IStatusBarService; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Ignore; @@ -47,12 +46,13 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.shadows.ShadowPackageManager; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DevelopmentTilePreferenceControllerTest { private static final String SERVICE_INFO_NAME = "TestName"; diff --git a/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilesTest.java b/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilesTest.java index 12661e30a70..9ab67c2719c 100644 --- a/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilesTest.java +++ b/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilesTest.java @@ -27,7 +27,6 @@ import android.content.pm.PackageManager; import android.os.UserManager; import android.service.quicksettings.Tile; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.development.DevelopmentSettingsEnabler; import org.junit.Before; @@ -36,11 +35,12 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.shadows.ShadowUserManager; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DevelopmentTilesTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/qstile/WinscopeTraceTest.java b/tests/robotests/src/com/android/settings/development/qstile/WinscopeTraceTest.java index 636b067e17d..cafebe44c0b 100644 --- a/tests/robotests/src/com/android/settings/development/qstile/WinscopeTraceTest.java +++ b/tests/robotests/src/com/android/settings/development/qstile/WinscopeTraceTest.java @@ -37,7 +37,6 @@ import android.os.RemoteException; import android.view.IWindowManager; import android.widget.Toast; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowParcel; import org.junit.After; @@ -46,10 +45,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WinscopeTraceTest { @Mock @@ -134,7 +134,6 @@ public class WinscopeTraceTest { assertThat(mWinscopeTrace.isEnabled()).isFalse(); } - @Test public void setIsEnableTrue_shouldEnableWindowTrace() throws RemoteException { mWinscopeTrace.setIsEnabled(true); diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BrandedAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BrandedAccountPreferenceControllerTest.java index 1560c51dd1e..564acfdd0fb 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/BrandedAccountPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/BrandedAccountPreferenceControllerTest.java @@ -25,7 +25,6 @@ import android.accounts.Account; import android.content.Context; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -33,8 +32,9 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BrandedAccountPreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java index 9bec78d2bcd..fb674abb0a0 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java @@ -19,8 +19,8 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Answers.RETURNS_DEEP_STUBS; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -40,7 +40,6 @@ import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUtils; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.development.DevelopmentSettingsEnabler; @@ -52,12 +51,13 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowUserManager; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowUtils.class) public class BuildNumberPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java index aa84adfcaa1..6418cf8bb6f 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java @@ -17,8 +17,8 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -35,17 +35,17 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DeviceModelPreferenceControllerTest { private final String KEY = "device_model"; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java index 9fb756ad204..5eb011449d2 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java @@ -34,7 +34,6 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import com.android.settings.widget.ValidatedEditTextPreference; @@ -44,11 +43,12 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowBluetoothAdapter.class}) public class DeviceNamePreferenceControllerTest { private static final String TESTING_STRING = "Testing"; @@ -178,12 +178,6 @@ public class DeviceNamePreferenceControllerTest { } private void acceptDeviceName(boolean accept) { - mController.setHost( - new DeviceNamePreferenceController.DeviceNamePreferenceHost() { - @Override - public void showDeviceNameWarningDialog(String deviceName) { - mController.updateDeviceName(accept); - } - }); + mController.setHost(deviceName -> mController.updateDeviceName(accept)); } } diff --git a/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java index 2c2c2f28ff7..1e3b11286ef 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java @@ -25,16 +25,15 @@ import android.os.SystemProperties; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FccEquipmentIdPreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java index e84aa65ba93..eef262c328b 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java @@ -17,7 +17,7 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.when; import android.content.Context; @@ -26,16 +26,15 @@ import androidx.fragment.app.Fragment; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FeedbackPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java index abcce008b7b..29d9a7c8aa2 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java @@ -16,9 +16,9 @@ package com.android.settings.deviceinfo; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -29,17 +29,14 @@ import android.view.View; import androidx.fragment.app.FragmentActivity; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; -import org.robolectric.annotation.Config; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = SettingsShadowResourcesImpl.class) +@RunWith(RobolectricTestRunner.class) public class HardwareInfoDialogFragmentTest { private FragmentActivity mActivity; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/KernelVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/KernelVersionPreferenceControllerTest.java index 33d7e0c395c..48170f3c691 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/KernelVersionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/KernelVersionPreferenceControllerTest.java @@ -19,15 +19,14 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class KernelVersionPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java index 7b1de47555d..1da1f214638 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java @@ -18,21 +18,20 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.when; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ManualPreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java index 82056a2d22b..8e9a48f6894 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java @@ -34,16 +34,16 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PhoneNumberPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeForgetTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeForgetTest.java index 768a9ea225f..9434daaab1f 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeForgetTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeForgetTest.java @@ -28,19 +28,18 @@ import androidx.fragment.app.FragmentActivity; import com.android.settings.R; import com.android.settings.deviceinfo.PrivateVolumeForget.ForgetConfirmFragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowStorageManager; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import org.robolectric.shadows.androidx.fragment.FragmentController; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {ShadowStorageManager.class, SettingsShadowResourcesImpl.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowStorageManager.class) public class PrivateVolumeForgetTest { private PrivateVolumeForget mFragment; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeFormatTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeFormatTest.java index 81c52c51223..93a8be2ac1a 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeFormatTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeFormatTest.java @@ -25,20 +25,19 @@ import android.os.storage.VolumeInfo; import android.widget.Button; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowStorageManager; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowActivity; import org.robolectric.shadows.androidx.fragment.FragmentController; - -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowStorageManager.class) public class PrivateVolumeFormatTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java index a9664177acd..ed7f16b24db 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -30,7 +30,6 @@ import android.view.MenuInflater; import android.view.MenuItem; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -39,9 +38,10 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PrivateVolumeOptionMenuControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeUnmountTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeUnmountTest.java index 65f24e31617..9cb1d56d0cf 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeUnmountTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeUnmountTest.java @@ -23,18 +23,17 @@ import android.os.storage.VolumeInfo; import android.widget.Button; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowStorageManager; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import org.robolectric.shadows.androidx.fragment.FragmentController; - -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowStorageManager.class) public class PrivateVolumeUnmountTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java index 24028d22ad8..1b9c487d119 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java @@ -17,8 +17,8 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; import android.content.Context; @@ -29,8 +29,6 @@ import android.content.pm.ResolveInfo; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -40,8 +38,9 @@ import org.mockito.MockitoAnnotations; import java.util.ArrayList; import java.util.List; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RegulatoryInfoPreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java index bd0eaf37fa0..4e4375dc72e 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java @@ -35,7 +35,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.android.settings.deviceinfo.storage.CachedStorageValuesHelper; import com.android.settings.deviceinfo.storage.StorageAsyncLoader; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.deviceinfo.PrivateStorageInfo; import com.android.settingslib.drawer.CategoryKey; @@ -43,11 +42,12 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class StorageDashboardFragmentTest { private StorageDashboardFragment mFragment; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java index d42b40ff7d6..06194b4df33 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java @@ -26,14 +26,14 @@ import android.widget.ProgressBar; import androidx.preference.PreferenceViewHolder; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class StorageItemPreferenceTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java index 61fbf1f48d5..bb65fa248f7 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java @@ -17,7 +17,7 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -25,7 +25,6 @@ import android.util.SparseArray; import com.android.settings.deviceinfo.storage.StorageAsyncLoader; import com.android.settings.deviceinfo.storage.StorageItemPreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.StorageStatsSource; import org.junit.Test; @@ -33,8 +32,9 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class StorageProfileFragmentTest { @Captor diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java index 2598105d33b..aad3f30fa53 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java @@ -27,7 +27,6 @@ import android.app.Activity; import android.content.Intent; import android.os.storage.VolumeInfo; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider; import org.junit.Before; @@ -38,8 +37,9 @@ import org.mockito.MockitoAnnotations; import java.util.ArrayList; import java.util.List; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class StorageSettingsTest { @Mock @@ -77,5 +77,4 @@ public class StorageSettingsTest { verify(mActivity, never()).startActivity(null); verify(mActivity).startActivity(any(Intent.class)); } - } diff --git a/tests/robotests/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceControllerTest.java index 00484df3efc..6a192038e65 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceControllerTest.java @@ -30,7 +30,6 @@ import android.os.storage.VolumeInfo; import android.text.format.Formatter; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider; import org.junit.Before; @@ -38,13 +37,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TopLevelStoragePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/DeviceNameWarningDialogTest.java b/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/DeviceNameWarningDialogTest.java index 6ea36a06836..a61bf4875cd 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/DeviceNameWarningDialogTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/DeviceNameWarningDialogTest.java @@ -22,16 +22,13 @@ import static org.mockito.Mockito.verify; import android.content.DialogInterface; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.shadows.androidx.fragment.FragmentController; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DeviceNameWarningDialogTest { - DeviceNameWarningDialog mDialog; - @Test public void onClick_okSetsName() { final FragmentController fragmentController = diff --git a/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragmentTest.java index e304a1e710d..fefad5ec6f5 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragmentTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragmentTest.java @@ -37,8 +37,6 @@ import androidx.preference.PreferenceScreen; import com.android.settings.deviceinfo.BuildNumberPreferenceController; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settings.testutils.shadow.ShadowConnectivityManager; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settingslib.core.AbstractPreferenceController; @@ -48,6 +46,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; @@ -57,7 +56,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowConnectivityManager.class, ShadowUserManager.class}) public class MyDeviceInfoFragmentTest { @@ -91,7 +90,6 @@ public class MyDeviceInfoFragmentTest { } @Test - @Config(shadows = SettingsShadowResources.SettingsShadowTheme.class) public void onCreate_fromSearch_shouldNotOverrideInitialExpandedCount() { final Bundle args = new Bundle(); args.putString(EXTRA_FRAGMENT_ARG_KEY, "search_key"); diff --git a/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceControllerTest.java index 25fbeee178a..988a94b6650 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceControllerTest.java @@ -16,7 +16,6 @@ package com.android.settings.deviceinfo.aboutphone; - import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.google.common.truth.Truth.assertThat; @@ -25,14 +24,13 @@ import android.content.Context; import android.os.Build; import android.provider.Settings.Global; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TopLevelAboutDevicePreferenceControllerTest { private Context mContext; @@ -59,6 +57,4 @@ public class TopLevelAboutDevicePreferenceControllerTest { Global.putString(mContext.getContentResolver(), Global.DEVICE_NAME, "Test"); assertThat(mController.getSummary().toString()).isEqualTo("Test"); } - - } diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogControllerTest.java index 3e7ce7a9313..0f561641a52 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogControllerTest.java @@ -31,7 +31,6 @@ import android.content.Context; import android.net.ConnectivityManager; import android.os.SystemProperties; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowConnectivityManager; import org.junit.Before; @@ -39,10 +38,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowConnectivityManager.class) public class BasebandVersionDialogControllerTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogControllerTest.java index 21388818eaf..a1e8813a8db 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogControllerTest.java @@ -24,15 +24,14 @@ import static org.mockito.Mockito.verify; import android.os.Build; import android.text.BidiFormatter; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BuildNumberDialogControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogControllerTest.java index 7b07db48628..0c57941126e 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogControllerTest.java @@ -34,17 +34,16 @@ import android.os.Build; import android.os.UserManager; import android.view.View; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FirmwareVersionDialogControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java index e7b18934400..fc674f0b8b0 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java @@ -27,7 +27,6 @@ import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.After; import org.junit.Before; @@ -35,16 +34,17 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import org.robolectric.annotation.Resetter; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FirmwareVersionPreferenceControllerTest { - private final String KEY = "firmware_version"; + private static final String KEY = "firmware_version"; @Mock private Fragment mFragment; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogControllerTest.java index 24f4874dbe0..52af2809ffb 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogControllerTest.java @@ -24,7 +24,6 @@ import static org.mockito.Mockito.when; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.DeviceInfoUtils; import org.junit.Before; @@ -32,9 +31,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class KernelVersionDialogControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogControllerTest.java index fe7633c2978..8c334ccd85a 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogControllerTest.java @@ -35,19 +35,18 @@ import android.content.pm.PackageManager; import android.os.Build; import android.view.View; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.util.ReflectionHelpers; import java.util.Collections; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SecurityPatchLevelDialogControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java index 7213d12d118..a19f022d983 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java @@ -36,17 +36,16 @@ import android.content.Context; import android.telephony.SubscriptionInfo; import android.telephony.TelephonyManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ImeiInfoDialogControllerTest { private static final String PRL_VERSION = "some_prl_version"; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java index e633ea21478..e56baa14cce 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java @@ -36,7 +36,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -44,10 +43,11 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ImeiInfoPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/deviceinfo/legal/CopyrightPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/legal/CopyrightPreferenceControllerTest.java index 0547d5f34dd..3a6e494ff04 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/legal/CopyrightPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/legal/CopyrightPreferenceControllerTest.java @@ -16,9 +16,9 @@ package com.android.settings.deviceinfo.legal; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -33,19 +33,19 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class CopyrightPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/deviceinfo/legal/LicensePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/legal/LicensePreferenceControllerTest.java index d4962e0b8ca..f51c7ad0e43 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/legal/LicensePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/legal/LicensePreferenceControllerTest.java @@ -16,9 +16,9 @@ package com.android.settings.deviceinfo.legal; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -33,20 +33,19 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; - -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LicensePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/deviceinfo/legal/TermsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/legal/TermsPreferenceControllerTest.java index 7e4a92aaefc..2a91fe1ee65 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/legal/TermsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/legal/TermsPreferenceControllerTest.java @@ -16,9 +16,9 @@ package com.android.settings.deviceinfo.legal; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -33,19 +33,19 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TermsPreferenceControllerTest { @Mock 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 c5862e22f7e..c06f069e2d5 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/legal/WallpaperAttributionsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/legal/WallpaperAttributionsPreferenceControllerTest.java @@ -20,16 +20,16 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WallpaperAttributionsPreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/legal/WebViewLicensePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/legal/WebViewLicensePreferenceControllerTest.java index eff152011d6..55604c33373 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/legal/WebViewLicensePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/legal/WebViewLicensePreferenceControllerTest.java @@ -16,9 +16,9 @@ package com.android.settings.deviceinfo.legal; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -33,19 +33,19 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WebViewLicensePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java index 541e9d3f454..07e42706716 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java @@ -69,7 +69,6 @@ import android.telephony.euicc.EuiccManager; import androidx.lifecycle.LifecycleOwner; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -77,12 +76,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.shadows.ShadowPackageManager; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SimStatusDialogControllerTest { @Mock @@ -398,5 +398,4 @@ public class SimStatusDialogControllerTest { verify(mDialog).removeSettingFromScreen(IMS_REGISTRATION_STATE_LABEL_ID); verify(mDialog).removeSettingFromScreen(IMS_REGISTRATION_STATE_VALUE_ID); } - } diff --git a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java index e814fc49c4d..059ad425ed2 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java @@ -33,7 +33,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -41,10 +40,11 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SimStatusPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java index 4c767a2ae02..70620bc3155 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java @@ -18,8 +18,8 @@ package com.android.settings.deviceinfo.storage; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; @@ -42,7 +42,6 @@ import com.android.settings.core.BasePreferenceController; import com.android.settings.deletionhelper.ActivationWarningFragment; import com.android.settings.overlay.FeatureFactory; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.MasterSwitchPreference; import org.junit.Before; @@ -51,10 +50,11 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AutomaticStorageManagementSwitchPreferenceControllerTest { @Mock @@ -73,7 +73,7 @@ public class AutomaticStorageManagementSwitchPreferenceControllerTest { public void setUp() { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application.getApplicationContext(); - final FeatureFactory factory = FeatureFactory.getFactory(mContext); + FeatureFactory.getFactory(mContext); mController = new AutomaticStorageManagementSwitchPreferenceController(mContext, "testkey"); mController.setFragmentManager(mFragmentManager); diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelperTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelperTest.java index 5da2cb8b095..d4048acea90 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelperTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelperTest.java @@ -46,7 +46,6 @@ import android.content.Context; import android.content.SharedPreferences; import android.util.SparseArray; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.StorageStatsSource; import com.android.settingslib.deviceinfo.PrivateStorageInfo; @@ -55,9 +54,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class CachedStorageValuesHelperTest { private Context mContext; @@ -76,7 +76,7 @@ public class CachedStorageValuesHelperTest { } @Test - public void getCachedPrivateStorageInfo_cachedValuesAreLoaded() throws Exception { + public void getCachedPrivateStorageInfo_cachedValuesAreLoaded() { when(mMockClock.getCurrentTime()).thenReturn(10001L); mSharedPreferences .edit() @@ -104,7 +104,7 @@ public class CachedStorageValuesHelperTest { } @Test - public void getCachedAppsStorageResult_cachedValuesAreLoaded() throws Exception { + public void getCachedAppsStorageResult_cachedValuesAreLoaded() { when(mMockClock.getCurrentTime()).thenReturn(10001L); mSharedPreferences .edit() @@ -143,7 +143,7 @@ public class CachedStorageValuesHelperTest { } @Test - public void getCachedPrivateStorageInfo_nullIfDataIsStale() throws Exception { + public void getCachedPrivateStorageInfo_nullIfDataIsStale() { when(mMockClock.getCurrentTime()).thenReturn(10000000L); mSharedPreferences .edit() @@ -169,7 +169,7 @@ public class CachedStorageValuesHelperTest { } @Test - public void getCachedAppsStorageResult_nullIfDataIsStale() throws Exception { + public void getCachedAppsStorageResult_nullIfDataIsStale() { when(mMockClock.getCurrentTime()).thenReturn(10000000L); mSharedPreferences .edit() @@ -196,7 +196,7 @@ public class CachedStorageValuesHelperTest { } @Test - public void getCachedPrivateStorageInfo_nullIfWrongUser() throws Exception { + public void getCachedPrivateStorageInfo_nullIfWrongUser() { when(mMockClock.getCurrentTime()).thenReturn(10001L); mSharedPreferences .edit() @@ -222,7 +222,7 @@ public class CachedStorageValuesHelperTest { } @Test - public void getCachedAppsStorageResult_nullIfWrongUser() throws Exception { + public void getCachedAppsStorageResult_nullIfWrongUser() { when(mMockClock.getCurrentTime()).thenReturn(10001L); mSharedPreferences .edit() @@ -249,20 +249,20 @@ public class CachedStorageValuesHelperTest { } @Test - public void getCachedPrivateStorageInfo_nullIfEmpty() throws Exception { + public void getCachedPrivateStorageInfo_nullIfEmpty() { final PrivateStorageInfo info = mCachedValuesHelper.getCachedPrivateStorageInfo(); assertThat(info).isNull(); } @Test - public void getCachedAppsStorageResult_nullIfEmpty() throws Exception { + public void getCachedAppsStorageResult_nullIfEmpty() { final SparseArray result = mCachedValuesHelper.getCachedAppsStorageResult(); assertThat(result).isNull(); } @Test - public void cacheResult_succeeds() throws Exception { + public void cacheResult_succeeds() { when(mMockClock.getCurrentTime()).thenReturn(10000L); final StorageStatsSource.ExternalStorageStats externalStats = new StorageStatsSource.ExternalStorageStats(22222L, 2L, 20L, 200L, 2000L); @@ -294,5 +294,5 @@ public class CachedStorageValuesHelperTest { assertThat(mSharedPreferences.getLong(TOTAL_BYTES_KEY, -1)).isEqualTo(6000L); assertThat(mSharedPreferences.getInt(USER_ID_KEY, -1)).isEqualTo(0); assertThat(mSharedPreferences.getLong(TIMESTAMP_KEY, -1)).isEqualTo(10000L); - }; + } } diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java index d525501c777..0b56cda2c60 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java @@ -20,7 +20,7 @@ import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -35,7 +35,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.StorageStatsSource; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.drawable.UserIconDrawable; @@ -46,12 +45,13 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SecondaryUserControllerTest { private static final String TEST_NAME = "Fred"; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java index 0741d6d6248..feb3533e49e 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java @@ -24,7 +24,7 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; @@ -54,22 +54,20 @@ import com.android.settings.applications.manageapplications.ManageApplications; import com.android.settings.deviceinfo.PrivateVolumeSettings; import com.android.settings.deviceinfo.StorageItemPreference; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settingslib.applications.StorageStatsSource; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import com.android.settingslib.deviceinfo.StorageVolumeProvider; -import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class StorageItemPreferenceControllerTest { private Context mContext; @@ -90,10 +88,8 @@ public class StorageItemPreferenceControllerTest { private MetricsFeatureProvider mMetricsFeatureProvider; @Before - public void setUp() throws Exception { + public void setUp() { MockitoAnnotations.initMocks(this); - SettingsShadowResources.overrideResource("android:string/fileSizeSuffix", "%1$s %2$s"); - SettingsShadowResources.overrideResource("android:string/gigabyteShort", "GB"); when(mFragment.getActivity()).thenReturn(mActivity); when(mFragment.getFragmentManager()).thenReturn(mFragmentManager); when(mFragmentManager.beginTransaction()).thenReturn(mFragmentTransaction); @@ -111,11 +107,6 @@ public class StorageItemPreferenceControllerTest { inflater.inflate(mPreference.getLayoutResource(), new LinearLayout(mContext), false); } - @After - public void tearDown() { - SettingsShadowResources.reset(); - } - @Test public void testUpdateStateWithInitialState() { assertThat(mPreference.getSummary().toString()) diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java index 6892191943f..4f72318f731 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java @@ -21,8 +21,8 @@ import static com.android.settings.TestUtils.KILOBYTE; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -42,26 +42,19 @@ import androidx.preference.PreferenceViewHolder; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import com.android.settingslib.deviceinfo.StorageVolumeProvider; -import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; import org.robolectric.Robolectric; -import org.robolectric.annotation.Config; +import org.robolectric.RobolectricTestRunner; import java.io.File; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = { - SettingsShadowResources.class, - SettingsShadowResources.SettingsShadowTheme.class -}) +@RunWith(RobolectricTestRunner.class) public class StorageSummaryDonutPreferenceControllerTest { private Context mContext; @@ -73,8 +66,6 @@ public class StorageSummaryDonutPreferenceControllerTest { @Before public void setUp() throws Exception { - SettingsShadowResources.overrideResource( - com.android.internal.R.string.config_headlineFontFamily, ""); mContext = spy(Robolectric.setupActivity(Activity.class)); mFakeFeatureFactory = FakeFeatureFactory.setupForTest(); mMetricsFeatureProvider = mFakeFeatureFactory.getMetricsFeatureProvider(); @@ -88,11 +79,6 @@ public class StorageSummaryDonutPreferenceControllerTest { mHolder = PreferenceViewHolder.createInstanceForTests(view); } - @After - public void tearDown() { - SettingsShadowResources.reset(); - } - @Test public void testEmpty() { final long totalSpace = 32 * GIGABYTE; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java index 4706b7d959d..9e2b45d05a1 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java @@ -38,7 +38,6 @@ import androidx.preference.PreferenceScreen; import com.android.settings.SettingsActivity; import com.android.settings.SubSettings; import com.android.settings.deviceinfo.StorageProfileFragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.StorageStatsSource; import com.android.settingslib.drawable.UserIconDrawable; @@ -49,8 +48,9 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class UserProfileControllerTest { private static final String TEST_NAME = "Fred"; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java index 1e912ba2b29..5aa9f72e386 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java @@ -2,20 +2,20 @@ package com.android.settings.deviceinfo.storage; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import android.os.storage.VolumeInfo; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.deviceinfo.PrivateStorageInfo; import com.android.settingslib.deviceinfo.StorageVolumeProvider; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class VolumeSizesLoaderTest { @Test public void getVolumeSize_getsValidSizes() throws Exception { diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java index 0c8bc7b7ab7..f8e0a74b8c2 100644 --- a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java @@ -26,7 +26,6 @@ import android.content.Context; import android.provider.Settings; import com.android.internal.hardware.AmbientDisplayConfiguration; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowSecureSettings; import org.junit.Before; @@ -34,10 +33,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowSecureSettings.class) public class AmbientDisplayAlwaysOnPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java index a8d5e19ab79..e36b3947625 100644 --- a/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java @@ -20,9 +20,9 @@ import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; @@ -35,7 +35,6 @@ import android.provider.Settings; import androidx.preference.SwitchPreference; import com.android.internal.hardware.AmbientDisplayConfiguration; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowSecureSettings; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; @@ -44,11 +43,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowSecureSettings.class) public class AmbientDisplayNotificationsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/display/AppGridViewTest.java b/tests/robotests/src/com/android/settings/display/AppGridViewTest.java index 05226c359de..e7daac89750 100644 --- a/tests/robotests/src/com/android/settings/display/AppGridViewTest.java +++ b/tests/robotests/src/com/android/settings/display/AppGridViewTest.java @@ -30,16 +30,15 @@ import android.content.pm.ResolveInfo; import android.graphics.drawable.Drawable; import android.util.IconDrawableFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppGridViewTest { @Mock diff --git a/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java index 6f667ae8c11..a8edc44d8a9 100644 --- a/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java @@ -27,15 +27,15 @@ import android.content.Context; import android.provider.Settings; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AutoBrightnessPreferenceControllerTest { private static final String PREFERENCE_KEY = "auto_brightness"; diff --git a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java index e4db3ee1ac5..a26e0b70ddd 100644 --- a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java @@ -18,8 +18,8 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.when; import android.content.ContentResolver; @@ -33,9 +33,7 @@ import androidx.preference.SwitchPreference; import com.android.internal.view.RotationPolicy; import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowRotationPolicy; -import com.android.settings.testutils.shadow.ShadowSystemSettings; import org.junit.After; import org.junit.Before; @@ -44,11 +42,11 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = ShadowSystemSettings.class) +@RunWith(RobolectricTestRunner.class) public class AutoRotatePreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) @@ -71,11 +69,6 @@ public class AutoRotatePreferenceControllerTest { mController = new AutoRotatePreferenceController(mContext, "auto_rotate"); } - @After - public void tearDown() { - ShadowSystemSettings.reset(); - } - @Test public void isAvailableWhenPolicyAllows() { assertThat(mController.isAvailable()).isFalse(); diff --git a/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java index 708c9c1a177..bbc8faf1b0c 100644 --- a/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java @@ -23,14 +23,13 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.provider.Settings; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatteryPercentagePreferenceControllerTest { private static final String PREF_KEY = "battery_percentage"; diff --git a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java index a22a1591053..f5af290dcc2 100644 --- a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java @@ -20,7 +20,7 @@ import static android.content.Context.POWER_SERVICE; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.spy; @@ -35,19 +35,18 @@ import android.provider.Settings.System; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowApplication; import org.robolectric.shadows.ShadowContentResolver; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BrightnessLevelPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java index eddace14207..e7f025f7be4 100644 --- a/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java @@ -28,16 +28,16 @@ import androidx.preference.Preference; import com.android.internal.app.ColorDisplayController; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ColorModePreferenceControllerTest { @Mock @@ -99,5 +99,4 @@ public class ColorModePreferenceControllerTest { assertThat(mPreference.getSummary()) .isEqualTo(mContext.getText(R.string.color_mode_option_natural)); } - } diff --git a/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java index 57f0ebbc6a0..a87dddd2aad 100644 --- a/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java @@ -34,24 +34,25 @@ import androidx.preference.PreferenceScreen; import com.android.internal.app.ColorDisplayController; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settingslib.widget.CandidateInfo; import com.android.settingslib.widget.LayoutPreference; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.class) public class ColorModePreferenceFragmentTest { @@ -71,6 +72,11 @@ public class ColorModePreferenceFragmentTest { ReflectionHelpers.setField(mFragment, "mController", mController); } + @After + public void tearDown() { + SettingsShadowResources.reset(); + } + @Test public void verifyMetricsConstant() { assertThat(mFragment.getMetricsCategory()) diff --git a/tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java index db33cbe93fb..0344a14cfd3 100644 --- a/tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java @@ -26,16 +26,15 @@ import android.content.Context; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DarkUIPreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/display/FontSizePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/FontSizePreferenceControllerTest.java index 5169290c0ce..888b711efc5 100644 --- a/tests/robotests/src/com/android/settings/display/FontSizePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/FontSizePreferenceControllerTest.java @@ -23,14 +23,14 @@ import android.provider.Settings; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FontSizePreferenceControllerTest { private static final String TEST_KEY = "test_key"; @@ -54,23 +54,20 @@ public class FontSizePreferenceControllerTest { @Test public void getSummary_noScale_shouldReturnDefaultSummary() { - assertThat(mController.getSummary()) - .isEqualTo(mFontSizeArray[1]); + assertThat(mController.getSummary()).isEqualTo(mFontSizeArray[1]); } @Test public void getSummary_smallScale_shouldReturnSmall() { Settings.System.putFloat(mContext.getContentResolver(), Settings.System.FONT_SCALE, 0.5f); - assertThat(mController.getSummary()) - .isEqualTo(mFontSizeArray[0]); + assertThat(mController.getSummary()).isEqualTo(mFontSizeArray[0]); } @Test public void getSummary_largeScale_shouldReturnLarge() { Settings.System.putFloat(mContext.getContentResolver(), Settings.System.FONT_SCALE, 1.5f); - assertThat(mController.getSummary()) - .isEqualTo(mFontSizeArray[3]); + assertThat(mController.getSummary()).isEqualTo(mFontSizeArray[3]); } } diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java index 84d184de419..6e23e5f67fe 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java @@ -16,7 +16,7 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.when; import android.content.Context; @@ -26,19 +26,20 @@ import android.view.View; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settingslib.widget.LayoutPreference; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.class) public class NightDisplayActivationPreferenceControllerTest { @@ -59,6 +60,11 @@ public class NightDisplayActivationPreferenceControllerTest { mController.displayPreference(mScreen); } + @After + public void tearDown() { + SettingsShadowResources.reset(); + } + @Test public void isAvailable_configuredAvailable() { SettingsShadowResources.overrideResource( diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayAutoModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayAutoModePreferenceControllerTest.java index 945b50f9d5c..85d497a1733 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplayAutoModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplayAutoModePreferenceControllerTest.java @@ -20,16 +20,17 @@ import android.content.Context; import android.provider.Settings.Secure; import com.android.internal.app.ColorDisplayController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.class) public class NightDisplayAutoModePreferenceControllerTest { @@ -43,6 +44,11 @@ public class NightDisplayAutoModePreferenceControllerTest { "night_display_auto_mode"); } + @After + public void tearDown() { + SettingsShadowResources.reset(); + } + @Test public void isAvailable_configuredAvailable() { SettingsShadowResources.overrideResource( diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceControllerTest.java index c49c174be42..d02faa920c4 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceControllerTest.java @@ -16,16 +16,17 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.class) public class NightDisplayCustomEndTimePreferenceControllerTest { @@ -37,6 +38,11 @@ public class NightDisplayCustomEndTimePreferenceControllerTest { RuntimeEnvironment.application, "night_display_end_time"); } + @After + public void tearDown() { + SettingsShadowResources.reset(); + } + @Test public void isAvailable_configuredAvailable() { SettingsShadowResources.overrideResource( diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceControllerTest.java index a38c755a65c..3a618efc401 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceControllerTest.java @@ -16,16 +16,17 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.class) public class NightDisplayCustomStartTimePreferenceControllerTest { @@ -37,6 +38,11 @@ public class NightDisplayCustomStartTimePreferenceControllerTest { RuntimeEnvironment.application, "night_display_start_time"); } + @After + public void tearDown() { + SettingsShadowResources.reset(); + } + @Test public void isAvailable_configuredAvailable() { SettingsShadowResources.overrideResource( diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayFooterPreferenceControllerTest.java index e43e7259ffc..18aff9d77c8 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplayFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplayFooterPreferenceControllerTest.java @@ -16,16 +16,17 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.class) public class NightDisplayFooterPreferenceControllerTest { @@ -36,6 +37,11 @@ public class NightDisplayFooterPreferenceControllerTest { mController = new NightDisplayFooterPreferenceController(RuntimeEnvironment.application); } + @After + public void tearDown() { + SettingsShadowResources.reset(); + } + @Test public void isAvailable_configuredAvailable() { SettingsShadowResources.overrideResource( @@ -49,5 +55,4 @@ public class NightDisplayFooterPreferenceControllerTest { com.android.internal.R.bool.config_nightDisplayAvailable, false); assertThat(mController.isAvailable()).isFalse(); } - } diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayIntensityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayIntensityPreferenceControllerTest.java index 99dcb5a7d96..2edec2ed5b5 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplayIntensityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplayIntensityPreferenceControllerTest.java @@ -19,16 +19,17 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.provider.Settings.Secure; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.class) public class NightDisplayIntensityPreferenceControllerTest { @@ -42,6 +43,11 @@ public class NightDisplayIntensityPreferenceControllerTest { "night_display_temperature"); } + @After + public void tearDown() { + SettingsShadowResources.reset(); + } + @Test public void isAvailable_configuredAvailable_isActivated_available() { SettingsShadowResources.overrideResource( diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayPreferenceControllerTest.java index 3822f73cbfa..c066e6cdbce 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplayPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplayPreferenceControllerTest.java @@ -7,19 +7,17 @@ import android.provider.Settings.Secure; import com.android.internal.app.ColorDisplayController; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = { - SettingsShadowResources.class -}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = {SettingsShadowResources.class}) public class NightDisplayPreferenceControllerTest { @After diff --git a/tests/robotests/src/com/android/settings/display/NightDisplaySettingsTest.java b/tests/robotests/src/com/android/settings/display/NightDisplaySettingsTest.java index 80d8987abeb..2ae33cf7bdc 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplaySettingsTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplaySettingsTest.java @@ -20,17 +20,17 @@ import static com.google.common.truth.Truth.assertThat; import android.provider.SearchIndexableResource; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.drawer.CategoryKey; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NightDisplaySettingsTest { @Test diff --git a/tests/robotests/src/com/android/settings/display/ScreenZoomSettingsTest.java b/tests/robotests/src/com/android/settings/display/ScreenZoomSettingsTest.java index 082207629ea..c1a46f2ba51 100644 --- a/tests/robotests/src/com/android/settings/display/ScreenZoomSettingsTest.java +++ b/tests/robotests/src/com/android/settings/display/ScreenZoomSettingsTest.java @@ -23,15 +23,14 @@ import static org.mockito.Mockito.spy; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ScreenZoomSettingsTest { private ScreenZoomSettings mSettings; diff --git a/tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.java index a5b34498a90..9026c04269f 100644 --- a/tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.java @@ -26,7 +26,6 @@ import android.provider.Settings; import androidx.preference.SwitchPreference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -34,8 +33,9 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ShowOperatorNamePreferenceControllerTest { private static final String KEY_SHOW_OPERATOR_NAME = "show_operator_name"; diff --git a/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java index 9d15ca06dfe..41947a064d3 100644 --- a/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java @@ -18,9 +18,9 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -38,7 +38,6 @@ import androidx.preference.ListPreference; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -46,11 +45,12 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.Arrays; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ThemePreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/display/TimeoutListPreferenceTest.java b/tests/robotests/src/com/android/settings/display/TimeoutListPreferenceTest.java index a1d94fa7f9f..55fcdacea51 100644 --- a/tests/robotests/src/com/android/settings/display/TimeoutListPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/display/TimeoutListPreferenceTest.java @@ -22,7 +22,6 @@ import static org.robolectric.RuntimeEnvironment.application; import android.util.AttributeSet; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settingslib.RestrictedLockUtils; @@ -31,10 +30,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowUserManager.class) public class TimeoutListPreferenceTest { private static final CharSequence[] VALUES = @@ -49,7 +50,10 @@ public class TimeoutListPreferenceTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - mPreference = new TimeoutListPreference(application, mock(AttributeSet.class)); + + AttributeSet attributeSet = Robolectric.buildAttributeSet().build(); + + mPreference = new TimeoutListPreference(application, attributeSet); ReflectionHelpers.setField(mPreference, "mInitialValues", VALUES); ReflectionHelpers.setField(mPreference, "mInitialEntries", ENTRIES); ReflectionHelpers.setField(mPreference, "mEntries", ENTRIES); diff --git a/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java index f6f0d7f7fc6..cf0e6606112 100644 --- a/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java @@ -32,7 +32,6 @@ import android.os.UserManager; import android.provider.Settings; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowDevicePolicyManager; import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; @@ -44,6 +43,7 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @@ -51,7 +51,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowDevicePolicyManager.class) public class TimeoutPreferenceControllerTest { @@ -134,7 +134,7 @@ public class TimeoutPreferenceControllerTest { verify(mPreference, times(2)) .removeUnusableTimeouts(longCaptor.capture(), adminCaptor.capture()); - assertThat((long) longCaptor.getValue()).isEqualTo(0); + assertThat(longCaptor.getValue()).isEqualTo(0); assertThat(adminCaptor.getValue()).isNotNull(); } diff --git a/tests/robotests/src/com/android/settings/display/TopLevelDisplayPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/TopLevelDisplayPreferenceControllerTest.java index fe4fcc8e225..9ad05ce56e2 100644 --- a/tests/robotests/src/com/android/settings/display/TopLevelDisplayPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/TopLevelDisplayPreferenceControllerTest.java @@ -31,7 +31,6 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -41,8 +40,9 @@ import org.mockito.MockitoAnnotations; import java.util.ArrayList; import java.util.List; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TopLevelDisplayPreferenceControllerTest { @Mock private Context mContext; @@ -55,10 +55,8 @@ public class TopLevelDisplayPreferenceControllerTest { public void setUp() { MockitoAnnotations.initMocks(this); when(mContext.getPackageManager()).thenReturn(mPackageManager); - when(mContext.getString(R.string.config_wallpaper_picker_package)) - .thenReturn("pkg"); - when(mContext.getString(R.string.config_wallpaper_picker_class)) - .thenReturn("cls"); + when(mContext.getString(R.string.config_wallpaper_picker_package)).thenReturn("pkg"); + when(mContext.getString(R.string.config_wallpaper_picker_class)).thenReturn("cls"); mController = new TopLevelDisplayPreferenceController(mContext, "test_key"); } @@ -88,5 +86,4 @@ public class TopLevelDisplayPreferenceControllerTest { assertThat(mController.getSummary()) .isEqualTo(mContext.getText(R.string.display_dashboard_nowallpaper_summary)); } - } diff --git a/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java b/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java index b7fb5edc412..05ee422a3e2 100644 --- a/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java +++ b/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java @@ -26,19 +26,19 @@ import android.os.UserHandle; import android.provider.Settings; import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowSecureSettings; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class VrDisplayPreferencePickerTest { private VrDisplayPreferencePicker mPicker; diff --git a/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java index b4305b6e9d6..a641b192e8e 100644 --- a/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java @@ -18,8 +18,8 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -29,7 +29,6 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -39,8 +38,9 @@ import org.mockito.MockitoAnnotations; import java.util.ArrayList; import java.util.List; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WallpaperPreferenceControllerTest { private static final String WALLPAPER_PACKAGE = "TestPkg"; diff --git a/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java b/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java index a26997c135a..88d0ff1846e 100644 --- a/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java +++ b/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java @@ -28,7 +28,6 @@ import android.content.Context; import android.os.UserManager; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.dream.DreamBackend; import com.android.settingslib.dream.DreamBackend.DreamInfo; @@ -38,11 +37,12 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.util.ReflectionHelpers; import java.util.Collections; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class CurrentDreamPickerTest { private static String COMPONENT_KEY = "mocked_component_name_string"; @@ -62,7 +62,7 @@ public class CurrentDreamPickerTest { FakeFeatureFactory.setupForTest(); mPicker = new CurrentDreamPicker(); - mPicker.onAttach((Context) mActivity); + mPicker.onAttach(mActivity); ReflectionHelpers.setField(mPicker, "mBackend", mBackend); } diff --git a/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java index d3244416d20..8a5ee20c4f1 100644 --- a/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java @@ -25,7 +25,6 @@ import static org.mockito.Mockito.when; import android.content.ComponentName; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.GearPreference; import com.android.settingslib.dream.DreamBackend; import com.android.settingslib.dream.DreamBackend.DreamInfo; @@ -37,12 +36,13 @@ import org.mockito.Answers; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.Collections; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class CurrentDreamPreferenceControllerTest { private CurrentDreamPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java b/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java index b9703e2176b..a5545645e9b 100644 --- a/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java +++ b/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java @@ -24,7 +24,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.dream.DreamBackend; import com.android.settingslib.dream.DreamBackend.WhenToDream; @@ -33,29 +32,30 @@ import org.junit.runner.RunWith; import java.util.Arrays; import java.util.List; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DreamSettingsTest { private static final List KEYS = Arrays.asList( - DreamSettings.WHILE_CHARGING_ONLY, - DreamSettings.WHILE_DOCKED_ONLY, - DreamSettings.EITHER_CHARGING_OR_DOCKED, - DreamSettings.NEVER_DREAM - ); + DreamSettings.WHILE_CHARGING_ONLY, + DreamSettings.WHILE_DOCKED_ONLY, + DreamSettings.EITHER_CHARGING_OR_DOCKED, + DreamSettings.NEVER_DREAM + ); private static final @WhenToDream int[] SETTINGS = { - DreamBackend.WHILE_CHARGING, - DreamBackend.WHILE_DOCKED, - DreamBackend.EITHER, - DreamBackend.NEVER, - }; + DreamBackend.WHILE_CHARGING, + DreamBackend.WHILE_DOCKED, + DreamBackend.EITHER, + DreamBackend.NEVER, + }; private static final int[] RES_IDS = { - R.string.screensaver_settings_summary_sleep, - R.string.screensaver_settings_summary_dock, - R.string.screensaver_settings_summary_either_long, - R.string.screensaver_settings_summary_never + R.string.screensaver_settings_summary_sleep, + R.string.screensaver_settings_summary_dock, + R.string.screensaver_settings_summary_either_long, + R.string.screensaver_settings_summary_never }; @Test diff --git a/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java index 21cb9f153fc..d58d7e8d5f3 100644 --- a/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java @@ -28,7 +28,6 @@ import android.widget.Button; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.dream.DreamBackend; import com.android.settingslib.widget.LayoutPreference; @@ -39,9 +38,10 @@ import org.mockito.Answers; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class StartNowPreferenceControllerTest { private StartNowPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java b/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java index 17c6cedab2b..5173b63197f 100644 --- a/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java +++ b/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java @@ -26,7 +26,6 @@ import android.content.Context; import android.os.UserManager; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.dream.DreamBackend; import org.junit.Before; @@ -35,9 +34,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WhenToDreamPickerTest { private WhenToDreamPicker mPicker; diff --git a/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java index e4f5cff1d76..acb2a80cbb2 100644 --- a/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java @@ -24,7 +24,6 @@ import android.content.Context; import androidx.preference.Preference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.dream.DreamBackend; import com.android.settingslib.dream.DreamBackend.WhenToDream; @@ -34,9 +33,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WhenToDreamPreferenceControllerTest { private WhenToDreamPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java b/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java index 8ab3b636d10..c01ef3fa56e 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java @@ -37,10 +37,8 @@ import com.android.settings.R; import com.android.settings.Settings; import com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminAdd; import com.android.settings.testutils.CustomActivity; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowActivity; import com.android.settings.testutils.shadow.ShadowDevicePolicyManager; -import com.android.settings.testutils.shadow.ShadowProcess; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; @@ -48,17 +46,18 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadow.api.Shadow; +import org.robolectric.shadows.ShadowProcess; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = { ShadowDevicePolicyManager.class, ShadowUserManager.class, - ShadowActivity.class, - ShadowProcess.class + ShadowActivity.class }) public class ActionDisabledByAdminDialogHelperTest { private ActionDisabledByAdminDialogHelper mHelper; @@ -156,7 +155,7 @@ public class ActionDisabledByAdminDialogHelperTest { dpmShadow.setIsAdminActiveAsUser(true); userManagerShadow.addProfile(new UserInfo(123, null, 0)); userManagerShadow.addUserProfile(new UserHandle(123)); - ShadowProcess.setMyUid(Process.SYSTEM_UID); + ShadowProcess.setUid(Process.SYSTEM_UID); mHelper.setAdminSupportDetails(mActivity, view, admin); assertNotNull(admin.component); diff --git a/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogTest.java b/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogTest.java index e016a06990c..75bd672b955 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogTest.java @@ -16,20 +16,21 @@ package com.android.settings.enterprise; +import static org.junit.Assert.assertEquals; + import android.app.admin.DevicePolicyManager; import android.content.ComponentName; import android.content.Intent; import android.os.UserHandle; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; -import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ActionDisabledByAdminDialogTest { private ActionDisabledByAdminDialog mDialog; @@ -48,7 +49,7 @@ public class ActionDisabledByAdminDialogTest { final Intent intent = new Intent(); intent.putExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN, component); intent.putExtra(Intent.EXTRA_USER_ID, userId); - Assert.assertEquals(expectedAdmin, mDialog.getAdminDetailsFromIntent(intent)); + assertEquals(expectedAdmin, mDialog.getAdminDetailsFromIntent(intent)); } @Test @@ -56,7 +57,7 @@ public class ActionDisabledByAdminDialogTest { final int userId = UserHandle.myUserId(); final EnforcedAdmin expectedAdmin = new EnforcedAdmin(null, UserHandle.of(userId)); - Assert.assertEquals(expectedAdmin, mDialog.getAdminDetailsFromIntent(null)); + assertEquals(expectedAdmin, mDialog.getAdminDetailsFromIntent(null)); } @Test @@ -65,11 +66,11 @@ public class ActionDisabledByAdminDialogTest { final Intent intent = new Intent(); intent.putExtra(DevicePolicyManager.EXTRA_RESTRICTION, restriction); - Assert.assertEquals(restriction, mDialog.getRestrictionFromIntent(intent)); + assertEquals(restriction, mDialog.getRestrictionFromIntent(intent)); } @Test public void testGetRestrictionFromNullIntent() { - Assert.assertEquals(null, mDialog.getRestrictionFromIntent(null)); + assertEquals(null, mDialog.getRestrictionFromIntent(null)); } } diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java index 26bc78783a8..8d5e4dad13d 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java @@ -18,14 +18,13 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; import java.util.Date; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AdminActionPreferenceControllerBaseTest extends AdminActionPreferenceControllerTestBase { diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceControllerTest.java index 82ec40e0434..6982ba6b854 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceControllerTest.java @@ -18,11 +18,10 @@ package com.android.settings.enterprise; import android.Manifest; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AdminGrantedCameraPermissionPreferenceControllerTest extends AdminGrantedPermissionsPreferenceControllerTestBase { diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceControllerTest.java index 8f30e92968b..6328f53a2f8 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceControllerTest.java @@ -18,11 +18,10 @@ package com.android.settings.enterprise; import android.Manifest; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AdminGrantedLocationPermissionsPreferenceControllerTest extends AdminGrantedPermissionsPreferenceControllerTestBase { diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceControllerTest.java index 1acbfdcb78d..d9275f6a1c2 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceControllerTest.java @@ -18,11 +18,10 @@ package com.android.settings.enterprise; import android.Manifest; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AdminGrantedMicrophonePermissionPreferenceControllerTest extends AdminGrantedPermissionsPreferenceControllerTestBase { diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBaseTest.java index 854ccc86f51..49e098415fb 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBaseTest.java @@ -16,11 +16,10 @@ package com.android.settings.enterprise; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AdminGrantedPermissionsPreferenceControllerBaseTest extends AdminGrantedPermissionsPreferenceControllerTestBase { @@ -47,4 +46,3 @@ public class AdminGrantedPermissionsPreferenceControllerBaseTest } } } - diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java index 2da6a88df74..6c136f1c045 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java @@ -18,8 +18,8 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java index 8c704fca781..2ff9d17afdd 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java @@ -26,7 +26,6 @@ import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -34,8 +33,9 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public final class AlwaysOnVpnCurrentUserPreferenceControllerTest { private static final String VPN_SET_DEVICE = "VPN set"; diff --git a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java index 759edb37087..5a4f38bfc09 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java @@ -25,7 +25,6 @@ import android.content.Context; import androidx.preference.Preference; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -33,8 +32,9 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AlwaysOnVpnManagedProfilePreferenceControllerTest { private static final String KEY_ALWAYS_ON_VPN_MANAGED_PROFILE = "always_on_vpn_managed_profile"; diff --git a/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java b/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java index 5c197926a27..7bb8c61fda5 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java @@ -33,7 +33,6 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.applications.ApplicationFeatureProvider; import com.android.settings.applications.UserAppInfo; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.AbstractPreferenceController; import org.junit.Before; @@ -41,12 +40,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ApplicationListFragmentTest { private static final int USER_ID = 0; diff --git a/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java index 833efd4d3dd..298c37690f2 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java @@ -21,9 +21,9 @@ import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Answers.RETURNS_DEEP_STUBS; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; @@ -41,7 +41,6 @@ import androidx.preference.PreferenceScreen; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.applications.ApplicationFeatureProvider; import com.android.settings.applications.UserAppInfo; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -49,6 +48,7 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; @@ -57,7 +57,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ApplicationListPreferenceControllerTest { private static final int MAIN_USER_ID = 0; diff --git a/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java index 63c5981524b..5a05eccf640 100644 --- a/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java @@ -20,14 +20,13 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.when; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; import java.util.Date; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BugReportsPreferenceControllerTest extends AdminActionPreferenceControllerTestBase { diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java index 48bb0ce125e..799dd7e3600 100644 --- a/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java @@ -23,13 +23,13 @@ import static org.mockito.Mockito.when; import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class CaCertsCurrentUserPreferenceControllerTest extends CaCertsPreferenceControllerTestBase { diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceControllerTest.java index 2ba55ed0dad..b2f34cb32a7 100644 --- a/tests/robotests/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceControllerTest.java @@ -18,11 +18,10 @@ package com.android.settings.enterprise; import static org.mockito.Mockito.when; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class CaCertsManagedProfilePreferenceControllerTest extends CaCertsPreferenceControllerTestBase { diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerBaseTest.java index 16905eecade..ea1edd6da76 100644 --- a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerBaseTest.java @@ -18,11 +18,10 @@ package com.android.settings.enterprise; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class CaCertsPreferenceControllerBaseTest extends CaCertsPreferenceControllerTestBase { private static final String PREF_KEY = "pref"; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java index ac3ee27d8f2..232d3e792c7 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java @@ -30,7 +30,6 @@ import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.applications.ApplicationFeatureProvider; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -40,8 +39,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EnterpriseInstalledPackagesPreferenceControllerTest { private static final String KEY_NUMBER_ENTERPRISE_INSTALLED_PACKAGES diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java index 92c420af960..8cbaa76355f 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java @@ -37,13 +37,13 @@ import android.provider.Settings; import android.text.SpannableStringBuilder; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; @@ -51,7 +51,7 @@ import java.util.Arrays; import java.util.Date; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EnterprisePrivacyFeatureProviderImplTest { private final ComponentName OWNER = new ComponentName("dummy", "component"); diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java index dc5794c85da..6858dd3391b 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java @@ -26,7 +26,6 @@ import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -34,8 +33,9 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EnterprisePrivacyPreferenceControllerTest { private static final String MANAGED_GENERIC = "managed by organization"; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java index f7a61c88cd9..2d4ba6295e5 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java @@ -25,7 +25,6 @@ import android.content.Context; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.PreferenceCategoryController; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.drawer.CategoryKey; @@ -36,11 +35,12 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EnterprisePrivacySettingsTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java index 54559688401..52954021a9b 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java @@ -28,7 +28,6 @@ import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.AbstractPreferenceController; import org.junit.Before; @@ -36,11 +35,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EnterpriseSetDefaultAppsListFragmentTest { @Mock(answer = RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java index 2b3ed738dd7..7a2aa5cf962 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java @@ -19,9 +19,9 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Answers.RETURNS_DEEP_STUBS; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -44,7 +44,6 @@ import com.android.settings.applications.EnterpriseDefaultApps; import com.android.settings.applications.UserAppInfo; import com.android.settings.testutils.ApplicationTestUtils; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -52,13 +51,14 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import java.util.Arrays; import java.util.Collections; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EnterpriseSetDefaultAppsListPreferenceControllerTest { private static final int USER_ID = 0; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java index eabd4bb7b6c..b91582bb9f8 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java @@ -19,9 +19,9 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.argThat; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; import android.content.Context; @@ -36,7 +36,6 @@ import com.android.settings.R; import com.android.settings.applications.EnterpriseDefaultApps; import com.android.settings.applications.UserAppInfo; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -48,8 +47,9 @@ import org.mockito.MockitoAnnotations; import java.util.ArrayList; import java.util.List; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public final class EnterpriseSetDefaultAppsPreferenceControllerTest { private static final String KEY_DEFAULT_APPS = "number_enterprise_set_default_apps"; diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceControllerTest.java index 25044c69082..a8c4abbd835 100644 --- a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceControllerTest.java @@ -18,11 +18,10 @@ package com.android.settings.enterprise; import static org.mockito.Mockito.when; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FailedPasswordWipeCurrentUserPreferenceControllerTest extends FailedPasswordWipePreferenceControllerTestBase { diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceControllerTest.java index aed46bd21ff..d4536dcdca5 100644 --- a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceControllerTest.java @@ -18,11 +18,10 @@ package com.android.settings.enterprise; import static org.mockito.Mockito.when; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public final class FailedPasswordWipeManagedProfilePreferenceControllerTest extends FailedPasswordWipePreferenceControllerTestBase { diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBaseTest.java index 83fbe6ced82..9d9b5188982 100644 --- a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBaseTest.java @@ -16,11 +16,10 @@ package com.android.settings.enterprise; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FailedPasswordWipePreferenceControllerBaseTest extends FailedPasswordWipePreferenceControllerTestBase { diff --git a/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java index 10e569a7a7e..05d1c640fd0 100644 --- a/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java @@ -25,7 +25,6 @@ import android.content.Context; import androidx.preference.Preference; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -33,8 +32,9 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class GlobalHttpProxyPreferenceControllerTest { private static final String KEY_GLOBAL_HTTP_PROXY = "global_http_proxy"; diff --git a/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java index d62576065f5..facdce5d0c9 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java @@ -26,7 +26,6 @@ import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -34,8 +33,9 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ImePreferenceControllerTest { private static final String DEFAULT_IME_LABEL = "Test IME"; diff --git a/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java index 661585326a1..492a8639c7c 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java @@ -28,17 +28,17 @@ import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ManageDeviceAdminPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java index 56d90f56c76..89c208c89f0 100644 --- a/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java @@ -20,14 +20,13 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.when; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; import java.util.Date; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NetworkLogsPreferenceControllerTest extends AdminActionPreferenceControllerTestBase { @Override diff --git a/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java index 00eb3f96487..8612ee79bf8 100644 --- a/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java @@ -20,14 +20,13 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.when; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; import java.util.Date; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SecurityLogsPreferenceControllerTest extends AdminActionPreferenceControllerTestBase { @Override diff --git a/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceTest.java b/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceTest.java index 4af57545642..fe7a6854c3f 100644 --- a/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceTest.java +++ b/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceTest.java @@ -30,18 +30,17 @@ import androidx.slice.core.SliceAction; import androidx.slice.widget.SliceLiveData; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SliceTester; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; - -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FlashlightSliceTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java index c9086abf773..8eeac8d26b0 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java @@ -20,11 +20,11 @@ import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENT import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -52,7 +52,6 @@ import com.android.internal.os.BatteryStatsHelper; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowActivityManager; import com.android.settings.testutils.shadow.ShadowEntityHeaderController; import com.android.settings.widget.EntityHeaderController; @@ -71,11 +70,12 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.mockito.stubbing.Answer; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowEntityHeaderController.class, ShadowActivityManager.class}) public class AdvancedPowerUsageDetailTest { private static final String APP_LABEL = "app label"; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java index fcd483a8082..0b6051b7ee1 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java @@ -27,15 +27,15 @@ import androidx.preference.SwitchPreference; import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AutoRestrictionPreferenceControllerTest { private static final int ON = 1; private static final int OFF = 0; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java index 6b52b650879..75b38a0bdfe 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java @@ -18,9 +18,9 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; @@ -38,8 +38,6 @@ import android.os.UserManager; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settings.testutils.shadow.ShadowFragment; import com.android.settingslib.RestrictedPreference; import com.android.settingslib.fuelgauge.PowerWhitelistBackend; @@ -50,11 +48,12 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {SettingsShadowResources.SettingsShadowTheme.class, ShadowFragment.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowFragment.class) public class BackgroundActivityPreferenceControllerTest { private static final int UID_LOW_SDK = 1234; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java index 2ef359b9378..e1913a2d304 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java @@ -34,16 +34,16 @@ import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatteryAppListPreferenceControllerTest { private static final String[] PACKAGE_NAMES = {"com.app1", "com.app2"}; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java index 02a6761e694..cdbbf7e23a4 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java @@ -19,8 +19,8 @@ import static com.android.settings.fuelgauge.BatteryBroadcastReceiver.BatteryUpd import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -34,21 +34,18 @@ import android.os.PowerManager; import com.android.settings.Utils; import com.android.settings.homepage.contextualcards.slices.BatteryFixSliceTest; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; -import org.robolectric.annotation.Resetter; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatteryBroadcastReceiverTest { private static final String BATTERY_INIT_LEVEL = "100%"; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryDatabaseManagerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryDatabaseManagerTest.java index 41e77e9a8b0..eac5525d1aa 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryDatabaseManagerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryDatabaseManagerTest.java @@ -28,19 +28,19 @@ import com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper; import com.android.settings.fuelgauge.batterytip.AppInfo; import com.android.settings.fuelgauge.batterytip.BatteryDatabaseManager; import com.android.settings.testutils.DatabaseTestUtils; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatteryDatabaseManagerTest { private static String PACKAGE_NAME_NEW = "com.android.app1"; private static int UID_NEW = 345; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java index 7bb08485b5f..fceee7ef67a 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java @@ -31,7 +31,6 @@ import android.os.UserManager; import com.android.internal.os.BatterySipper; import com.android.internal.os.BatterySipper.DrainType; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Rule; @@ -40,11 +39,12 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.Locale; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatteryEntryTest { private static final int APP_UID = 123; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java index 7797a786e57..b22821b7c69 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java @@ -21,9 +21,9 @@ import static androidx.lifecycle.Lifecycle.Event.ON_START; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -43,9 +43,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowEntityHeaderController; import com.android.settings.widget.EntityHeaderController; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -57,18 +54,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowPowerManager; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = { - SettingsShadowResources.class, - SettingsShadowResourcesImpl.class, - SettingsShadowResources.SettingsShadowTheme.class, - ShadowEntityHeaderController.class - }) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowEntityHeaderController.class) public class BatteryHeaderPreferenceControllerTest { private static final String PREF_KEY = "battery_header"; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java index 75f316f90a7..fc8e99472bb 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java @@ -17,8 +17,8 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -31,8 +31,6 @@ import android.widget.TextView; import androidx.preference.PreferenceViewHolder; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settings.widget.UsageView; import org.junit.Before; @@ -40,11 +38,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = SettingsShadowResources.SettingsShadowTheme.class) +@RunWith(RobolectricTestRunner.class) public class BatteryHistoryPreferenceTest { private static final String TEST_STRING = "test"; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java index dc5834ee9c0..6593767a44d 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java @@ -18,8 +18,8 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyLong; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -31,7 +31,6 @@ import android.os.BatteryStats; import com.android.internal.os.BatteryStatsHelper; import com.android.settings.testutils.BatteryTestUtils; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -39,9 +38,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatteryInfoLoaderTest { private static final long TEST_TIME_REMAINING = 1000L; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java index ccc86a29fcf..01030315901 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java @@ -19,7 +19,7 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.Matchers.anyLong; +import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; @@ -39,7 +39,6 @@ import android.util.SparseIntArray; import com.android.settings.testutils.BatteryTestUtils; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.UsageView; import com.android.settingslib.R; @@ -52,12 +51,13 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.time.Duration; import java.util.concurrent.TimeUnit; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatteryInfoTest { private static final String STATUS_CHARGING_NO_TIME = "50% - charging"; @@ -71,7 +71,7 @@ public class BatteryInfoTest { "1 min left until fully charged"; private static final String TEST_BATTERY_LEVEL_10 = "10%"; private static final String FIFTEEN_MIN_FORMATTED = "15 min"; - public static final Estimate DUMMY_ESTIMATE = new Estimate( + private static final Estimate DUMMY_ESTIMATE = new Estimate( 1000, /* estimateMillis */ false, /* isBasedOnUsage */ 1000 /* averageDischargeTime */); diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java index 364a63a33e4..4bdcd5535b3 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java @@ -24,20 +24,15 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.graphics.ColorFilter; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; -import com.android.settings.testutils.shadow.SettingsShadowResources.SettingsShadowTheme; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {SettingsShadowResources.class, SettingsShadowTheme.class}) +@RunWith(RobolectricTestRunner.class) public class BatteryMeterViewTest { private static final int BATTERY_LEVEL = 100; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java index afbb5b6c176..329a70dcd79 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java @@ -33,7 +33,6 @@ import androidx.preference.SwitchPreference; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.dashboard.DashboardFragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.fuelgauge.PowerWhitelistBackend; import org.junit.Before; @@ -41,9 +40,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatteryOptimizationPreferenceControllerTest { private static final String PKG_IN_WHITELIST = "com.pkg.in.whitelist"; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java index 7e887848c11..db9ffa5c7a0 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java @@ -27,17 +27,16 @@ import android.provider.Settings; import androidx.preference.Preference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatterySaverControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverReceiverTest.java index c57c522afea..ec6436a4391 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverReceiverTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverReceiverTest.java @@ -22,15 +22,14 @@ import android.content.Intent; import android.os.BatteryManager; import android.os.PowerManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatterySaverReceiverTest { @Mock diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryStatsHelperLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryStatsHelperLoaderTest.java index 8d1302ff7e8..92a3dc0110c 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryStatsHelperLoaderTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryStatsHelperLoaderTest.java @@ -15,8 +15,8 @@ */ package com.android.settings.fuelgauge; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -25,16 +25,15 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.net.ConnectivityManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatteryStatsHelperLoaderTest { @Mock private BatteryUtils mBatteryUtils; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java index 4cb7ff58b03..7c455bbdd7b 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java @@ -23,10 +23,10 @@ import static android.os.BatteryStats.Uid.PROCESS_STATE_TOP_SLEEPING; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; @@ -57,7 +57,6 @@ import com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper; import com.android.settings.fuelgauge.batterytip.AnomalyInfo; import com.android.settings.fuelgauge.batterytip.BatteryDatabaseManager; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowThreadUtils; import com.android.settingslib.fuelgauge.PowerWhitelistBackend; @@ -67,12 +66,13 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatteryUtilsTest { // unit that used to converted ms to us diff --git a/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java index 1817325e15a..5716b2743e4 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java @@ -16,8 +16,8 @@ package com.android.settings.fuelgauge; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -28,7 +28,6 @@ import android.content.DialogInterface; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.fuelgauge.PowerWhitelistBackend; import org.junit.Before; @@ -36,9 +35,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class HighPowerDetailTest { private static final int TEST_UID = 12000; private static final String TEST_PACKAGE = "com.test.package"; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java index 140a426b7e8..10b89a62290 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java @@ -28,15 +28,15 @@ import android.widget.TextView; import androidx.preference.PreferenceViewHolder; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PowerGaugePreferenceTest { private static final String SUBTITLE = "Summary"; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java index 2f3cb7cf2a4..1ef288016b4 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java @@ -17,9 +17,9 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -37,7 +37,6 @@ import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -45,9 +44,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PowerUsageAdvancedTest { @Mock private PreferenceScreen mPreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java index 012ebb2638c..cd1b1780d2c 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java @@ -15,8 +15,8 @@ */ package com.android.settings.fuelgauge; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -28,7 +28,6 @@ import android.os.Bundle; import androidx.loader.app.LoaderManager; import com.android.internal.os.BatteryStatsHelper; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowDashboardFragment; import com.android.settingslib.core.AbstractPreferenceController; @@ -37,11 +36,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowDashboardFragment.class) public class PowerUsageBaseTest { diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java index 6d18109fb10..e8a9c5cb05a 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java @@ -25,7 +25,6 @@ import android.content.pm.PackageManager; import android.os.Process; import com.android.internal.os.BatterySipper; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -33,8 +32,9 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PowerUsageFeatureProviderImplTest { private static final int UID_OTHER = Process.FIRST_APPLICATION_UID + 2; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java index 14caf2c8187..2ee6d0c9588 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java @@ -19,10 +19,10 @@ import static com.android.settings.fuelgauge.PowerUsageSummary.MENU_ADVANCED_BAT import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; @@ -50,9 +50,7 @@ import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.XmlTestUtils; -import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settingslib.widget.LayoutPreference; import org.junit.Before; @@ -66,18 +64,14 @@ import org.mockito.MockitoAnnotations; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.List; // TODO: Improve this test class so that it starts up the real activity and fragment. -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = { - SettingsShadowResources.class, - SettingsShadowResources.SettingsShadowTheme.class, -}) +@RunWith(RobolectricTestRunner.class) public class PowerUsageSummaryTest { private static final int UID = 123; @@ -115,8 +109,6 @@ public class PowerUsageSummaryTest { private SettingsActivity mSettingsActivity; @Mock private LoaderManager mLoaderManager; - @Mock - private BatteryHeaderPreferenceController mBatteryHeaderPreferenceController; @Mock(answer = Answers.RETURNS_DEEP_STUBS) private Menu mMenu; @Mock @@ -240,14 +232,14 @@ public class PowerUsageSummaryTest { .thenReturn(true); doAnswer(new Answer() { @Override - public Object answer(InvocationOnMock invocation) throws Throwable { + public Object answer(InvocationOnMock invocation) { return mRealContext.getString( R.string.power_usage_old_debug, invocation.getArguments()[0]); } }).when(mFeatureFactory.powerUsageFeatureProvider).getOldEstimateDebugString(any()); doAnswer(new Answer() { @Override - public Object answer(InvocationOnMock invocation) throws Throwable { + public Object answer(InvocationOnMock invocation) { return mRealContext.getString( R.string.power_usage_enhanced_debug, invocation.getArguments()[0]); } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java index 0d3a391e666..3746d648ff4 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java @@ -21,7 +21,7 @@ import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RE import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -38,7 +38,6 @@ import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.fuelgauge.batterytip.AppInfo; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -50,8 +49,9 @@ import org.robolectric.Robolectric; import java.util.ArrayList; import java.util.List; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RestrictAppPreferenceControllerTest { private static final int ALLOWED_UID = 111; private static final String ALLOWED_PACKAGE_NAME = "com.android.allowed.package"; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java index e5a4b3d2e06..2991e780fa0 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java @@ -46,8 +46,6 @@ import com.android.settings.fuelgauge.batterytip.BatteryTipDialogFragment; import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip; import com.android.settings.fuelgauge.batterytip.tips.UnrestrictAppTip; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; import org.junit.Before; @@ -56,6 +54,7 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.androidx.fragment.FragmentController; @@ -64,8 +63,8 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {ShadowAlertDialogCompat.class, SettingsShadowResourcesImpl.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowAlertDialogCompat.class) public class RestrictedAppDetailsTest { private static final String PACKAGE_NAME = "com.android.app"; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java index 96b1d7d810f..7bc6ead2e80 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java @@ -21,22 +21,21 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.doReturn; import android.content.ContentResolver; -import android.content.Context; import android.provider.Settings; import androidx.preference.SwitchPreference; import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SmartBatteryPreferenceControllerTest { private static final int ON = 1; @@ -45,10 +44,8 @@ public class SmartBatteryPreferenceControllerTest { private SmartBatteryPreferenceController mController; private SwitchPreference mPreference; private ContentResolver mContentResolver; - private Context mContext; private FakeFeatureFactory mFeatureFactory; - @Before public void setUp() { MockitoAnnotations.initMocks(this); @@ -120,7 +117,7 @@ public class SmartBatteryPreferenceControllerTest { @Test public void isSliceableCorrectKey_returnsTrue() { final SmartBatteryPreferenceController controller = - new SmartBatteryPreferenceController(mContext); + new SmartBatteryPreferenceController(null); assertThat(controller.isSliceable()).isTrue(); } } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java index b1bc074eb50..e6efef7cc12 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java @@ -22,14 +22,13 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TopLevelBatteryPreferenceControllerTest { private Context mContext; @@ -43,11 +42,9 @@ public class TopLevelBatteryPreferenceControllerTest { public void getDashboardLabel_returnsCorrectLabel() { BatteryInfo info = new BatteryInfo(); info.batteryPercentString = "3%"; - assertThat(getDashboardLabel(mContext, info)) - .isEqualTo(info.batteryPercentString); + assertThat(getDashboardLabel(mContext, info)).isEqualTo(info.batteryPercentString); info.remainingLabel = "Phone will shut down soon"; - assertThat(getDashboardLabel(mContext, info)) - .isEqualTo("3% - Phone will shut down soon"); + assertThat(getDashboardLabel(mContext, info)).isEqualTo("3% - Phone will shut down soon"); } } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceControllerTest.java index 2bc5b14dd3f..df1d9094e2e 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceControllerTest.java @@ -24,18 +24,15 @@ import android.provider.Settings; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = SettingsShadowResources.class) +@RunWith(RobolectricTestRunner.class) public class AutoBatterySaverPreferenceControllerTest { private AutoBatterySaverPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceControllerTest.java index 5d2ac62c3b6..c13b9139994 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceControllerTest.java @@ -22,8 +22,6 @@ import android.provider.Settings; import androidx.lifecycle.LifecycleOwner; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settings.widget.SeekBarPreference; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -31,15 +29,13 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = SettingsShadowResources.class) +@RunWith(RobolectricTestRunner.class) public class AutoBatterySeekBarPreferenceControllerTest { private static final int TRIGGER_LEVEL = 20; - private static final int DEFAULT_LEVEL = 15; private static final int INTERVAL = 5; private AutoBatterySeekBarPreferenceController mController; @@ -54,8 +50,6 @@ public class AutoBatterySeekBarPreferenceControllerTest { mLifecycleOwner = () -> mLifecycle; mLifecycle = new Lifecycle(mLifecycleOwner); - SettingsShadowResources.overrideResource( - com.android.internal.R.integer.config_lowBatteryWarningLevel, DEFAULT_LEVEL); mContext = RuntimeEnvironment.application; mPreference = new SeekBarPreference(mContext); mPreference.setMax(100); @@ -90,7 +84,6 @@ public class AutoBatterySeekBarPreferenceControllerTest { assertThat(mPreference.getProgress()).isEqualTo(TRIGGER_LEVEL / INTERVAL); } - @Test public void testOnPreferenceChange_updateValue() { Settings.Global.putInt(mContext.getContentResolver(), diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java index 051ef399325..7999dc8eb37 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.fuelgauge.batterysaver; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -30,7 +30,6 @@ import android.widget.Button; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.TwoStateButtonPreference; import org.junit.Before; @@ -38,10 +37,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatterySaverButtonPreferenceControllerTest { private BatterySaverButtonPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSchedulePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSchedulePreferenceControllerTest.java index c4d4c87b625..d1d21f38664 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSchedulePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSchedulePreferenceControllerTest.java @@ -21,18 +21,20 @@ import android.content.Context; import android.os.PowerManager; import android.provider.Settings; import android.provider.Settings.Global; + import androidx.preference.Preference; -import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; + import com.android.settings.testutils.shadow.SettingsShadowResources; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.class) public class BatterySaverSchedulePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobServiceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobServiceTest.java index 7bcfd369d04..32ea9e026a5 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobServiceTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobServiceTest.java @@ -34,7 +34,6 @@ import android.content.Context; import com.android.settings.R; import com.android.settings.testutils.DatabaseTestUtils; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowThreadUtils; import org.junit.After; @@ -44,13 +43,14 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.List; import java.util.concurrent.TimeUnit; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowThreadUtils.class) public class AnomalyCleanupJobServiceTest { private static final int UID = 1234; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobServiceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobServiceTest.java index 13be36616ac..30cab77f6bc 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobServiceTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobServiceTest.java @@ -19,10 +19,10 @@ package com.android.settings.fuelgauge.batterytip; import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +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.spy; import static org.mockito.Mockito.times; @@ -37,19 +37,19 @@ import android.content.Context; import android.provider.Settings; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; import java.util.concurrent.TimeUnit; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AnomalyConfigJobServiceTest { private static final int ANOMALY_CONFIG_VERSION = 1; @@ -124,5 +124,4 @@ public class AnomalyConfigJobServiceTest { verify(mStatsManager).addConfig(eq(StatsManagerConfig.ANOMALY_CONFIG_KEY), any()); } - } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java index 5f32c0b121b..ba67793cc05 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java @@ -55,7 +55,6 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.fuelgauge.BatteryUtils; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowConnectivityManager; import com.android.settings.testutils.shadow.ShadowPowerWhitelistBackend; import com.android.settingslib.fuelgauge.PowerWhitelistBackend; @@ -66,6 +65,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.android.controller.ServiceController; import org.robolectric.annotation.Config; @@ -74,7 +74,7 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowConnectivityManager.class, ShadowPowerWhitelistBackend.class}) public class AnomalyDetectionJobServiceTest { private static final int UID = 12345; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AppInfoTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AppInfoTest.java index ef12673ace7..ad546f38a42 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AppInfoTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AppInfoTest.java @@ -21,8 +21,6 @@ import static com.google.common.truth.Truth.assertThat; import android.os.Parcel; import android.text.format.DateUtils; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -30,8 +28,9 @@ import org.junit.runner.RunWith; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppInfoTest { private static final String PACKAGE_NAME = "com.android.app"; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java index 4097e7cf6c4..435aa8874fc 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java @@ -27,16 +27,16 @@ import android.provider.Settings; import androidx.preference.Preference; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatteryManagerPreferenceControllerTest { private static final int ON = 1; private static final int OFF = 0; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java index bd4f899881e..e91190224e1 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java @@ -35,8 +35,6 @@ import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip; import com.android.settings.fuelgauge.batterytip.tips.SummaryTip; import com.android.settings.fuelgauge.batterytip.tips.UnrestrictAppTip; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; import com.android.settings.testutils.shadow.ShadowUtils; @@ -45,6 +43,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.androidx.fragment.FragmentController; @@ -52,9 +51,8 @@ import org.robolectric.shadows.androidx.fragment.FragmentController; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {ShadowUtils.class, ShadowAlertDialogCompat.class, - SettingsShadowResourcesImpl.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = {ShadowUtils.class, ShadowAlertDialogCompat.class}) public class BatteryTipDialogFragmentTest { private static final String PACKAGE_NAME = "com.android.app"; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java index 3485113ad8f..2f5fa1ae577 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java @@ -18,7 +18,7 @@ package com.android.settings.fuelgauge.batterytip; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -33,7 +33,6 @@ import com.android.settings.fuelgauge.batterytip.tips.AppLabelPredicate; import com.android.settings.fuelgauge.batterytip.tips.AppRestrictionPredicate; import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; import com.android.settings.testutils.BatteryTestUtils; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.After; import org.junit.Before; @@ -42,11 +41,13 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; +import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatteryTipLoaderTest { private static final int[] TIP_ORDER = { @@ -84,8 +85,8 @@ public class BatteryTipLoaderTest { @After public void tearDown() { - BatteryTestUtils.clearStaticInstance(AppLabelPredicate.class, "sInstance"); - BatteryTestUtils.clearStaticInstance(AppRestrictionPredicate.class, "sInstance"); + ReflectionHelpers.setStaticField(AppLabelPredicate.class, "sInstance", null); + ReflectionHelpers.setStaticField(AppRestrictionPredicate.class, "sInstance", null); } @Test diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicyTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicyTest.java index 053a7164345..9b54fc77f2e 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicyTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicyTest.java @@ -22,14 +22,13 @@ import android.content.Context; import android.provider.Settings; import android.text.format.DateUtils; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatteryTipPolicyTest { private static final String BATTERY_TIP_CONSTANTS_VALUE = "battery_tip_enabled=true" diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java index afa8e4ec3ba..5d45045c038 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java @@ -20,7 +20,7 @@ import static com.android.settings.fuelgauge.batterytip.tips.BatteryTip.TipType import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -44,7 +44,6 @@ import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; import com.android.settings.fuelgauge.batterytip.tips.SummaryTip; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -52,12 +51,13 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatteryTipPreferenceControllerTest { private static final String KEY_PREF = "battery_tip"; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtilsTest.java index 3882e8c0e85..3b024ebfb72 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtilsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtilsTest.java @@ -33,18 +33,18 @@ import com.android.settings.fuelgauge.batterytip.tips.EarlyWarningTip; import com.android.settings.fuelgauge.batterytip.tips.LowBatteryTip; import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatteryTipUtilsTest { @Mock diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/HighUsageDataParserTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/HighUsageDataParserTest.java index 3569d7d8476..a0e205d4d0d 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/HighUsageDataParserTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/HighUsageDataParserTest.java @@ -20,16 +20,15 @@ import static com.google.common.truth.Truth.assertThat; import android.os.BatteryStats; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; import java.time.Duration; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class HighUsageDataParserTest { private static final long PERIOD_ONE_MINUTE_MS = Duration.ofMinutes(1).toMillis(); diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/OpenRestrictAppFragmentActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/OpenRestrictAppFragmentActionTest.java index 55ab113163b..a03c50a5d7b 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/OpenRestrictAppFragmentActionTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/OpenRestrictAppFragmentActionTest.java @@ -30,7 +30,6 @@ import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip; import com.android.settings.testutils.DatabaseTestUtils; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.After; import org.junit.Before; @@ -42,8 +41,9 @@ import org.robolectric.Robolectric; import java.util.ArrayList; import java.util.List; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class OpenRestrictAppFragmentActionTest { private static final String PACKAGE_NAME_1 = "com.android.app1"; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppActionTest.java index 86c6714ef83..8f14d23256c 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppActionTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppActionTest.java @@ -27,7 +27,6 @@ import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip; import com.android.settings.testutils.DatabaseTestUtils; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.After; import org.junit.Before; @@ -35,12 +34,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RestrictAppActionTest { private static final int UID_1 = 12345; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppActionTest.java index f57284a05e9..1ef9a8a8c30 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppActionTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppActionTest.java @@ -27,7 +27,6 @@ import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; import com.android.settings.fuelgauge.batterytip.tips.UnrestrictAppTip; import com.android.settings.testutils.DatabaseTestUtils; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.After; import org.junit.Before; @@ -35,9 +34,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class UnrestrictAppActionTest { private static final int UID_1 = 12345; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetectorTest.java index 24284efdd22..dbee7f1e6ad 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetectorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetectorTest.java @@ -18,7 +18,7 @@ package com.android.settings.fuelgauge.batterytip.detectors; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -30,17 +30,17 @@ import android.os.PowerManager; import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy; import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EarlyWarningDetectorTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java index 379d28f1e6c..7b9e5a5c73a 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java @@ -36,20 +36,20 @@ import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy; import com.android.settings.fuelgauge.batterytip.HighUsageDataParser; import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; import com.android.settings.fuelgauge.batterytip.tips.HighUsageTip; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class HighUsageDetectorTest { private static final int UID_HIGH = 123; private static final int UID_ZERO = 345; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetectorTest.java index 657a5e326b0..55020e2281b 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetectorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetectorTest.java @@ -26,13 +26,13 @@ import android.os.PowerManager; import com.android.settings.fuelgauge.BatteryInfo; import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy; import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.shadows.ShadowPowerManager; @@ -40,7 +40,7 @@ import org.robolectric.util.ReflectionHelpers; import java.util.concurrent.TimeUnit; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LowBatteryDetectorTest { @Mock @@ -94,8 +94,7 @@ public class LowBatteryDetectorTest { public void testDetect_batterySaverOn_tipHandled() { mShadowPowerManager.setIsPowerSaveMode(true); - assertThat(mLowBatteryDetector.detect().getState()) - .isEqualTo(BatteryTip.StateType.HANDLED); + assertThat(mLowBatteryDetector.detect().getState()).isEqualTo(BatteryTip.StateType.HANDLED); } @Test diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetectorTest.java index 0133ecfd0ee..f68a0b47c3f 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetectorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetectorTest.java @@ -18,10 +18,10 @@ package com.android.settings.fuelgauge.batterytip.detectors; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.spy; @@ -41,7 +41,6 @@ import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip; import com.android.settings.testutils.BatteryTestUtils; import com.android.settings.testutils.DatabaseTestUtils; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.After; import org.junit.Before; @@ -49,12 +48,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; +import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RestrictAppDetectorTest { private static final int RESTRICTED_UID = 222; @@ -82,9 +83,7 @@ public class RestrictAppDetectorTest { MockitoAnnotations.initMocks(this); mAppInfoList = new ArrayList<>(); - mAppInfo = new AppInfo.Builder() - .setPackageName(PACKAGE_NAME) - .build(); + mAppInfo = new AppInfo.Builder().setPackageName(PACKAGE_NAME).build(); mAppInfoList.add(mAppInfo); mContext = spy(RuntimeEnvironment.application); @@ -112,8 +111,8 @@ public class RestrictAppDetectorTest { @After public void tearDown() { - BatteryTestUtils.clearStaticInstance(AppLabelPredicate.class, "sInstance"); - BatteryTestUtils.clearStaticInstance(AppRestrictionPredicate.class, "sInstance"); + ReflectionHelpers.setStaticField(AppLabelPredicate.class, "sInstance", null); + ReflectionHelpers.setStaticField(AppRestrictionPredicate.class, "sInstance", null); } @After diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetectorTest.java index f10ea7ee601..477bf49f7f7 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetectorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetectorTest.java @@ -26,16 +26,16 @@ import android.provider.Settings; import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy; import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SmartBatteryDetectorTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetectorTest.java index 27cb04b3072..0fd3ccfa03c 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetectorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetectorTest.java @@ -23,16 +23,16 @@ import static org.mockito.Mockito.spy; import android.text.format.DateUtils; import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SummaryDetectorTest { private BatteryTipPolicy mPolicy; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java index 1c8bfdb97ef..3e18bf06d62 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java @@ -25,19 +25,19 @@ import androidx.annotation.IdRes; import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import com.android.settingslib.testutils.DrawableTestHelper; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatteryTipTest { private static final String TITLE = "title"; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/EarlyWarningTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/EarlyWarningTipTest.java index 752e3aba58b..7a447d90534 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/EarlyWarningTipTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/EarlyWarningTipTest.java @@ -24,7 +24,6 @@ import android.os.Parcel; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import org.junit.Before; @@ -32,9 +31,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EarlyWarningTipTest { @Mock diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTipTest.java index 1ff21f8c9ef..ffe8b200f4f 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTipTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTipTest.java @@ -25,7 +25,6 @@ import android.text.format.DateUtils; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.fuelgauge.batterytip.AppInfo; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import org.junit.Before; @@ -33,12 +32,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class HighUsageTipTest { private static final String PACKAGE_NAME = "com.android.app"; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java index fe721133aea..11dffcdcbcb 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java @@ -23,7 +23,6 @@ import android.content.Context; import android.os.Parcel; import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import org.junit.Before; @@ -31,9 +30,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LowBatteryTipTest { private static final CharSequence SUMMARY = "Only 15 minutes left"; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java index d4a10bce476..b95040a7bd2 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java @@ -17,8 +17,8 @@ package com.android.settings.fuelgauge.batterytip.tips; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.never; @@ -35,7 +35,6 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.fuelgauge.batterytip.AppInfo; import com.android.settings.testutils.BatteryTestUtils; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import org.junit.After; @@ -44,12 +43,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; +import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RestrictAppTipTest { private static final String PACKAGE_NAME = "com.android.app"; private static final String UNINSTALL_PACKAGE_NAME = "com.android.app.unintall"; @@ -104,8 +105,8 @@ public class RestrictAppTipTest { @After public void tearDown() { - BatteryTestUtils.clearStaticInstance(AppLabelPredicate.class, "sInstance"); - BatteryTestUtils.clearStaticInstance(AppRestrictionPredicate.class, "sInstance"); + ReflectionHelpers.setStaticField(AppLabelPredicate.class, "sInstance", null); + ReflectionHelpers.setStaticField(AppRestrictionPredicate.class, "sInstance", null); } @Test @@ -246,6 +247,5 @@ public class RestrictAppTipTest { MetricsProto.MetricsEvent.ACTION_APP_RESTRICTION_TIP, BatteryTip.StateType.HANDLED); verify(mMetricsFeatureProvider, never()).action( anyInt(), anyInt(), anyInt(), anyString(), anyInt()); - } } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/SmartBatteryTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/SmartBatteryTipTest.java index 1e4aef8fa66..7da6a4ffc3f 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/SmartBatteryTipTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/SmartBatteryTipTest.java @@ -20,7 +20,6 @@ import static org.mockito.Mockito.verify; import android.content.Context; import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import org.junit.Before; @@ -28,9 +27,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SmartBatteryTipTest { @Mock diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTipTest.java index 221c37fcbc7..f751b290fd9 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTipTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTipTest.java @@ -24,7 +24,6 @@ import android.os.Parcel; import android.text.format.DateUtils; import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import org.junit.Before; @@ -32,9 +31,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SummaryTipTest { private static final long AVERAGE_TIME_MS = DateUtils.HOUR_IN_MILLIS; @@ -49,8 +49,7 @@ public class SummaryTipTest { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; - mSummaryTip = - new SummaryTip(BatteryTip.StateType.NEW, AVERAGE_TIME_MS); + mSummaryTip = new SummaryTip(BatteryTip.StateType.NEW, AVERAGE_TIME_MS); } @Test diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/UnrestrictAppTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/UnrestrictAppTipTest.java index f3e973599e9..56880455030 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/UnrestrictAppTipTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/UnrestrictAppTipTest.java @@ -20,14 +20,14 @@ import static com.google.common.truth.Truth.assertThat; import android.os.Parcel; import com.android.settings.fuelgauge.batterytip.AppInfo; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class UnrestrictAppTipTest { private static final String PACKAGE_NAME = "com.android.app"; diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java index 59696abe0b3..e77521dfcee 100644 --- a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java @@ -23,7 +23,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowSecureSettings; import org.junit.Before; @@ -32,9 +31,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowSecureSettings.class) public class AssistGestureSettingsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java index 9946361baff..d6c6a1f8f5f 100644 --- a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java +++ b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java @@ -18,7 +18,7 @@ package com.android.settings.gestures; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import android.content.Context; @@ -26,17 +26,17 @@ import android.provider.SearchIndexableResource; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AssistGestureSettingsTest { private FakeFeatureFactory mFakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java index 20bf4e6af14..fac5ae81022 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java @@ -30,17 +30,17 @@ import android.content.SharedPreferences; import android.provider.Settings; import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.class) public class DoubleTapPowerPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java index 5f7ee65db0e..a08b81800a4 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java @@ -20,16 +20,15 @@ import static com.google.common.truth.Truth.assertThat; import android.provider.SearchIndexableResource; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DoubleTapPowerSettingsTest { private DoubleTapPowerSettings mSettings; diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java index 39792b49021..52cb75d8fe3 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java @@ -21,7 +21,7 @@ import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_ import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.when; import android.content.Context; @@ -29,7 +29,6 @@ import android.content.SharedPreferences; import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -37,9 +36,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DoubleTapScreenPreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) @@ -114,7 +114,6 @@ public class DoubleTapScreenPreferenceControllerTest { final int availabilityStatus = mController.getAvailabilityStatus(); assertThat(availabilityStatus).isEqualTo(AVAILABLE); - } @Test diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenSettingsTest.java index 0f14073687a..1a006422a10 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenSettingsTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenSettingsTest.java @@ -20,16 +20,15 @@ import static com.google.common.truth.Truth.assertThat; import android.provider.SearchIndexableResource; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DoubleTapScreenSettingsTest { private DoubleTapScreenSettings mSettings; diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTwistGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTwistGestureSettingsTest.java index 66fbbc9acfa..0981e2f7e90 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTwistGestureSettingsTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTwistGestureSettingsTest.java @@ -20,16 +20,15 @@ import static com.google.common.truth.Truth.assertThat; import android.provider.SearchIndexableResource; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DoubleTwistGestureSettingsTest { private DoubleTwistGestureSettings mSettings; diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java index ae97336da3a..0efbf574165 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.gestures; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -30,7 +30,6 @@ import android.os.UserManager; import android.provider.Settings; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settings.testutils.shadow.ShadowDoubleTwistPreferenceController; @@ -41,13 +40,14 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.class) public class DoubleTwistPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java index 7d1eab37864..32be603db65 100644 --- a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.gestures; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.verify; @@ -31,7 +31,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.VideoPreference; import org.junit.Before; @@ -40,9 +39,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class GesturePreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) @@ -196,8 +196,7 @@ public class GesturePreferenceControllerTest { boolean mIsPrefAvailable; boolean mIsPrefEnabled; - private TestPrefController(Context context, - String key) { + private TestPrefController(Context context, String key) { super(context, key); } diff --git a/tests/robotests/src/com/android/settings/gestures/GestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/GestureSettingsTest.java index db8064ae3ac..54525a44260 100644 --- a/tests/robotests/src/com/android/settings/gestures/GestureSettingsTest.java +++ b/tests/robotests/src/com/android/settings/gestures/GestureSettingsTest.java @@ -18,13 +18,13 @@ package com.android.settings.gestures; import static com.google.common.truth.Truth.assertThat; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.drawer.CategoryKey; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class GestureSettingsTest { @Test diff --git a/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java index e892eb2bb46..1e842078b47 100644 --- a/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java @@ -20,7 +20,7 @@ import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -33,7 +33,6 @@ import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowSecureSettings; import com.android.settingslib.core.AbstractPreferenceController; @@ -43,6 +42,7 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; @@ -50,7 +50,7 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class GesturesSettingsPreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java index e889d41bd21..5422eabc053 100644 --- a/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java @@ -21,7 +21,7 @@ import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_ import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.when; import android.content.Context; @@ -29,7 +29,6 @@ import android.content.SharedPreferences; import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -37,9 +36,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PickupGesturePreferenceControllerTest { private static final String KEY_PICK_UP = "gesture_pick_up"; diff --git a/tests/robotests/src/com/android/settings/gestures/PickupGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/PickupGestureSettingsTest.java index 72865cfd4e2..2d44b3925cc 100644 --- a/tests/robotests/src/com/android/settings/gestures/PickupGestureSettingsTest.java +++ b/tests/robotests/src/com/android/settings/gestures/PickupGestureSettingsTest.java @@ -20,16 +20,15 @@ import static com.google.common.truth.Truth.assertThat; import android.provider.SearchIndexableResource; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PickupGestureSettingsTest { private PickupGestureSettings mSettings; diff --git a/tests/robotests/src/com/android/settings/gestures/PreventRingingGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PreventRingingGesturePreferenceControllerTest.java index 6d77d772c71..84fef5d15c4 100644 --- a/tests/robotests/src/com/android/settings/gestures/PreventRingingGesturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/PreventRingingGesturePreferenceControllerTest.java @@ -31,17 +31,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.RadioButtonPreference; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Answers; -import org.mockito.Mock; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PreventRingingGesturePreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/gestures/PreventRingingGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/PreventRingingGestureSettingsTest.java index 47bb4706838..d8563e272d4 100644 --- a/tests/robotests/src/com/android/settings/gestures/PreventRingingGestureSettingsTest.java +++ b/tests/robotests/src/com/android/settings/gestures/PreventRingingGestureSettingsTest.java @@ -20,16 +20,15 @@ import static com.google.common.truth.Truth.assertThat; import android.provider.SearchIndexableResource; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PreventRingingGestureSettingsTest { private PreventRingingGestureSettings mSettings; diff --git a/tests/robotests/src/com/android/settings/gestures/PreventRingingParentPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PreventRingingParentPreferenceControllerTest.java index 9e83e052cea..07716859a19 100644 --- a/tests/robotests/src/com/android/settings/gestures/PreventRingingParentPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/PreventRingingParentPreferenceControllerTest.java @@ -33,16 +33,16 @@ import android.content.res.Resources; import android.provider.Settings; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PreventRingingParentPreferenceControllerTest { @Mock @@ -50,9 +50,6 @@ public class PreventRingingParentPreferenceControllerTest { private Context mContext; private PreventRingingParentPreferenceController mController; - private final String VIBRATE_SUMMARY = "On (vibrate)"; - private final String MUTE_SUMMARY = "On (mute)"; - private final String NONE_SUMMARY = "Off"; @Before public void setUp() { diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java index b2816b52bcd..dbef598d95b 100644 --- a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java @@ -29,7 +29,6 @@ import android.hardware.fingerprint.FingerprintManager; import android.provider.Settings; import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -37,9 +36,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SwipeToNotificationPreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java index de7b73c810f..40dc4287600 100644 --- a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java +++ b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java @@ -22,19 +22,19 @@ import android.content.Context; import android.provider.SearchIndexableResource; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUtils; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SwipeToNotificationSettingsTest { private Context mContext; @@ -78,5 +78,4 @@ public class SwipeToNotificationSettingsTest { assertThat(niks).isNotEmpty(); } - } diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeUpPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeUpPreferenceControllerTest.java index 1ce6d0a67bd..e98bdc84caa 100644 --- a/tests/robotests/src/com/android/settings/gestures/SwipeUpPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/SwipeUpPreferenceControllerTest.java @@ -26,19 +26,19 @@ import android.content.pm.ResolveInfo; import android.content.pm.ServiceInfo; import com.android.internal.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowPackageManager; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.class) public class SwipeUpPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/gestures/WakeLockScreenGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/WakeLockScreenGesturePreferenceControllerTest.java index c6249fb74ee..10a3d908611 100644 --- a/tests/robotests/src/com/android/settings/gestures/WakeLockScreenGesturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/WakeLockScreenGesturePreferenceControllerTest.java @@ -21,13 +21,12 @@ import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_ import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.when; import android.content.Context; import com.android.internal.hardware.AmbientDisplayConfiguration; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -35,8 +34,9 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WakeLockScreenGesturePreferenceControllerTest { private static final String KEY_WAKE_LOCK_SCREEN = "gesture_wake_lock_screen"; diff --git a/tests/robotests/src/com/android/settings/gestures/WakeLockScreenGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/WakeLockScreenGestureSettingsTest.java index 0cd777d307d..686a0fff628 100644 --- a/tests/robotests/src/com/android/settings/gestures/WakeLockScreenGestureSettingsTest.java +++ b/tests/robotests/src/com/android/settings/gestures/WakeLockScreenGestureSettingsTest.java @@ -20,16 +20,15 @@ import static com.google.common.truth.Truth.assertThat; import android.provider.SearchIndexableResource; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WakeLockScreenGestureSettingsTest { private WakeLockScreenGestureSettings mSettings; diff --git a/tests/robotests/src/com/android/settings/gestures/WakeScreenGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/WakeScreenGesturePreferenceControllerTest.java index 0af45408323..ebc0f27f7ca 100644 --- a/tests/robotests/src/com/android/settings/gestures/WakeScreenGesturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/WakeScreenGesturePreferenceControllerTest.java @@ -21,13 +21,12 @@ import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_ import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.when; import android.content.Context; import com.android.internal.hardware.AmbientDisplayConfiguration; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -35,8 +34,9 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WakeScreenGesturePreferenceControllerTest { private static final String KEY_WAKE_SCREEN = "gesture_wake_screen"; diff --git a/tests/robotests/src/com/android/settings/gestures/WakeScreenGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/WakeScreenGestureSettingsTest.java index 1d7e225aab2..f1d2fcc12d0 100644 --- a/tests/robotests/src/com/android/settings/gestures/WakeScreenGestureSettingsTest.java +++ b/tests/robotests/src/com/android/settings/gestures/WakeScreenGestureSettingsTest.java @@ -20,16 +20,15 @@ import static com.google.common.truth.Truth.assertThat; import android.provider.SearchIndexableResource; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WakeScreenGestureSettingsTest { private WakeScreenGestureSettings mSettings; diff --git a/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java b/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java index f1228194d49..1af8c32f090 100644 --- a/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java +++ b/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java @@ -22,16 +22,16 @@ import android.util.FeatureFlagUtils; import com.android.settings.SettingsActivity; import com.android.settings.core.FeatureFlags; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.shadows.ShadowActivity; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SettingsHomepageActivityTest { @Test diff --git a/tests/robotests/src/com/android/settings/homepage/TopLevelSettingsTest.java b/tests/robotests/src/com/android/settings/homepage/TopLevelSettingsTest.java index 83ab948935e..5a6ca86aa18 100644 --- a/tests/robotests/src/com/android/settings/homepage/TopLevelSettingsTest.java +++ b/tests/robotests/src/com/android/settings/homepage/TopLevelSettingsTest.java @@ -23,14 +23,13 @@ import static org.mockito.Mockito.when; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TopLevelSettingsTest { private Context mContext; private TopLevelSettings mSettings; diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/CardContentProviderTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/CardContentProviderTest.java index 1e444bb2e4f..5bdb8d3ff5f 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/CardContentProviderTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/CardContentProviderTest.java @@ -29,7 +29,6 @@ import android.database.Cursor; import android.net.Uri; import android.os.Build; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowThreadUtils; import org.junit.After; @@ -37,11 +36,12 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowThreadUtils.class) public class CardContentProviderTest { @@ -97,7 +97,7 @@ public class CardContentProviderTest { @Test(expected = UnsupportedOperationException.class) public void cardData_delete() { - final int delCount = mResolver.delete(mUri, null, null); + mResolver.delete(mUri, null, null); } @Test(expected = UnsupportedOperationException.class) @@ -109,7 +109,7 @@ public class CardContentProviderTest { values.put(CardDatabaseHelper.CardColumns.SCORE, updatingScore); final String strWhere = CardDatabaseHelper.CardColumns.NAME + "=?"; final String[] selectionArgs = {"auto_rotate"}; - final int updateCount = mResolver.update(mUri, values, strWhere, selectionArgs); + mResolver.update(mUri, values, strWhere, selectionArgs); } @Test diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/CardDatabaseHelperTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/CardDatabaseHelperTest.java index ef60f85ff62..36e4f047c61 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/CardDatabaseHelperTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/CardDatabaseHelperTest.java @@ -24,18 +24,18 @@ import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import com.android.settings.intelligence.ContextualCardProto; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class CardDatabaseHelperTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardFeatureProviderImplTest.java index b3f94114776..f1bb3ed4d49 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardFeatureProviderImplTest.java @@ -18,8 +18,7 @@ package com.android.settings.homepage.contextualcards; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -30,18 +29,18 @@ import android.net.Uri; import android.os.UserHandle; import com.android.settings.intelligence.ContextualCardProto.ContextualCardList; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ContextualCardFeatureProviderImplTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java index 98943a0e07c..d86b9a31800 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java @@ -29,11 +29,11 @@ import android.net.Uri; import com.android.settings.slices.CustomSliceRegistry; import com.android.settings.slices.SettingsSliceProvider; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowContentResolver; @@ -41,7 +41,7 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ContextualCardLoaderTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLookupTableTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLookupTableTest.java index 4724500a294..eb558d817eb 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLookupTableTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLookupTableTest.java @@ -20,7 +20,6 @@ import static com.google.common.truth.Truth.assertThat; import com.android.settings.homepage.contextualcards.ContextualCardLookupTable .ControllerRendererMapping; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.After; import org.junit.Before; @@ -29,8 +28,9 @@ import org.junit.runner.RunWith; import java.util.ArrayList; import java.util.List; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ContextualCardLookupTableTest { private static final int UNSUPPORTED_CARD_TYPE = -99999; 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 64a7c9cfcd6..ced9a9ed57f 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardManagerTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardManagerTest.java @@ -25,19 +25,19 @@ import android.util.ArrayMap; import com.android.settings.homepage.contextualcards.conditional.ConditionFooterContextualCard; import com.android.settings.homepage.contextualcards.conditional.ConditionHeaderContextualCard; import com.android.settings.homepage.contextualcards.conditional.ConditionalContextualCard; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ContextualCardManagerTest { private static final String TEST_SLICE_URI = "context://test/test"; diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/ControllerRendererPoolTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/ControllerRendererPoolTest.java index e51169e3972..bf7c5e08e0c 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/ControllerRendererPoolTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/ControllerRendererPoolTest.java @@ -22,15 +22,15 @@ import android.content.Context; import androidx.lifecycle.LifecycleOwner; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ControllerRendererPoolTest { private static final int UNSUPPORTED_CARD_TYPE = -99999; diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProviderTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProviderTest.java index 4b0b0851a9f..8f36ea59652 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProviderTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProviderTest.java @@ -29,7 +29,6 @@ import android.os.Bundle; import com.android.settings.intelligence.ContextualCardProto.ContextualCard; import com.android.settings.intelligence.ContextualCardProto.ContextualCardList; import com.android.settings.slices.CustomSliceRegistry; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.google.android.settings.intelligence.libs.contextualcards.ContextualCardProvider; @@ -39,9 +38,10 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SettingsContextualCardProviderTest { @Mock diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/AbnormalRingerConditionControllerBaseTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/AbnormalRingerConditionControllerBaseTest.java index d27e0242851..5d5070bca04 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/AbnormalRingerConditionControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/AbnormalRingerConditionControllerBaseTest.java @@ -24,16 +24,16 @@ import android.content.Intent; import android.media.AudioManager; import com.android.settings.homepage.contextualcards.ContextualCard; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AbnormalRingerConditionControllerBaseTest { @Mock @@ -66,7 +66,7 @@ public class AbnormalRingerConditionControllerBaseTest { private static class TestCondition extends AbnormalRingerConditionController { - public TestCondition(Context appContext, ConditionManager conditionManager) { + private TestCondition(Context appContext, ConditionManager conditionManager) { super(appContext, conditionManager); } 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 a962bc19569..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.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -33,11 +32,12 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowActivity; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BackgroundDataConditionControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionControllerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionControllerTest.java index d28ab0f9598..e4ca6c09722 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionControllerTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionControllerTest.java @@ -27,18 +27,18 @@ import android.content.IntentFilter; import android.os.PowerManager; import com.android.settings.fuelgauge.BatterySaverReceiver; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.shadows.ShadowPowerManager; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatterySaverConditionControllerTest { @Mock private ConditionManager mConditionManager; @@ -83,5 +83,4 @@ public class BatterySaverConditionControllerTest { assertThat(mController.isDisplayable()).isFalse(); } - } diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardControllerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardControllerTest.java index 688e94cb550..566ca07a46c 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardControllerTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardControllerTest.java @@ -29,13 +29,13 @@ import android.content.Context; import com.android.settings.homepage.contextualcards.ContextualCard; import com.android.settings.homepage.contextualcards.ContextualCard.CardType; import com.android.settings.homepage.contextualcards.ContextualCardUpdateListener; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; @@ -43,7 +43,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ConditionContextualCardControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRendererTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRendererTest.java index 25689e6c988..c9b62aeba66 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRendererTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRendererTest.java @@ -32,7 +32,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.android.settings.R; import com.android.settings.homepage.contextualcards.ContextualCard; import com.android.settings.homepage.contextualcards.ControllerRendererPool; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -40,9 +39,10 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.android.controller.ActivityController; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ConditionContextualCardRendererTest { @Mock diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardRendererTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardRendererTest.java index 524a69091da..fcb16f2cc13 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardRendererTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardRendererTest.java @@ -31,16 +31,16 @@ import androidx.recyclerview.widget.RecyclerView; import com.android.settings.homepage.contextualcards.ContextualCard; import com.android.settings.homepage.contextualcards.ControllerRendererPool; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ConditionFooterContextualCardRendererTest { @Mock diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardTest.java index 783ae9f1e7a..b658822ecaa 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardTest.java @@ -19,12 +19,12 @@ package com.android.settings.homepage.contextualcards.conditional; import static com.google.common.truth.Truth.assertThat; import com.android.settings.homepage.contextualcards.ContextualCard; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ConditionFooterContextualCardTest { @Test(expected = IllegalArgumentException.class) diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardRendererTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardRendererTest.java index ee8a582974b..a4aa1d7eeda 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardRendererTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardRendererTest.java @@ -31,7 +31,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.android.settings.R; import com.android.settings.homepage.contextualcards.ContextualCard; import com.android.settings.homepage.contextualcards.ControllerRendererPool; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -39,12 +38,13 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.android.controller.ActivityController; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ConditionHeaderContextualCardRendererTest { @Mock diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardTest.java index 767adad66dd..275e96b672b 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardTest.java @@ -19,12 +19,12 @@ package com.android.settings.homepage.contextualcards.conditional; import static com.google.common.truth.Truth.assertThat; import com.android.settings.homepage.contextualcards.ContextualCard; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ConditionHeaderContextualCardTest { @Test(expected = IllegalArgumentException.class) diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionManagerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionManagerTest.java index e8d5caa2fd2..215790893cf 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionManagerTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionManagerTest.java @@ -26,16 +26,15 @@ import static org.mockito.Mockito.when; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ConditionManagerTest { private static final long ID = 123L; @@ -48,7 +47,6 @@ public class ConditionManagerTest { private Context mContext; private ConditionManager mManager; - @Before public void setUp() { MockitoAnnotations.initMocks(this); @@ -128,5 +126,4 @@ public class ConditionManagerTest { verify(mConditionListener).onConditionsChanged(); } - } diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionalContextualCardTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionalContextualCardTest.java index 1c74ef32bcc..3f57228368c 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionalContextualCardTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionalContextualCardTest.java @@ -22,13 +22,12 @@ import static com.android.settings.homepage.contextualcards.conditional.Conditio import static com.google.common.truth.Truth.assertThat; import com.android.settings.homepage.contextualcards.ContextualCard; -import com.android.settings.homepage.contextualcards.conditional.ConditionalContextualCard; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ConditionalContextualCardTest { @Test(expected = IllegalArgumentException.class) diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/DndConditionalCardControllerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/DndConditionalCardControllerTest.java index 9eb6145ce73..5d72ee46613 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/DndConditionalCardControllerTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/DndConditionalCardControllerTest.java @@ -16,7 +16,6 @@ package com.android.settings.homepage.contextualcards.conditional; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.spy; @@ -24,16 +23,15 @@ import static org.mockito.Mockito.verify; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DndConditionalCardControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/NightDisplayConditionControllerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/NightDisplayConditionControllerTest.java index 0ef23be13b8..a0a65199217 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/NightDisplayConditionControllerTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/NightDisplayConditionControllerTest.java @@ -20,16 +20,15 @@ import static org.mockito.Mockito.verify; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NightDisplayConditionControllerTest { @Mock 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 2bc92a38919..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.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -32,10 +31,11 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowActivity; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WorkModeConditionControllerTest { @Mock @@ -60,5 +60,4 @@ public class WorkModeConditionControllerTest { final ShadowActivity shadowActivity = Shadow.extract(mActivity); assertThat(shadowActivity.getNextStartedActivity().getComponent()).isEqualTo(componentName); } - } diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/BatterySliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/BatterySliceTest.java index 72c29facb90..4699587a038 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/BatterySliceTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/BatterySliceTest.java @@ -33,17 +33,17 @@ import androidx.slice.core.SliceAction; import androidx.slice.widget.SliceLiveData; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SliceTester; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatterySliceTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSliceTest.java index fc74df92ce7..1a3be6c9060 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSliceTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSliceTest.java @@ -33,19 +33,19 @@ import androidx.slice.core.SliceAction; import androidx.slice.widget.SliceLiveData; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SliceTester; import com.android.settings.testutils.shadow.ShadowDataUsageUtils; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowDataUsageUtils.class) public class DataUsageSliceTest { private static final String DATA_USAGE_TITLE = "Data usage"; diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSliceTest.java index 2083456531b..c1d732953ec 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSliceTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSliceTest.java @@ -33,7 +33,6 @@ import androidx.slice.core.SliceAction; import androidx.slice.widget.SliceLiveData; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SliceTester; import org.junit.Before; @@ -41,11 +40,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DeviceInfoSliceTest { @Mock diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSliceTest.java index 17d7bd20541..dc125e24c5c 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSliceTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSliceTest.java @@ -33,18 +33,18 @@ import androidx.slice.core.SliceAction; import androidx.slice.widget.SliceLiveData; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SliceTester; import com.android.settingslib.deviceinfo.PrivateStorageInfo; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class StorageSliceTest { private static final String USED_BYTES_TEXT = "test used bytes"; private static final String SUMMARY_TEXT = "test summary"; 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 9d9d84e34a0..ebc2154a009 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 @@ -16,7 +16,6 @@ package com.android.settings.homepage.contextualcards.legacysuggestion; - import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.verify; @@ -25,7 +24,6 @@ import android.content.Context; import com.android.settings.homepage.contextualcards.ContextualCardUpdateListener; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowThreadUtils; import com.android.settingslib.suggestions.SuggestionController; @@ -34,10 +32,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowThreadUtils.class) public class LegacySuggestionContextualCardControllerTest { diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardRendererTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardRendererTest.java index c337df1a94a..218279401fc 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardRendererTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardRendererTest.java @@ -16,7 +16,6 @@ package com.android.settings.homepage.contextualcards.legacysuggestion; - import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -33,7 +32,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.android.settings.R; import com.android.settings.homepage.contextualcards.ContextualCard; import com.android.settings.homepage.contextualcards.ControllerRendererPool; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -41,9 +39,10 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.android.controller.ActivityController; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LegacySuggestionContextualCardRendererTest { @Mock private ControllerRendererPool mControllerRendererPool; diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardTest.java index 8b9a7a9aaca..e0e5a0c6e42 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardTest.java @@ -23,12 +23,12 @@ import static org.mockito.Mockito.mock; import android.app.PendingIntent; import com.android.settings.homepage.contextualcards.ContextualCard; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LegacySuggestionContextualCardTest { @Test(expected = IllegalArgumentException.class) @@ -51,5 +51,4 @@ public class LegacySuggestionContextualCardTest { .build() .getPendingIntent()).isNotNull(); } - } diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSliceTest.java index 1df527737e8..ff08c6aa312 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSliceTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSliceTest.java @@ -35,13 +35,13 @@ import com.android.settings.fuelgauge.batterytip.BatteryTipLoader; import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; import com.android.settings.fuelgauge.batterytip.tips.EarlyWarningTip; import com.android.settings.fuelgauge.batterytip.tips.LowBatteryTip; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; @@ -51,7 +51,7 @@ import org.robolectric.annotation.Resetter; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatteryFixSliceTest { private Context mContext; @@ -123,7 +123,7 @@ public class BatteryFixSliceTest { return sBatteryTips; } - public static void setBatteryTips(List tips) { + private static void setBatteryTips(List tips) { sBatteryTips = tips; } } diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSliceTest.java index ac6557e67d8..51e8cc852ce 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSliceTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSliceTest.java @@ -18,7 +18,7 @@ package com.android.settings.homepage.contextualcards.slices; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -36,7 +36,6 @@ import androidx.slice.SliceProvider; import androidx.slice.widget.SliceLiveData; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SliceTester; import com.android.settingslib.bluetooth.CachedBluetoothDevice; @@ -46,12 +45,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothDevicesSliceTest { private static final String BLUETOOTH_MOCK_SUMMARY = "BluetoothSummary"; diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BluetoothUpdateWorkerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BluetoothUpdateWorkerTest.java index 1bc4f2abf53..e2eb9bdc12d 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BluetoothUpdateWorkerTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BluetoothUpdateWorkerTest.java @@ -26,16 +26,16 @@ import android.content.ContentResolver; import android.content.Context; import android.net.Uri; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowBluetoothAdapter.class}) public class BluetoothUpdateWorkerTest { diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/LowStorageSliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/LowStorageSliceTest.java index 9787aeec286..3bd29b9ba35 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/LowStorageSliceTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/LowStorageSliceTest.java @@ -28,7 +28,6 @@ import androidx.slice.SliceProvider; import androidx.slice.widget.SliceLiveData; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SliceTester; import com.android.settingslib.deviceinfo.PrivateStorageInfo; import com.android.settingslib.deviceinfo.StorageVolumeProvider; @@ -37,6 +36,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; @@ -45,7 +45,7 @@ import org.robolectric.annotation.Resetter; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LowStorageSliceTest { private Context mContext; @@ -124,7 +124,7 @@ public class LowStorageSliceTest { return sPrivateStorageInfo; } - public static void setPrivateStorageInfo( + private static void setPrivateStorageInfo( PrivateStorageInfo privateStorageInfo) { sPrivateStorageInfo = privateStorageInfo; } 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 af3b2e8b015..5bc36985d4b 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 @@ -35,13 +35,13 @@ import com.android.settings.homepage.contextualcards.ContextualCard; import com.android.settings.homepage.contextualcards.ContextualCardFeedbackDialog; import com.android.settings.homepage.contextualcards.ContextualCardsFragment; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.annotation.Config; @@ -49,7 +49,7 @@ import org.robolectric.shadows.ShadowActivity; import org.robolectric.shadows.ShadowContentResolver; import org.robolectric.shadows.androidx.fragment.FragmentController; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SliceContextualCardControllerTest { private static final String TEST_SLICE_URI = "content://test/test"; diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRendererTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRendererTest.java index 7d71302c4c6..3407ee3679d 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRendererTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRendererTest.java @@ -39,7 +39,6 @@ import com.android.settings.R; import com.android.settings.homepage.contextualcards.ContextualCard; import com.android.settings.homepage.contextualcards.ContextualCardsFragment; import com.android.settings.homepage.contextualcards.ControllerRendererPool; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -47,9 +46,10 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.android.controller.ActivityController; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SliceContextualCardRendererTest { private static final Uri TEST_SLICE_URI = Uri.parse("content://test/test"); diff --git a/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java index b672e58967f..ae5afd22a9b 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java @@ -31,18 +31,17 @@ import android.content.Context; import android.hardware.input.InputManager; import android.view.InputDevice; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class GameControllerPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerTest.java b/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerTest.java index cb3d6557113..db821f3a39b 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerTest.java @@ -27,15 +27,15 @@ import android.os.Bundle; import androidx.fragment.app.FragmentActivity; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class InputMethodAndSubtypeEnablerTest { private FragmentActivity mActivity; diff --git a/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypePreferenceControllerTest.java index 334ca4b90fd..26cdd0a3f1f 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypePreferenceControllerTest.java @@ -32,7 +32,6 @@ import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowInputMethodManagerWithMethodList; import org.junit.Before; @@ -40,13 +39,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowInputMethodManagerWithMethodList.class) public class InputMethodAndSubtypePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/inputmethod/KeyboardLayoutPickerControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/KeyboardLayoutPickerControllerTest.java index 005471f184b..a26ef8c6c34 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/KeyboardLayoutPickerControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/KeyboardLayoutPickerControllerTest.java @@ -18,8 +18,8 @@ package com.android.settings.inputmethod; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Matchers.any; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -36,7 +36,6 @@ import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowInputDevice; import org.junit.Before; @@ -45,11 +44,12 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class KeyboardLayoutPickerControllerTest { @Mock @@ -118,7 +118,7 @@ public class KeyboardLayoutPickerControllerTest { mController.displayPreference(screen); - // We cretate a keyboard layouts in initializeOneLayout() + // We create a keyboard layouts in initializeOneLayout() assertThat(screen.getPreferenceCount()).isEqualTo(1); } @@ -130,7 +130,7 @@ public class KeyboardLayoutPickerControllerTest { mController.displayPreference(screen); - // We cretate two keyboard layouts in initializeOneLayout() + // We create two keyboard layouts in initializeOneLayout() assertThat(screen.getPreferenceCount()).isEqualTo(2); } diff --git a/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java index 18813e6d20c..d675e8911e5 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java @@ -30,7 +30,6 @@ import android.view.InputDevice; import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowInputDevice; import org.junit.After; @@ -39,10 +38,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PhysicalKeyboardPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java index 5a1a93b8858..ead12cf7ebe 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java @@ -29,7 +29,6 @@ import android.view.textservice.TextServicesManager; import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -37,9 +36,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SpellCheckerPreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryCursorLoaderTest.java b/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryCursorLoaderTest.java index b81e5513396..f3b1c905af4 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryCursorLoaderTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryCursorLoaderTest.java @@ -25,16 +25,15 @@ import android.database.MatrixCursor; import android.net.Uri; import android.provider.UserDictionary; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowContentResolver; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class UserDictionaryCursorLoaderTest { private ContentProvider mContentProvider; diff --git a/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryListControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryListControllerTest.java index 5c5042c1888..ff3f0ecfc14 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryListControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryListControllerTest.java @@ -33,18 +33,17 @@ import androidx.preference.Preference; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowContentResolver; import java.util.TreeSet; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class UserDictionaryListControllerTest { private Preference mPreference; diff --git a/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java index 43e89ffe05c..2d5dee8cfe4 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java @@ -34,20 +34,20 @@ import androidx.core.text.BidiFormatter; import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class VirtualKeyboardPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java index 43e8b18396a..19e62b11c9e 100644 --- a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java +++ b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java @@ -18,7 +18,7 @@ package com.android.settings.language; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -45,7 +45,6 @@ import androidx.lifecycle.LifecycleObserver; import com.android.settings.R; import com.android.settings.dashboard.SummaryLoader; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.XmlTestUtils; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -56,12 +55,13 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LanguageAndInputSettingsTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java index 83b29fcdb62..b67cc5dbc1c 100644 --- a/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java @@ -28,20 +28,20 @@ import android.content.res.AssetManager; import androidx.preference.Preference; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PhoneLanguagePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/language/PointerSpeedControllerTest.java b/tests/robotests/src/com/android/settings/language/PointerSpeedControllerTest.java index 8101d404b42..a917a6d6143 100644 --- a/tests/robotests/src/com/android/settings/language/PointerSpeedControllerTest.java +++ b/tests/robotests/src/com/android/settings/language/PointerSpeedControllerTest.java @@ -22,16 +22,15 @@ import static org.mockito.Mockito.spy; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PointerSpeedControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java index c483b8ccc9a..fdca6242aec 100644 --- a/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java @@ -29,20 +29,19 @@ import android.speech.tts.TtsEngines; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TtsPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java index e1440b72605..29492b6862e 100644 --- a/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java @@ -25,7 +25,6 @@ import androidx.preference.Preference; import com.android.settings.inputmethod.UserDictionaryList; import com.android.settings.inputmethod.UserDictionarySettings; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -33,11 +32,12 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.TreeSet; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class UserDictionaryPreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/localepicker/LocaleListEditorTest.java b/tests/robotests/src/com/android/settings/localepicker/LocaleListEditorTest.java index 4db32bd8363..d84d77923a3 100644 --- a/tests/robotests/src/com/android/settings/localepicker/LocaleListEditorTest.java +++ b/tests/robotests/src/com/android/settings/localepicker/LocaleListEditorTest.java @@ -23,19 +23,16 @@ import android.view.View; import android.widget.TextView; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.ShadowSettingsPreferenceFragment; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = ShadowSettingsPreferenceFragment.class) +@RunWith(RobolectricTestRunner.class) public class LocaleListEditorTest { private LocaleListEditor mLocaleListEditor; diff --git a/tests/robotests/src/com/android/settings/localepicker/LocalePickerWithRegionActivityTest.java b/tests/robotests/src/com/android/settings/localepicker/LocalePickerWithRegionActivityTest.java index bad3dbda032..b2541472a5f 100644 --- a/tests/robotests/src/com/android/settings/localepicker/LocalePickerWithRegionActivityTest.java +++ b/tests/robotests/src/com/android/settings/localepicker/LocalePickerWithRegionActivityTest.java @@ -8,18 +8,18 @@ import static org.mockito.Mockito.spy; import android.app.Activity; import com.android.internal.app.LocaleStore; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.Shadows; import org.robolectric.android.controller.ActivityController; import org.robolectric.shadows.ShadowActivity; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LocalePickerWithRegionActivityTest { private LocalePickerWithRegionActivity mActivity; diff --git a/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java index a15fdff40d5..eff5d4337ed 100644 --- a/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java @@ -5,16 +5,15 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.provider.Settings; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppLocationPermissionPreferenceControllerTest { private AppLocationPermissionPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java index 6903bcd0c98..1ae73c3425b 100644 --- a/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java @@ -26,16 +26,15 @@ import android.provider.Settings.Global; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothScanningPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java b/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java index 3302d2aae7b..e3808305982 100644 --- a/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java @@ -43,7 +43,6 @@ import android.text.TextUtils; import androidx.lifecycle.LifecycleOwner; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowSecureSettings; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -53,18 +52,15 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentMatcher; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = { - ShadowSecureSettings.class, - LocationEnablerTest.ShadowLocationManager.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowSecureSettings.class) public class LocationEnablerTest { @Mock @@ -273,13 +269,4 @@ public class LocationEnablerTest { private static ArgumentMatcher actionMatches(String expected) { return intent -> TextUtils.equals(expected, intent.getAction()); } - - @Implements(value = LocationManager.class) - public static class ShadowLocationManager { - - @Implementation - public void setLocationEnabledForUser(boolean enabled, UserHandle userHandle) { - // Do nothing - } - } } diff --git a/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java index 00d8adb2acd..2abef4ed875 100644 --- a/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java @@ -17,8 +17,8 @@ package com.android.settings.location; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -42,7 +42,6 @@ import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -51,12 +50,13 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LocationFooterPreferenceControllerTest { @Mock @@ -88,7 +88,7 @@ public class LocationFooterPreferenceControllerTest { } @Test - public void isAvailable_hasValidFooter_returnsTrue() throws NameNotFoundException { + public void isAvailable_hasValidFooter_returnsTrue() { final List testResolveInfos = new ArrayList<>(); testResolveInfos.add( getTestResolveInfo(/*isSystemApp*/ true, /*hasRequiredMetadata*/ true)); @@ -99,7 +99,7 @@ public class LocationFooterPreferenceControllerTest { } @Test - public void isAvailable_noSystemApp_returnsFalse() throws NameNotFoundException { + public void isAvailable_noSystemApp_returnsFalse() { final List testResolveInfos = new ArrayList<>(); testResolveInfos.add( getTestResolveInfo(/*isSystemApp*/ false, /*hasRequiredMetadata*/ true)); @@ -109,7 +109,7 @@ public class LocationFooterPreferenceControllerTest { } @Test - public void isAvailable_noRequiredMetadata_returnsFalse() throws NameNotFoundException { + public void isAvailable_noRequiredMetadata_returnsFalse() { final List testResolveInfos = new ArrayList<>(); testResolveInfos.add( getTestResolveInfo(/*isSystemApp*/ true, /*hasRequiredMetadata*/ false)); @@ -131,7 +131,7 @@ public class LocationFooterPreferenceControllerTest { } @Test - public void updateState_sendBroadcast() throws NameNotFoundException { + public void updateState_sendBroadcast() { final List testResolveInfos = new ArrayList<>(); testResolveInfos.add( getTestResolveInfo(/*isSystemApp*/ true, /*hasRequiredMetadata*/ true)); @@ -145,7 +145,7 @@ public class LocationFooterPreferenceControllerTest { } @Test - public void updateState_addPreferences() throws NameNotFoundException { + public void updateState_addPreferences() { final List testResolveInfos = new ArrayList<>(); testResolveInfos.add( getTestResolveInfo(/*isSystemApp*/ true, /*hasRequiredMetadata*/ true)); @@ -158,7 +158,7 @@ public class LocationFooterPreferenceControllerTest { } @Test - public void updateState_notSystemApp_ignore() throws NameNotFoundException { + public void updateState_notSystemApp_ignore() { final List testResolveInfos = new ArrayList<>(); testResolveInfos.add( getTestResolveInfo(/*isSystemApp*/ false, /*hasRequiredMetadata*/ true)); @@ -170,7 +170,7 @@ public class LocationFooterPreferenceControllerTest { } @Test - public void updateState_thenOnPause_sendBroadcasts() throws NameNotFoundException { + public void updateState_thenOnPause_sendBroadcasts() { final List testResolveInfos = new ArrayList<>(); testResolveInfos.add( getTestResolveInfo(/*isSystemApp*/ true, /*hasRequiredMetadata*/ true)); diff --git a/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java index 58874be9a30..9034688f899 100644 --- a/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java @@ -35,7 +35,6 @@ import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import com.android.settingslib.RestrictedSwitchPreference; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -45,13 +44,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LocationForWorkPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/location/LocationScanningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationScanningPreferenceControllerTest.java index 994a8fd4316..b85377c5356 100644 --- a/tests/robotests/src/com/android/settings/location/LocationScanningPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationScanningPreferenceControllerTest.java @@ -21,16 +21,16 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.provider.Settings; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.R; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LocationScanningPreferenceControllerTest { private Context mContext; private LocationScanningPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java index 81e5f7c2426..75d6f8214ea 100644 --- a/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java @@ -37,7 +37,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settings.widget.RestrictedAppPreference; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -48,17 +47,15 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) -@Config( - shadows = { - ShadowUserManager.class - }) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowUserManager.class) public class LocationServicePreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) @@ -90,7 +87,6 @@ public class LocationServicePreferenceControllerTest { when(mCategory.getKey()).thenReturn(key); when(mContext.getSystemService(Context.DEVICE_POLICY_SERVICE)) .thenReturn(mDevicePolicyManager); - } @Test diff --git a/tests/robotests/src/com/android/settings/location/LocationSettingsTest.java b/tests/robotests/src/com/android/settings/location/LocationSettingsTest.java index 83d14e4166e..4885df997c0 100644 --- a/tests/robotests/src/com/android/settings/location/LocationSettingsTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationSettingsTest.java @@ -23,7 +23,6 @@ import static org.mockito.Mockito.when; import android.os.Bundle; import com.android.settings.SettingsActivity; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.SwitchBar; import org.junit.Before; @@ -31,8 +30,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LocationSettingsTest { @Mock diff --git a/tests/robotests/src/com/android/settings/location/LocationSliceTest.java b/tests/robotests/src/com/android/settings/location/LocationSliceTest.java index 8f1045ad0ee..427307dcc98 100644 --- a/tests/robotests/src/com/android/settings/location/LocationSliceTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationSliceTest.java @@ -13,17 +13,17 @@ import androidx.slice.core.SliceAction; import androidx.slice.widget.SliceLiveData; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SliceTester; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LocationSliceTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java index 475cb831544..ab9e4e55e78 100644 --- a/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java @@ -27,7 +27,6 @@ import android.provider.Settings; import androidx.lifecycle.LifecycleOwner; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.SwitchBar; import com.android.settings.widget.ToggleSwitch; import com.android.settingslib.RestrictedLockUtils; @@ -38,10 +37,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LocationSwitchBarControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java index 10e5681382d..d4b4ac31bd1 100644 --- a/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java @@ -41,7 +41,6 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.applications.appinfo.AppInfoDashboardFragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.location.RecentLocationApps; import com.android.settingslib.location.RecentLocationApps.Request; @@ -56,12 +55,13 @@ import org.mockito.InOrder; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RecentLocationRequestPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java index be56f96f83e..7411afe1b4b 100644 --- a/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java @@ -31,7 +31,6 @@ import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.location.RecentLocationApps; import com.android.settingslib.location.RecentLocationApps.Request; @@ -42,13 +41,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.Collections; /** Unit tests for {@link RecentLocationRequestSeeAllPreferenceController} */ -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RecentLocationRequestSeeAllPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/location/ScanningSettingsTest.java b/tests/robotests/src/com/android/settings/location/ScanningSettingsTest.java index a07a1c7f16d..649726a0bd3 100644 --- a/tests/robotests/src/com/android/settings/location/ScanningSettingsTest.java +++ b/tests/robotests/src/com/android/settings/location/ScanningSettingsTest.java @@ -22,16 +22,16 @@ import android.content.Context; import android.provider.SearchIndexableResource; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ScanningSettingsTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java index fa0b64958a6..53acda314b8 100644 --- a/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java @@ -26,16 +26,15 @@ import android.provider.Settings.Global; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiScanningPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java index 46d177f88a9..a645bfa4f1a 100644 --- a/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java @@ -34,7 +34,6 @@ import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedSwitchPreference; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -43,10 +42,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AirplaneModePreferenceControllerTest { private static final int ON = 1; diff --git a/tests/robotests/src/com/android/settings/network/ApnEditorTest.java b/tests/robotests/src/com/android/settings/network/ApnEditorTest.java index db970fb4d33..8624eb91adb 100644 --- a/tests/robotests/src/com/android/settings/network/ApnEditorTest.java +++ b/tests/robotests/src/com/android/settings/network/ApnEditorTest.java @@ -46,7 +46,6 @@ import androidx.preference.SwitchPreference; import com.android.settings.R; import com.android.settings.network.ApnEditor.ApnData; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -57,12 +56,13 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ApnEditorTest { - private static final Object[] APN_DATA = new Object[] { + private static final Object[] APN_DATA = { 0, /* ID */ "apn_name" /* apn name */, "apn.com" /* apn */, @@ -137,7 +137,7 @@ public class ApnEditorTest { any(String.class), any(String[].class), any(String.class)); - } + } @Test public void testSetStringValue_valueChanged_shouldSetValue() { @@ -465,7 +465,7 @@ public class ApnEditorTest { private void initCursor() { doReturn(2).when(mCursor).getColumnCount(); - doReturn(Integer.valueOf(2)).when(mCursor).getInt(CURSOR_INTEGER_INDEX); + doReturn(2).when(mCursor).getInt(CURSOR_INTEGER_INDEX); doReturn("str").when(mCursor).getString(CURSOR_STRING_INDEX); doReturn(Cursor.FIELD_TYPE_INTEGER).when(mCursor).getType(CURSOR_INTEGER_INDEX); doReturn(Cursor.FIELD_TYPE_STRING).when(mCursor).getType(CURSOR_STRING_INDEX); diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java index a8959c7ac56..43e8c471ec5 100644 --- a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java @@ -47,7 +47,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.core.FeatureFlags; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowConnectivityManager; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; @@ -61,13 +60,11 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = { - ShadowConnectivityManager.class, - ShadowUserManager.class} -) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = {ShadowConnectivityManager.class, ShadowUserManager.class}) public class MobileNetworkPreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java index 257446053cc..ab340878653 100644 --- a/tests/robotests/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java @@ -21,13 +21,13 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class MobilePlanPreferenceControllerTest { @Test diff --git a/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java index e0370a49fd9..e84d286cfa5 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java @@ -20,17 +20,17 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.provider.SearchIndexableResource; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.drawer.CategoryKey; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NetworkDashboardFragmentTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java index 8b0fe98568d..73f4b6a0b7b 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java @@ -22,17 +22,16 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NetworkResetPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java b/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java index 35431a09215..8996c1d24a2 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java @@ -26,15 +26,14 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NetworkResetRestrictionCheckerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java index 7b940456c05..3593cf7cf6b 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java @@ -30,19 +30,19 @@ import android.net.NetworkScorerAppData; import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; import java.util.Collections; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NetworkScorerPickerPreferenceControllerTest { private static final String TEST_SCORER_PACKAGE = "Test Package"; diff --git a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java index 83fa55cfe0a..7607f91c611 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java @@ -17,8 +17,8 @@ package com.android.settings.network; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; @@ -34,7 +34,6 @@ import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.RadioButtonPreference; import com.google.android.collect.Lists; @@ -45,11 +44,12 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NetworkScorerPickerTest { private static final String TEST_SCORER_PACKAGE_1 = "Test Package 1"; diff --git a/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java b/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java index 2e3e819986c..a7e59fcc20d 100644 --- a/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java @@ -40,7 +40,6 @@ import android.widget.LinearLayout; import androidx.appcompat.app.AlertDialog; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowOs; import com.android.settingslib.CustomDialogPreferenceCompat.CustomPreferenceDialogFragment; @@ -48,11 +47,12 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowOs.class) public class PrivateDnsModeDialogPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java index 464b2906744..15fa5de8673 100644 --- a/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java @@ -31,8 +31,8 @@ import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_ import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.CALLS_REAL_METHODS; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.doNothing; @@ -60,7 +60,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settings.testutils.shadow.ShadowDevicePolicyManager; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -72,6 +71,7 @@ import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadow.api.Shadow; @@ -83,7 +83,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = { ShadowUserManager.class, ShadowDevicePolicyManager.class diff --git a/tests/robotests/src/com/android/settings/network/SubscriptionUtilTest.java b/tests/robotests/src/com/android/settings/network/SubscriptionUtilTest.java index 02e40243150..e0334b15574 100644 --- a/tests/robotests/src/com/android/settings/network/SubscriptionUtilTest.java +++ b/tests/robotests/src/com/android/settings/network/SubscriptionUtilTest.java @@ -24,19 +24,18 @@ import static org.mockito.Mockito.when; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SubscriptionUtilTest { @Mock private SubscriptionManager mManager; diff --git a/tests/robotests/src/com/android/settings/network/SubscriptionsChangeListenerTest.java b/tests/robotests/src/com/android/settings/network/SubscriptionsChangeListenerTest.java index 88ea2eac522..79d3fdc0ed5 100644 --- a/tests/robotests/src/com/android/settings/network/SubscriptionsChangeListenerTest.java +++ b/tests/robotests/src/com/android/settings/network/SubscriptionsChangeListenerTest.java @@ -18,10 +18,8 @@ package com.android.settings.network; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.AdditionalMatchers.eq; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; -import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -31,15 +29,12 @@ import static org.mockito.Mockito.when; import android.content.BroadcastReceiver; import android.content.ContentResolver; import android.content.Context; -import android.content.Intent; -import android.content.IntentFilter; import android.database.ContentObserver; import android.net.Uri; import android.provider.Settings; import android.telephony.SubscriptionManager; import com.android.settings.network.SubscriptionsChangeListener.SubscriptionsChangeListenerClient; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -47,9 +42,10 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SubscriptionsChangeListenerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java index e800cdd7638..3958589972b 100644 --- a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java @@ -16,7 +16,7 @@ package com.android.settings.network; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -38,19 +38,19 @@ import android.provider.Settings; import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; import java.util.concurrent.atomic.AtomicReference; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TetherPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java index 8198042efb4..2135331e2dc 100644 --- a/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java @@ -23,7 +23,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal; import com.android.settings.wifi.WifiMasterSwitchPreferenceController; @@ -32,14 +31,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowUserManager; import org.robolectric.util.ReflectionHelpers; - -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowRestrictedLockUtilsInternal.class) public class TopLevelNetworkEntryPreferenceControllerTest { @@ -87,7 +86,6 @@ public class TopLevelNetworkEntryPreferenceControllerTest { when(mMobileNetworkPreferenceController.isAvailable()).thenReturn(false); when(mTetherPreferenceController.isAvailable()).thenReturn(false); - assertThat(mController.getSummary()) - .isEqualTo("Wi\u2011Fi and data usage"); + assertThat(mController.getSummary()).isEqualTo("Wi\u2011Fi and data usage"); } } diff --git a/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java index 11541ed2ab2..5144877cb24 100644 --- a/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java @@ -21,8 +21,8 @@ import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -41,7 +41,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.internal.net.VpnConfig; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -49,10 +48,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowServiceManager; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class VpnPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java index 96644285930..e2ac8ce22d0 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java @@ -37,7 +37,6 @@ import android.telephony.TelephonyManager; import com.android.internal.telephony.PhoneConstants; import com.android.settings.network.ApnSettings; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedPreference; import org.junit.Before; @@ -47,8 +46,9 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ApnPreferenceControllerTest { private static final int SUB_ID = 2; diff --git a/tests/robotests/src/com/android/settings/network/telephony/CarrierPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/CarrierPreferenceControllerTest.java index 054a6bd45b2..fc8fb160a62 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/CarrierPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/CarrierPreferenceControllerTest.java @@ -39,7 +39,6 @@ import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import com.android.internal.telephony.PhoneConstants; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedPreference; import org.junit.Before; @@ -49,9 +48,10 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.mockito.ArgumentCaptor; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class CarrierPreferenceControllerTest { private static final int SUB_ID = 2; private static final String CARRIER_SETTINGS_COMPONENT = "packageName/className"; diff --git a/tests/robotests/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java index 85a627d35d8..8907164c666 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java @@ -39,7 +39,6 @@ import android.text.TextUtils; import androidx.preference.Preference; import com.android.internal.telephony.PhoneConstants; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedPreference; import org.junit.Before; @@ -49,8 +48,9 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DataServiceSetupPreferenceControllerTest { private static final int SUB_ID = 2; diff --git a/tests/robotests/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.java index 1d91bb875ba..f77a94f9086 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.java @@ -33,7 +33,6 @@ import android.telephony.TelephonyManager; import androidx.preference.SwitchPreference; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -42,8 +41,9 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DataUsagePreferenceControllerTest { private static final int SUB_ID = 2; diff --git a/tests/robotests/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java index 02710fbb0bc..9b8a3e379f5 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java @@ -36,16 +36,16 @@ import android.telephony.TelephonyManager; import androidx.preference.ListPreference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EnabledNetworkModePreferenceControllerTest { private static final int SUB_ID = 2; @@ -149,5 +149,4 @@ public class EnabledNetworkModePreferenceControllerTest { Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID, 0)).isNotEqualTo( TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA); } - } diff --git a/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gLtePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gLtePreferenceControllerTest.java index 1d80da7c1ca..78ed4b596d3 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gLtePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gLtePreferenceControllerTest.java @@ -32,7 +32,6 @@ import androidx.preference.SwitchPreference; import com.android.ims.ImsManager; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedSwitchPreference; import org.junit.Before; @@ -40,9 +39,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class Enhanced4gLtePreferenceControllerTest { private static final int SUB_ID = 2; @@ -134,5 +134,4 @@ public class Enhanced4gLtePreferenceControllerTest { assertThat(mPreference.isChecked()).isTrue(); } - } diff --git a/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java b/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java index 5269dd7265a..072c835bb1c 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java @@ -49,7 +49,6 @@ import com.android.settings.slices.SettingsSliceProvider; import com.android.settings.slices.SliceBroadcastReceiver; import com.android.settings.slices.SlicesFeatureProvider; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -57,11 +56,12 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class Enhanced4gLteSliceHelperTest { @Mock @@ -275,7 +275,7 @@ public class Enhanced4gLteSliceHelperTest { return mSubId; } - protected void setDefaultVoiceSubId(int id) { + private void setDefaultVoiceSubId(int id) { mSubId = id; } } diff --git a/tests/robotests/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java index 8fd2c28b2a0..7fbddb49169 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java @@ -30,8 +30,6 @@ import android.telephony.euicc.EuiccManager; import androidx.preference.Preference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -39,8 +37,9 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EuiccPreferenceControllerTest { private static final int SUB_ID = 2; @@ -75,5 +74,4 @@ public class EuiccPreferenceControllerTest { assertThat(captor.getValue().getAction()).isEqualTo( EuiccManager.ACTION_MANAGE_EMBEDDED_SUBSCRIPTIONS); } - } diff --git a/tests/robotests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java index e1ad93bdb8e..e0bfce44e4b 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java @@ -35,16 +35,15 @@ import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class MobileDataPreferenceControllerTest { private static final int SUB_ID = 2; @@ -145,5 +144,4 @@ public class MobileDataPreferenceControllerTest { verify(mTelephonyManager).setDataEnabled(true); } - } diff --git a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java index 68634a85eb2..f13746c13f2 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java @@ -40,7 +40,6 @@ import androidx.fragment.app.FragmentTransaction; import com.android.internal.view.menu.ContextMenuBuilder; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -50,12 +49,13 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class MobileNetworkActivityTest { private static final int CURRENT_SUB_ID = 3; @@ -159,14 +159,12 @@ public class MobileNetworkActivityTest { @Test public void onSaveInstanceState_saveCurrentSubId() { - mMobileNetworkActivity = Robolectric.buildActivity( - MobileNetworkActivity.class).get(); + mMobileNetworkActivity = Robolectric.buildActivity(MobileNetworkActivity.class).get(); mMobileNetworkActivity.mCurSubscriptionId = PREV_SUB_ID; final Bundle bundle = new Bundle(); mMobileNetworkActivity.saveInstanceState(bundle); - assertThat(bundle.getInt(Settings.EXTRA_SUB_ID)).isEqualTo( - PREV_SUB_ID); + assertThat(bundle.getInt(Settings.EXTRA_SUB_ID)).isEqualTo(PREV_SUB_ID); } } diff --git a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java index 8a57a0cc751..7ba1eb962ee 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java @@ -41,19 +41,19 @@ import android.telephony.TelephonyManager; import com.android.internal.telephony.PhoneConstants; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.Arrays; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class MobileNetworkUtilsTest { private static final String PACKAGE_NAME = "com.android.app"; private static final int SUB_ID_1 = 1; diff --git a/tests/robotests/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java b/tests/robotests/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java index 956b6010100..2aa68f71351 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java @@ -30,18 +30,17 @@ import android.telephony.TelephonyManager; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.Arrays; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NetworkSelectSettingsTest { private static final int SUB_ID = 2; @@ -103,5 +102,4 @@ public class NetworkSelectSettingsTest { (NetworkOperatorPreference) mPreferenceCategory.getPreference(0); assertThat(preference.getCellInfo()).isEqualTo(mCellInfo2); } - } diff --git a/tests/robotests/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java index d11e11c185b..6807ab67f00 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java @@ -35,21 +35,19 @@ import androidx.fragment.app.FragmentManager; import androidx.preference.ListPreference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PreferredNetworkModePreferenceControllerTest { private static final int SUB_ID = 2; - @Mock - private FragmentManager mFragmentManager; @Mock private TelephonyManager mTelephonyManager; @Mock @@ -140,5 +138,4 @@ public class PreferredNetworkModePreferenceControllerTest { Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID, 0)).isNotEqualTo( TelephonyManager.NETWORK_MODE_LTE_TDSCDMA); } - } diff --git a/tests/robotests/src/com/android/settings/network/telephony/RoamingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/RoamingPreferenceControllerTest.java index 79d281f3fda..ce61a898a6e 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/RoamingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/RoamingPreferenceControllerTest.java @@ -32,7 +32,6 @@ import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedSwitchPreference; import org.junit.Before; @@ -40,9 +39,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RoamingPreferenceControllerTest { private static final int SUB_ID = 2; @@ -140,5 +140,4 @@ public class RoamingPreferenceControllerTest { assertThat(mPreference.isEnabled()).isTrue(); assertThat(mPreference.isChecked()).isTrue(); } - } diff --git a/tests/robotests/src/com/android/settings/network/telephony/VideoCallingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/VideoCallingPreferenceControllerTest.java index e50e2646e5a..a0570225854 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/VideoCallingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/VideoCallingPreferenceControllerTest.java @@ -30,16 +30,16 @@ import android.telephony.ims.feature.ImsFeature; import androidx.preference.SwitchPreference; import com.android.ims.ImsManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class VideoCallingPreferenceControllerTest { private static final int SUB_ID = 2; @@ -125,5 +125,4 @@ public class VideoCallingPreferenceControllerTest { assertThat(mPreference.isEnabled()).isTrue(); assertThat(mPreference.isChecked()).isTrue(); } - } diff --git a/tests/robotests/src/com/android/settings/network/telephony/WifiCallingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/WifiCallingPreferenceControllerTest.java index a209b00415b..452e9b10486 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/WifiCallingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/WifiCallingPreferenceControllerTest.java @@ -32,16 +32,16 @@ import androidx.preference.PreferenceScreen; import com.android.ims.ImsConfig; import com.android.ims.ImsManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiCallingPreferenceControllerTest { private static final int SUB_ID = 2; @@ -76,7 +76,6 @@ public class WifiCallingPreferenceControllerTest { when(mPreferenceScreen.findPreference( WifiCallingPreferenceController.KEY_PREFERENCE_CATEGORY)).thenReturn( mPreferenceCategory); - } @Test @@ -110,5 +109,4 @@ public class WifiCallingPreferenceControllerTest { assertThat(mPreferenceCategory.isVisible()).isFalse(); } - } diff --git a/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaListPreferenceTest.java b/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaListPreferenceTest.java index 894564987ca..40329a5768c 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaListPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaListPreferenceTest.java @@ -26,16 +26,15 @@ import android.telephony.TelephonyManager; import androidx.preference.PreferenceManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class CdmaListPreferenceTest { private static final int SUB_ID = 2; diff --git a/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceControllerTest.java index 4044b6caf98..d94ffae3c25 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceControllerTest.java @@ -35,16 +35,16 @@ import androidx.preference.ListPreference; import androidx.preference.PreferenceManager; import com.android.internal.telephony.Phone; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class CdmaSubscriptionPreferenceControllerTest { private static final int SUB_ID = 2; diff --git a/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceControllerTest.java index f00afc97bbc..fee6099b84f 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceControllerTest.java @@ -33,16 +33,15 @@ import android.telephony.TelephonyManager; import androidx.preference.ListPreference; import androidx.preference.PreferenceManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class CdmaSystemSelectPreferenceControllerTest { private static final int SUB_ID = 2; @@ -126,7 +125,6 @@ public class CdmaSystemSelectPreferenceControllerTest { assertThat(mPreference.isEnabled()).isFalse(); } - @Test public void updateState_stateOther_resetToDefault() { Settings.Global.putInt(mContext.getContentResolver(), @@ -144,5 +142,4 @@ public class CdmaSystemSelectPreferenceControllerTest { TelephonyManager.CDMA_ROAMING_MODE_HOME)).isEqualTo( TelephonyManager.CDMA_ROAMING_MODE_ANY); } - } diff --git a/tests/robotests/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceControllerTest.java index 5f652419821..6639aaeebbf 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceControllerTest.java @@ -32,7 +32,6 @@ import android.telephony.TelephonyManager; import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -40,9 +39,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AutoSelectPreferenceControllerTest { private static final int SUB_ID = 2; private static final String OPERATOR_NAME = "T-mobile"; diff --git a/tests/robotests/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java index d5fc6e045d6..d37d934da67 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java @@ -32,16 +32,16 @@ import android.telephony.TelephonyManager; import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class OpenNetworkSelectPagePreferenceControllerTest { private static final int SUB_ID = 2; private static final String OPERATOR_NAME = "T-mobile"; diff --git a/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java index bf2c132f0c6..8ed9dcc2c80 100644 --- a/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java @@ -30,7 +30,6 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtilsInternal; import com.android.settingslib.RestrictedPreference; @@ -39,13 +38,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AndroidBeamPreferenceControllerTest { Context mContext; diff --git a/tests/robotests/src/com/android/settings/nfc/NfcAirplaneModeObserverTest.java b/tests/robotests/src/com/android/settings/nfc/NfcAirplaneModeObserverTest.java index 5dfc4f7366f..06d9773deb7 100644 --- a/tests/robotests/src/com/android/settings/nfc/NfcAirplaneModeObserverTest.java +++ b/tests/robotests/src/com/android/settings/nfc/NfcAirplaneModeObserverTest.java @@ -26,21 +26,21 @@ import android.provider.Settings.Global; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowNfcAdapter; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowNfcAdapter.class}) public class NfcAirplaneModeObserverTest { - Context mContext; + private Context mContext; private NfcAdapter mNfcAdapter; private SwitchPreference mNfcPreference; private NfcAirplaneModeObserver mNfcAirplaneModeObserver; diff --git a/tests/robotests/src/com/android/settings/nfc/NfcEnablerTest.java b/tests/robotests/src/com/android/settings/nfc/NfcEnablerTest.java index cba70911892..c3dfe48a775 100644 --- a/tests/robotests/src/com/android/settings/nfc/NfcEnablerTest.java +++ b/tests/robotests/src/com/android/settings/nfc/NfcEnablerTest.java @@ -28,16 +28,15 @@ import android.provider.Settings; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NfcEnablerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceControllerTest.java index 113cb29bc0c..b8e3a338d6e 100644 --- a/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceControllerTest.java @@ -29,18 +29,18 @@ import androidx.preference.DropDownPreference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NfcForegroundPreferenceControllerTest { private static final String PREF_KEY = PaymentSettingsTest.FOREGROUND_KEY; diff --git a/tests/robotests/src/com/android/settings/nfc/NfcPaymentPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/nfc/NfcPaymentPreferenceControllerTest.java index 7db070d25ef..b69e1727762 100644 --- a/tests/robotests/src/com/android/settings/nfc/NfcPaymentPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/nfc/NfcPaymentPreferenceControllerTest.java @@ -29,18 +29,18 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.nfc.PaymentBackend.PaymentAppInfo; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NfcPaymentPreferenceControllerTest { private static final String PREF_KEY = PaymentSettingsTest.PAYMENT_KEY; diff --git a/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java index 90a71e5e989..8883ddf7e3a 100644 --- a/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java @@ -31,23 +31,21 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NfcPreferenceControllerTest { - @Mock private NfcAdapter mNfcAdapter; @Mock diff --git a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java index b85bddad55e..1293ee4d0ff 100644 --- a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java +++ b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java @@ -29,13 +29,12 @@ import android.content.pm.UserInfo; import android.os.UserHandle; import android.os.UserManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; @@ -44,7 +43,7 @@ import org.robolectric.annotation.Implements; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = PaymentSettingsTest.ShadowPaymentBackend.class) public class PaymentSettingsTest { @@ -124,7 +123,7 @@ public class PaymentSettingsTest { } @Implementation - public List getPaymentAppInfos() { + protected List getPaymentAppInfos() { return mAppInfos; } } diff --git a/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java index 6537a405c76..3126cdf1fa8 100644 --- a/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java @@ -18,8 +18,8 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doCallRealMethod; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -32,7 +32,6 @@ import android.os.UserManager; import androidx.preference.Preference; import com.android.settings.accounts.AccountRestrictionHelper; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedPreference; import org.junit.Before; @@ -40,9 +39,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AdjustVolumeRestrictedPreferenceControllerTest { private static final String KEY = "key"; diff --git a/tests/robotests/src/com/android/settings/notification/AlarmRingtonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AlarmRingtonePreferenceControllerTest.java index 9103cfa350b..283f19331d9 100644 --- a/tests/robotests/src/com/android/settings/notification/AlarmRingtonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/AlarmRingtonePreferenceControllerTest.java @@ -21,15 +21,14 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.media.RingtoneManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AlarmRingtonePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java index 517c94b9fe7..2120cd98e5c 100644 --- a/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java @@ -23,17 +23,16 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.media.AudioManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AlarmVolumePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java index a9df13569e2..88f8303b179 100644 --- a/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java @@ -21,10 +21,9 @@ import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertTrue; - import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; @@ -41,7 +40,6 @@ import android.os.UserManager; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedSwitchPreference; @@ -51,10 +49,11 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AllowSoundPreferenceControllerTest { private Context mContext; @@ -84,14 +83,14 @@ public class AllowSoundPreferenceControllerTest { } @Test - public void testNoCrashIfNoOnResume() throws Exception { + public void testNoCrashIfNoOnResume() { mController.isAvailable(); mController.updateState(mock(RestrictedSwitchPreference.class)); mController.onPreferenceChange(mock(RestrictedSwitchPreference.class), true); } @Test - public void testIsAvailable_notIfNull() throws Exception { + public void testIsAvailable_notIfNull() { mController.onResume(null, mock(NotificationChannel.class), null, null); assertFalse(mController.isAvailable()); @@ -100,7 +99,7 @@ public class AllowSoundPreferenceControllerTest { } @Test - public void testIsAvailable_notIfAppBlocked() throws Exception { + public void testIsAvailable_notIfAppBlocked() { NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); appRow.banned = true; mController.onResume(appRow, mock(NotificationChannel.class), null, null); @@ -108,7 +107,7 @@ public class AllowSoundPreferenceControllerTest { } @Test - public void testIsAvailable_notIfAppCreatedChannel() throws Exception { + public void testIsAvailable_notIfAppCreatedChannel() { NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); NotificationChannel channel = mock(NotificationChannel.class); when(channel.getId()).thenReturn("something new"); @@ -117,7 +116,7 @@ public class AllowSoundPreferenceControllerTest { } @Test - public void testIsAvailable() throws Exception { + public void testIsAvailable() { NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); NotificationChannel channel = mock(NotificationChannel.class); when(channel.getImportance()).thenReturn(IMPORTANCE_LOW); @@ -127,7 +126,7 @@ public class AllowSoundPreferenceControllerTest { } @Test - public void testUpdateState_disabledByAdmin() throws Exception { + public void testUpdateState_disabledByAdmin() { NotificationChannel channel = mock(NotificationChannel.class); when(channel.getId()).thenReturn("something"); mController.onResume(new NotificationBackend.AppRow(), channel, null, mock( @@ -140,7 +139,7 @@ public class AllowSoundPreferenceControllerTest { } @Test - public void testUpdateState_notConfigurable() throws Exception { + public void testUpdateState_notConfigurable() { String lockedId = "locked"; NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); appRow.lockedChannelId = lockedId; @@ -155,7 +154,7 @@ public class AllowSoundPreferenceControllerTest { } @Test - public void testUpdateState_configurable() throws Exception { + public void testUpdateState_configurable() { NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); NotificationChannel channel = mock(NotificationChannel.class); when(channel.getId()).thenReturn("something"); @@ -168,7 +167,7 @@ public class AllowSoundPreferenceControllerTest { } @Test - public void testUpdateState_checkedForHighImportanceChannel() throws Exception { + public void testUpdateState_checkedForHighImportanceChannel() { NotificationChannel channel = mock(NotificationChannel.class); when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH); mController.onResume(new NotificationBackend.AppRow(), channel, null, null); @@ -179,7 +178,7 @@ public class AllowSoundPreferenceControllerTest { } @Test - public void testUpdateState_checkedForUnspecifiedImportanceChannel() throws Exception { + public void testUpdateState_checkedForUnspecifiedImportanceChannel() { NotificationChannel channel = mock(NotificationChannel.class); when(channel.getImportance()).thenReturn(IMPORTANCE_UNSPECIFIED); mController.onResume(new NotificationBackend.AppRow(), channel, null, null); @@ -190,7 +189,7 @@ public class AllowSoundPreferenceControllerTest { } @Test - public void testUpdateState_notCheckedForLowImportanceChannel() throws Exception { + public void testUpdateState_notCheckedForLowImportanceChannel() { NotificationChannel channel = mock(NotificationChannel.class); when(channel.getImportance()).thenReturn(IMPORTANCE_LOW); mController.onResume(new NotificationBackend.AppRow(), channel, null, null); diff --git a/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java index 83c0b06b8ac..9cc1c072938 100644 --- a/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java @@ -20,10 +20,9 @@ import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_NONE; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertTrue; - import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -36,17 +35,16 @@ import android.os.UserManager; import androidx.preference.Preference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppLinkPreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java index dc368a254b6..8265295a76b 100644 --- a/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java @@ -22,8 +22,8 @@ import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_NONE; import static android.provider.Settings.Secure.NOTIFICATION_BADGING; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; @@ -43,7 +43,6 @@ import android.provider.Settings; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedSwitchPreference; @@ -53,10 +52,11 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BadgePreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java index 72313bb5850..89cf2f719ba 100644 --- a/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java @@ -34,17 +34,16 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BadgingNotificationPreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java index 0ebcaefa435..4f6944a3ce4 100644 --- a/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java @@ -23,11 +23,10 @@ import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_NONE; import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertNotNull; -import static junit.framework.Assert.assertTrue; - import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; @@ -45,7 +44,6 @@ import android.content.Context; import android.os.UserManager; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.SwitchBar; import com.android.settingslib.widget.LayoutPreference; @@ -54,10 +52,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BlockPreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java index 220269ebef4..9a2ab9be765 100644 --- a/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java @@ -28,7 +28,6 @@ import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -36,8 +35,9 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BootSoundPreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java index c3c0a33b0ef..966d4e1ac0b 100644 --- a/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java @@ -27,19 +27,16 @@ import android.content.Context; import android.media.AudioManager; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.ShadowAudioManager; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {ShadowAudioManager.class}) +@RunWith(RobolectricTestRunner.class) public class CallVolumePreferenceControllerTest { private static final String TEST_KEY = "Test_Key"; @@ -48,7 +45,7 @@ public class CallVolumePreferenceControllerTest { private Context mContext; private CallVolumePreferenceController mController; - private ShadowAudioManager mShadowAudioManager; + private AudioManager mAudioManager; @Before public void setUp() { @@ -56,7 +53,7 @@ public class CallVolumePreferenceControllerTest { mContext = RuntimeEnvironment.application; mController = new CallVolumePreferenceController(mContext, TEST_KEY); mController.setAudioHelper(mHelper); - mShadowAudioManager = ShadowAudioManager.getShadow(); + mAudioManager = mContext.getSystemService(AudioManager.class); } @Test @@ -80,14 +77,14 @@ public class CallVolumePreferenceControllerTest { @Test public void getAudioStream_onBluetoothScoOff_shouldEqualToStreamVoiceCall() { - mShadowAudioManager.setBluetoothScoOn(false); + mAudioManager.setBluetoothScoOn(false); assertThat(mController.getAudioStream()).isEqualTo(AudioManager.STREAM_VOICE_CALL); } @Test public void getAudioStream_onBluetoothScoOn_shouldEqualToStreamBtSco() { - mShadowAudioManager.setBluetoothScoOn(true); + mAudioManager.setBluetoothScoOn(true); assertThat(mController.getAudioStream()).isEqualTo(AudioManager.STREAM_BLUETOOTH_SCO); } diff --git a/tests/robotests/src/com/android/settings/notification/CastPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/CastPreferenceControllerTest.java index badce887372..9f39c18e9a5 100644 --- a/tests/robotests/src/com/android/settings/notification/CastPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/CastPreferenceControllerTest.java @@ -21,20 +21,19 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.telephony.TelephonyManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class CastPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java index 4d22bfe8e0f..c8ec1f484bd 100644 --- a/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java @@ -30,17 +30,16 @@ import androidx.fragment.app.FragmentActivity; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ChargingSoundPreferenceControllerTest { @Mock @@ -103,8 +102,7 @@ public class ChargingSoundPreferenceControllerTest { mPreference.getOnPreferenceChangeListener().onPreferenceChange(mPreference, true); - assertThat(Secure.getInt(mContentResolver, Secure.CHARGING_SOUNDS_ENABLED, 1)) - .isEqualTo(1); + assertThat(Secure.getInt(mContentResolver, Secure.CHARGING_SOUNDS_ENABLED, 1)).isEqualTo(1); } @Test @@ -113,7 +111,6 @@ public class ChargingSoundPreferenceControllerTest { mPreference.getOnPreferenceChangeListener().onPreferenceChange(mPreference, false); - assertThat(Secure.getInt(mContentResolver, Secure.CHARGING_SOUNDS_ENABLED, 1)) - .isEqualTo(0); + assertThat(Secure.getInt(mContentResolver, Secure.CHARGING_SOUNDS_ENABLED, 1)).isEqualTo(0); } } diff --git a/tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java index d3463ce770b..69102971f17 100644 --- a/tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java +++ b/tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java @@ -37,7 +37,6 @@ import android.app.Activity; import com.android.settings.dashboard.SummaryLoader; import com.android.settings.notification.ConfigureNotificationSettings.SummaryProvider; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowLockPatternUtils; import com.android.settings.testutils.shadow.ShadowUtils; @@ -46,12 +45,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ConfigureNotificationSettingsTest { private Activity mActivity; diff --git a/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java index 6d3f1b42b2f..d9929c430de 100644 --- a/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java @@ -16,8 +16,8 @@ package com.android.settings.notification; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.any; @@ -34,18 +34,17 @@ import android.os.UserManager; import androidx.preference.Preference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DeletedChannelsPreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java index 649918ab969..ff6ff91eaee 100644 --- a/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java @@ -19,10 +19,9 @@ package com.android.settings.notification; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_NONE; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertTrue; - import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -35,17 +34,16 @@ import android.os.UserManager; import androidx.preference.Preference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DescriptionPreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java index 8bc6d34fea3..fa95e52ebf6 100644 --- a/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java @@ -30,16 +30,15 @@ import androidx.fragment.app.FragmentActivity; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DialPadTonePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java index e086e7fc64f..0b2af49e830 100644 --- a/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java @@ -21,8 +21,8 @@ import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_MIN; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; @@ -40,7 +40,6 @@ import android.os.UserManager; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedSwitchPreference; @@ -50,10 +49,11 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DndPreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java index 7ad6230e196..db502144493 100644 --- a/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java @@ -19,7 +19,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Answers.RETURNS_DEEP_STUBS; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.when; @@ -31,16 +31,15 @@ import androidx.fragment.app.FragmentActivity; import androidx.preference.DropDownPreference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DockAudioMediaPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java index a087cf20d28..b6942684351 100644 --- a/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java @@ -30,16 +30,15 @@ import androidx.fragment.app.FragmentActivity; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DockingSoundPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java index ef382111ce2..822ca5f5533 100644 --- a/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java @@ -29,7 +29,6 @@ import android.content.pm.PackageManager; import android.os.UserManager; import com.android.settings.accounts.AccountRestrictionHelper; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedPreference; import org.junit.Before; @@ -38,8 +37,9 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EmergencyBroadcastPreferenceControllerTest { private static final String PREF_TEST_KEY = "test_key"; diff --git a/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java index 5c71c643f46..49776de679f 100644 --- a/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java @@ -30,16 +30,15 @@ import androidx.fragment.app.FragmentActivity; import androidx.preference.DropDownPreference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EmergencyTonePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java index 04dac267086..de84f0755c3 100644 --- a/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java @@ -18,10 +18,10 @@ package com.android.settings.notification; import static android.app.NotificationManager.IMPORTANCE_NONE; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertTrue; - import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -38,17 +38,17 @@ import androidx.fragment.app.FragmentActivity; import androidx.preference.PreferenceFragmentCompat; import com.android.settingslib.widget.LayoutPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class HeaderPreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java index 0c706fbdaaf..99d3376e82e 100644 --- a/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java @@ -21,12 +21,12 @@ import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_NONE; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertNull; -import static junit.framework.Assert.assertTrue; - +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -42,7 +42,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.RestrictedListPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils; import org.junit.Before; @@ -51,10 +50,11 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ImportancePreferenceControllerTest { private Context mContext; @@ -194,7 +194,7 @@ public class ImportancePreferenceControllerTest { } @Test - public void testImportanceHightToLow() { + public void testImportanceHighToLow() { NotificationChannel channel = new NotificationChannel(DEFAULT_CHANNEL_ID, "a", IMPORTANCE_HIGH); channel.setSound(null, Notification.AUDIO_ATTRIBUTES_DEFAULT); diff --git a/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java index 6ceaffa7ee8..dd6a6208381 100644 --- a/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java @@ -22,9 +22,8 @@ import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.provider.Settings.System.NOTIFICATION_LIGHT_PULSE; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertTrue; - +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; @@ -42,22 +41,23 @@ import android.provider.Settings; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedSwitchPreference; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.class) public class LightsPreferenceControllerTest { @@ -88,6 +88,11 @@ public class LightsPreferenceControllerTest { Settings.System.putInt(mContext.getContentResolver(), NOTIFICATION_LIGHT_PULSE, 1); } + @After + public void tearDown() { + SettingsShadowResources.reset(); + } + @Test public void testNoCrashIfNoOnResume() { mController.isAvailable(); diff --git a/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java index 49fd6d49377..657b3521598 100644 --- a/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java @@ -21,15 +21,14 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.media.AudioManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class MediaVolumePreferenceControllerTest { private MediaVolumePreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/notification/NotificationAccessSettingsTest.java b/tests/robotests/src/com/android/settings/notification/NotificationAccessSettingsTest.java index 58b5ea3c966..cf476c17659 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationAccessSettingsTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationAccessSettingsTest.java @@ -16,22 +16,22 @@ package com.android.settings.notification; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; import android.content.Context; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NotificationAccessSettingsTest { private FakeFeatureFactory mFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java b/tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java index af810ace478..4b2c74e8d7d 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java @@ -31,15 +31,15 @@ import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NotificationAppPreferenceTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java b/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java index 088fadee98e..2c2e3791ab8 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java @@ -18,24 +18,24 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertNull; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import android.app.usage.UsageEvents; import android.os.Parcel; import com.android.settings.notification.NotificationBackend.AppRow; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Test; import org.junit.runner.RunWith; import java.util.ArrayList; import java.util.List; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NotificationBackendTest { @Test diff --git a/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java index 5d6e1fed142..1ad93780fa3 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java @@ -23,10 +23,9 @@ import static android.app.NotificationManager.IMPORTANCE_MIN; import static android.app.NotificationManager.IMPORTANCE_NONE; import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertTrue; - import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.any; import static org.mockito.Mockito.mock; @@ -42,7 +41,6 @@ import android.os.UserManager; import androidx.preference.Preference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils; import org.junit.Before; @@ -51,10 +49,11 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NotificationPreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/notification/NotificationRingtonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationRingtonePreferenceControllerTest.java index 21737c146bd..1aecad51242 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationRingtonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationRingtonePreferenceControllerTest.java @@ -20,16 +20,15 @@ import static com.google.common.truth.Truth.assertThat; import android.media.RingtoneManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NotificationRingtonePreferenceControllerTest { private NotificationRingtonePreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java index cd3fad71628..8e1b015b859 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java @@ -26,17 +26,16 @@ import android.media.AudioManager; import android.os.Vibrator; import android.telephony.TelephonyManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NotificationVolumePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java index 65c60c7222b..1f317d974e1 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java @@ -32,17 +32,16 @@ import android.os.UserManager; import androidx.preference.Preference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NotificationsOffPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java index 7a98386ea24..24e845851a4 100644 --- a/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java @@ -24,17 +24,16 @@ import android.content.Context; import android.media.RingtoneManager; import android.telephony.TelephonyManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PhoneRingtonePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java index 235d7b277e3..93b86210d9f 100644 --- a/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java @@ -34,7 +34,6 @@ import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -42,9 +41,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PulseNotificationPreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java index e222b20551c..4221a2117cf 100644 --- a/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java @@ -18,10 +18,10 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.argThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -48,7 +48,6 @@ import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.AppUtils; import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.applications.instantapps.InstantAppDataProvider; @@ -60,6 +59,7 @@ import org.mockito.ArgumentCaptor; import org.mockito.ArgumentMatcher; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; @@ -67,7 +67,7 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RecentNotifyingAppsPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/notification/RedactionInterstitialTest.java b/tests/robotests/src/com/android/settings/notification/RedactionInterstitialTest.java index 2f273aed9e2..61fe0258682 100644 --- a/tests/robotests/src/com/android/settings/notification/RedactionInterstitialTest.java +++ b/tests/robotests/src/com/android/settings/notification/RedactionInterstitialTest.java @@ -19,9 +19,6 @@ import android.widget.RadioButton; import com.android.settings.R; import com.android.settings.RestrictedRadioButton; import com.android.settings.notification.RedactionInterstitial.RedactionInterstitialFragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settings.testutils.shadow.ShadowUtils; @@ -30,14 +27,12 @@ import org.junit.After; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = { - SettingsShadowResources.class, - SettingsShadowResourcesImpl.class, - SettingsShadowResources.SettingsShadowTheme.class, ShadowUtils.class, ShadowRestrictedLockUtilsInternal.class, ShadowUserManager.class, diff --git a/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java index 50a01bc89dc..e89edb4ba5f 100644 --- a/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java @@ -27,17 +27,16 @@ import android.media.AudioManager; import android.os.Vibrator; import android.telephony.TelephonyManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RingVolumePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java index 3bd32927895..f22a78225a2 100644 --- a/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java @@ -18,7 +18,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -27,15 +27,14 @@ import android.media.RingtoneManager; import androidx.preference.Preference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RingtonePreferenceControllerBaseTest { @Mock diff --git a/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java index d3d4bc1b3df..f1927b47e4e 100644 --- a/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java @@ -30,17 +30,16 @@ import androidx.fragment.app.FragmentActivity; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ScreenLockSoundPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java b/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java index 6d51cde5687..6dec2d916af 100644 --- a/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java @@ -33,7 +33,6 @@ import androidx.fragment.app.FragmentActivity; import androidx.preference.PreferenceScreen; import com.android.settings.SettingsPreferenceFragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -41,12 +40,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SettingPrefControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java index cfffbdcfd76..1b4ede5b14f 100644 --- a/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java @@ -21,8 +21,8 @@ import static android.app.NotificationManager.IMPORTANCE_DEFAULT; import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; @@ -48,23 +48,20 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.SettingsPreferenceFragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settingslib.RestrictedLockUtils; -import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = SettingsShadowResources.class) +@RunWith(RobolectricTestRunner.class) public class SoundPreferenceControllerTest { private Context mContext; @@ -89,20 +86,13 @@ public class SoundPreferenceControllerTest { ShadowApplication shadowApplication = ShadowApplication.getInstance(); shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNm); shadowApplication.setSystemService(Context.USER_SERVICE, mUm); - SettingsShadowResources.overrideResource(com.android.internal.R.string.ringtone_silent, - "silent"); mContext = RuntimeEnvironment.application; mController = spy(new SoundPreferenceController( mContext, mFragment, mImportanceListener, mBackend)); } - @After - public void tearDown() { - SettingsShadowResources.reset(); - } - @Test - public void testNoCrashIfNoOnResume() throws Exception { + public void testNoCrashIfNoOnResume() { mController.isAvailable(); mController.updateState(mock(NotificationSoundPreference.class)); mController.onPreferenceChange(mock(NotificationSoundPreference.class), Uri.EMPTY); @@ -112,14 +102,14 @@ public class SoundPreferenceControllerTest { } @Test - public void testIsAvailable_notIfChannelNull() throws Exception { + public void testIsAvailable_notIfChannelNull() { NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); mController.onResume(appRow, null, null, null); assertFalse(mController.isAvailable()); } @Test - public void testIsAvailable_notIfNotImportant() throws Exception { + public void testIsAvailable_notIfNotImportant() { NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_LOW); mController.onResume(appRow, channel, null, null); @@ -127,7 +117,7 @@ public class SoundPreferenceControllerTest { } @Test - public void testIsAvailable_notIfDefaultChannel() throws Exception { + public void testIsAvailable_notIfDefaultChannel() { NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); NotificationChannel channel = new NotificationChannel(DEFAULT_CHANNEL_ID, "", IMPORTANCE_DEFAULT); @@ -136,7 +126,7 @@ public class SoundPreferenceControllerTest { } @Test - public void testIsAvailable() throws Exception { + public void testIsAvailable() { NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_DEFAULT); mController.onResume(appRow, channel, null, null); @@ -144,7 +134,7 @@ public class SoundPreferenceControllerTest { } @Test - public void testDisplayPreference_savesPreference() throws Exception { + public void testDisplayPreference_savesPreference() { NotificationSoundPreference pref = mock(NotificationSoundPreference.class); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(pref); mController.displayPreference(mScreen); @@ -154,20 +144,21 @@ public class SoundPreferenceControllerTest { } @Test - public void testUpdateState_disabledByAdmin() throws Exception { + public void testUpdateState_disabledByAdmin() { NotificationChannel channel = mock(NotificationChannel.class); when(channel.getId()).thenReturn("something"); mController.onResume(new NotificationBackend.AppRow(), channel, null, mock( RestrictedLockUtils.EnforcedAdmin.class)); - Preference pref = new NotificationSoundPreference(mContext, mock(AttributeSet.class)); + AttributeSet attributeSet = Robolectric.buildAttributeSet().build(); + Preference pref = new NotificationSoundPreference(mContext, attributeSet); mController.updateState(pref); assertFalse(pref.isEnabled()); } @Test - public void testUpdateState_notConfigurable() throws Exception { + public void testUpdateState_notConfigurable() { String lockedId = "locked"; NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); appRow.lockedChannelId = lockedId; @@ -175,14 +166,15 @@ public class SoundPreferenceControllerTest { when(channel.getId()).thenReturn(lockedId); mController.onResume(appRow, channel, null, null); - Preference pref = new NotificationSoundPreference(mContext, mock(AttributeSet.class)); + AttributeSet attributeSet = Robolectric.buildAttributeSet().build(); + Preference pref = new NotificationSoundPreference(mContext, attributeSet); mController.updateState(pref); assertFalse(pref.isEnabled()); } @Test - public void testUpdateState_configurable() throws Exception { + public void testUpdateState_configurable() { Uri sound = Settings.System.DEFAULT_ALARM_ALERT_URI; NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); NotificationChannel channel = mock(NotificationChannel.class); @@ -190,8 +182,8 @@ public class SoundPreferenceControllerTest { when(channel.getSound()).thenReturn(sound); mController.onResume(appRow, channel, null, null); - NotificationSoundPreference pref = - new NotificationSoundPreference(mContext, mock(AttributeSet.class)); + AttributeSet attributeSet = Robolectric.buildAttributeSet().build(); + NotificationSoundPreference pref = new NotificationSoundPreference(mContext, attributeSet); mController.updateState(pref); assertEquals(sound, pref.onRestoreRingtone()); @@ -199,15 +191,16 @@ public class SoundPreferenceControllerTest { } @Test - public void testOnPreferenceChange() throws Exception { + public void testOnPreferenceChange() { Uri sound = Settings.System.DEFAULT_ALARM_ALERT_URI; NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_HIGH); channel.setSound(sound, Notification.AUDIO_ATTRIBUTES_DEFAULT); mController.onResume(appRow, channel, null, null); + AttributeSet attributeSet = Robolectric.buildAttributeSet().build(); NotificationSoundPreference pref = - new NotificationSoundPreference(mContext, mock(AttributeSet.class)); + new NotificationSoundPreference(mContext, attributeSet); mController.updateState(pref); mController.onPreferenceChange(pref, Uri.EMPTY); @@ -217,7 +210,7 @@ public class SoundPreferenceControllerTest { } @Test - public void testOnPreferenceTreeClick_incorrectPref() throws Exception { + public void testOnPreferenceTreeClick_incorrectPref() { NotificationSoundPreference pref = mock(NotificationSoundPreference.class); mController.handlePreferenceTreeClick(pref); @@ -226,9 +219,10 @@ public class SoundPreferenceControllerTest { } @Test - public void testOnPreferenceTreeClick_correctPref() throws Exception { + public void testOnPreferenceTreeClick_correctPref() { + AttributeSet attributeSet = Robolectric.buildAttributeSet().build(); NotificationSoundPreference pref = - spy(new NotificationSoundPreference(mContext, mock(AttributeSet.class))); + spy(new NotificationSoundPreference(mContext, attributeSet)); pref.setKey(mController.getPreferenceKey()); mController.handlePreferenceTreeClick(pref); diff --git a/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java b/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java index 3510a60eb1f..4f3dce6c22b 100644 --- a/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java +++ b/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java @@ -30,20 +30,20 @@ import android.os.UserManager; import android.preference.SeekBarVolumizer; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.XmlTestUtils; import com.android.settings.testutils.shadow.ShadowAudioHelper; import com.android.settings.testutils.shadow.ShadowUserManager; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SoundSettingsTest { @Test @@ -74,7 +74,6 @@ public class SoundSettingsTest { @Test public void onStreamValueChanged_shouldRepostStopSampleMessage() { final SoundSettings settings = new SoundSettings(); - final Handler handler = settings.mHandler; ReflectionHelpers.setField( settings.mVolumeCallback, "mCurrent", mock(SeekBarVolumizer.class)); diff --git a/tests/robotests/src/com/android/settings/notification/SuppressorHelperTest.java b/tests/robotests/src/com/android/settings/notification/SuppressorHelperTest.java index 9bb380df01e..a12af4dd60c 100644 --- a/tests/robotests/src/com/android/settings/notification/SuppressorHelperTest.java +++ b/tests/robotests/src/com/android/settings/notification/SuppressorHelperTest.java @@ -24,15 +24,14 @@ import android.content.Context; import android.content.pm.PackageManager; import android.content.pm.ServiceInfo; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SuppressorHelperTest { private static final String SUPPRESSOR_NAME = "wear"; diff --git a/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java index abea4e30b9e..91c2a7803b1 100644 --- a/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java @@ -31,17 +31,16 @@ import androidx.fragment.app.FragmentActivity; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TouchSoundPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java index daf7ffb9e4d..2b2f02c73ca 100644 --- a/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java @@ -30,16 +30,15 @@ import androidx.fragment.app.FragmentActivity; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class VibrateOnTouchPreferenceControllerTest { @Mock @@ -74,7 +73,6 @@ public class VibrateOnTouchPreferenceControllerTest { @Test public void isAvailable_hasHaptic_shouldReturnTrue() { - assertThat(mController.isAvailable()).isTrue(); } diff --git a/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java index aa1824d7d53..7334b452267 100644 --- a/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java @@ -36,18 +36,17 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowContentResolver; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class VibrateWhenRingPreferenceControllerTest { private static final String KEY_VIBRATE_WHEN_RINGING = "vibrate_when_ringing"; diff --git a/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java index 69438e221ec..e1d5b73574c 100644 --- a/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java @@ -21,8 +21,8 @@ import static android.app.NotificationManager.IMPORTANCE_DEFAULT; import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; @@ -41,7 +41,6 @@ import android.os.Vibrator; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedSwitchPreference; @@ -51,10 +50,11 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class VibrationPreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java index 8aad02e1a0d..20454009c66 100644 --- a/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java @@ -24,10 +24,9 @@ import static android.app.NotificationManager.VISIBILITY_NO_OVERRIDE; import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTIFICATIONS; import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertTrue; - import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; @@ -48,7 +47,6 @@ import android.provider.Settings; import com.android.internal.widget.LockPatternUtils; import com.android.settings.RestrictedListPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowRestrictionUtils; import com.android.settingslib.RestrictedLockUtils; @@ -59,6 +57,7 @@ import org.mockito.Answers; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; @@ -66,7 +65,7 @@ import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowRestrictionUtils.class) public class VisibilityPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java index 99a97c342e2..a9e74b74306 100644 --- a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java @@ -18,9 +18,9 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -30,15 +30,14 @@ import android.content.Context; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class VolumeSeekBarPreferenceControllerTest { @Mock @@ -59,7 +58,7 @@ public class VolumeSeekBarPreferenceControllerTest { MockitoAnnotations.initMocks(this); when(mScreen.findPreference(nullable(String.class))).thenReturn(mPreference); when(mPreference.getKey()).thenReturn("key"); - mController = new VolumeSeekBarPreferenceControllerTestable(mContext, mCallback, + mController = new VolumeSeekBarPreferenceControllerTestable(mContext, mCallback, true, mPreference.getKey()); mController.setAudioHelper(mHelper); } @@ -147,11 +146,6 @@ public class VolumeSeekBarPreferenceControllerTest { private boolean mAvailable; - VolumeSeekBarPreferenceControllerTestable(Context context, - VolumeSeekBarPreference.Callback callback, String key) { - this(context, callback, true, key); - } - VolumeSeekBarPreferenceControllerTestable(Context context, VolumeSeekBarPreference.Callback callback, boolean available, String key) { super(context, key); diff --git a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceTest.java b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceTest.java index 5955aa8521d..d74f76a7cea 100644 --- a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceTest.java @@ -24,15 +24,14 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.media.AudioManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class VolumeSeekBarPreferenceTest { @Mock diff --git a/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java index 4397e71c653..d6a594a72b8 100644 --- a/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java @@ -18,9 +18,9 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -39,15 +39,15 @@ import androidx.preference.TwoStatePreference; import com.android.settings.DefaultRingtonePreference; import com.android.settings.R; import com.android.settings.RingtonePreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WorkSoundPreferenceControllerTest { private static final String KEY_WORK_CATEGORY = "sound_work_settings_section"; @@ -166,7 +166,6 @@ public class WorkSoundPreferenceControllerTest { verify(mWorkCategory).setVisible(false); } - @Test public void displayPreference_isAvailable_shouldShowPreferenceCategory() { when(mAudioHelper.getManagedProfileId(nullable(UserManager.class))) diff --git a/tests/robotests/src/com/android/settings/notification/ZenAccessSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ZenAccessSettingsTest.java index c902828c9f1..c2a6f4f892c 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenAccessSettingsTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenAccessSettingsTest.java @@ -16,15 +16,14 @@ package com.android.settings.notification; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import android.content.Context; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -32,8 +31,9 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenAccessSettingsTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/notification/ZenCustomRadioButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/notification/ZenCustomRadioButtonPreferenceTest.java index c679205ee1e..8e53aa66191 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenCustomRadioButtonPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenCustomRadioButtonPreferenceTest.java @@ -29,14 +29,14 @@ import android.widget.RadioButton; import androidx.preference.PreferenceViewHolder; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenCustomRadioButtonPreferenceTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/notification/ZenFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenFooterPreferenceControllerTest.java index eb89f827a1d..a6288b3fd41 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenFooterPreferenceControllerTest.java @@ -38,7 +38,6 @@ import android.content.Context; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.widget.FooterPreference; @@ -47,11 +46,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenFooterPreferenceControllerTest { private ZenFooterPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java index df4df51e857..cfeae7da978 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java @@ -30,7 +30,6 @@ import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -38,6 +37,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; @@ -45,7 +45,7 @@ import org.robolectric.util.ReflectionHelpers; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeAlarmsPreferenceControllerTest { private static final boolean ALARMS_SETTINGS = true; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeAllBypassingAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeAllBypassingAppsPreferenceControllerTest.java index 45f42102e7a..bf3057e45e6 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeAllBypassingAppsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeAllBypassingAppsPreferenceControllerTest.java @@ -19,8 +19,6 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; @@ -28,12 +26,10 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.NotificationChannel; -import android.app.NotificationManager; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.ParceledListSlice; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.ApplicationsState; import org.junit.Before; @@ -41,6 +37,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; @@ -50,7 +47,7 @@ import java.util.List; import androidx.fragment.app.Fragment; import androidx.preference.PreferenceScreen; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeAllBypassingAppsPreferenceControllerTest { private ZenModeAllBypassingAppsPreferenceController mController; @@ -110,7 +107,7 @@ public class ZenModeAllBypassingAppsPreferenceControllerTest { @Test public void testUpdateNotificationChannelList_emptyChannelsList() { - mController.updateNotificationChannelList(new ArrayList()); + mController.updateNotificationChannelList(new ArrayList<>()); verify(mPreferenceScreen, never()).addPreference(any()); } } diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java index b431c0a65f2..5e3d6e9888c 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java @@ -34,21 +34,20 @@ import androidx.fragment.app.Fragment; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.mockito.internal.util.reflection.FieldSetter; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; import java.util.HashMap; import java.util.Map; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeAutomaticRulesPreferenceControllerTest { private ZenModeAutomaticRulesPreferenceController mController; @@ -67,10 +66,10 @@ public class ZenModeAutomaticRulesPreferenceControllerTest { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; mController = spy(new ZenModeAutomaticRulesPreferenceController(mContext, mock(Fragment.class), - null)); + null)); ReflectionHelpers.setField(mController, "mBackend", mBackend); when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn( - mockPref); + mockPref); mController.displayPreference(mPreferenceScreen); doReturn(mZenRulePreference).when(mController).createZenRulePreference(any()); } @@ -85,11 +84,11 @@ public class ZenModeAutomaticRulesPreferenceControllerTest { String ruleId3 = "test3_id"; AutomaticZenRule autoRule1 = new AutomaticZenRule("test_rule_1", null, - null, Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS, true, 10); + null, Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS, true, 10); AutomaticZenRule autoRule2 = new AutomaticZenRule("test_rule_2", null, - null, Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS, true, 20); + null, Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS, true, 20); AutomaticZenRule autoRule3 = new AutomaticZenRule("test_rule_3", null, - null, Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS, true, 30); + null, Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS, true, 30); rMap.put(ruleId1, autoRule1); rMap.put(ruleId2, autoRule2); @@ -111,9 +110,9 @@ public class ZenModeAutomaticRulesPreferenceControllerTest { String ruleId2 = "test2_id"; AutomaticZenRule autoRule1 = new AutomaticZenRule("test_rule_1", null, - null, Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS, true, 10); + null, Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS, true, 10); AutomaticZenRule autoRule2 = new AutomaticZenRule("test_rule_2", null, - null, Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS, true, 20); + null, Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS, true, 20); rMap.put(ruleId1, autoRule1); rMap.put(ruleId2, autoRule2); @@ -132,7 +131,7 @@ public class ZenModeAutomaticRulesPreferenceControllerTest { Map rMap = new HashMap<>(); String testId = "test1_id"; AutomaticZenRule rule = new AutomaticZenRule("rule_name", null, - null, Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS, true, 10); + null, Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS, true, 10); rMap.put(testId, rule); when(mockPref.getPreferenceCount()).thenReturn(NUM_RULES); @@ -153,4 +152,4 @@ public class ZenModeAutomaticRulesPreferenceControllerTest { rules.entrySet().toArray(arr); when(mBackend.getAutomaticZenRules()).thenReturn(arr); } -} +} \ No newline at end of file diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeBackendTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeBackendTest.java index 94a3c011e16..3feff0d28b2 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeBackendTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeBackendTest.java @@ -6,16 +6,15 @@ import android.app.AutomaticZenRule; import android.provider.Settings; import android.service.notification.ZenModeConfig; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; import java.util.Arrays; import java.util.HashMap; import java.util.Map; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeBackendTest { private static final String GENERIC_RULE_NAME = "test"; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java index c4b2b3d0c0f..2c78f2d3bf4 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java @@ -22,7 +22,7 @@ import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_OFF; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -43,7 +43,6 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.notification.AbstractZenModePreferenceController.ZenModeConfigWrapper; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -51,11 +50,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeBehaviorFooterPreferenceControllerTest { private static final String TEST_APP_NAME = "test_app"; @@ -72,8 +72,6 @@ public class ZenModeBehaviorFooterPreferenceControllerTest { @Mock private PreferenceScreen mPreferenceScreen; @Mock - private ZenModeConfig mConfig; - @Mock private ZenModeConfigWrapper mConfigWrapper; private Context mContext; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeBlockedEffectsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeBlockedEffectsPreferenceControllerTest.java index 4bf05efd47e..448800f1af1 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeBlockedEffectsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeBlockedEffectsPreferenceControllerTest.java @@ -24,7 +24,6 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -32,11 +31,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public final class ZenModeBlockedEffectsPreferenceControllerTest { private ZenModeBlockedEffectsPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java index a3c326138fd..1071b4847f0 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java @@ -37,7 +37,6 @@ import androidx.fragment.app.FragmentManager; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -45,11 +44,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeButtonPreferenceControllerTest { private ZenModeButtonPreferenceController mController; @@ -86,8 +86,7 @@ public class ZenModeButtonPreferenceControllerTest { ReflectionHelpers.setField(mController, "mZenButtonOn", mZenButtonOn); ReflectionHelpers.setField(mController, "mZenButtonOff", mZenButtonOff); - when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn( - mockPref); + when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(mockPref); mController.displayPreference(mPreferenceScreen); } diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeBypassingAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeBypassingAppsPreferenceControllerTest.java index 0bdf6f58aea..9c27356fa19 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeBypassingAppsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeBypassingAppsPreferenceControllerTest.java @@ -24,7 +24,6 @@ import static org.mockito.Mockito.when; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -32,10 +31,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeBypassingAppsPreferenceControllerTest { private ZenModeBypassingAppsPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java index fdc43f3fcbd..a25a3937b8c 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java @@ -25,7 +25,6 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -33,13 +32,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; import androidx.preference.Preference; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public final class ZenModeCallsPreferenceControllerTest { private ZenModeCallsPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeDurationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeDurationPreferenceControllerTest.java index 2d5e54ae23f..1488d7998d1 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeDurationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeDurationPreferenceControllerTest.java @@ -26,7 +26,6 @@ import android.content.Context; import android.provider.Settings; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -34,11 +33,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeDurationPreferenceControllerTest { private ZenModeDurationPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeEventRuleSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeEventRuleSettingsTest.java index 9a922ba3a5c..502992303ea 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeEventRuleSettingsTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeEventRuleSettingsTest.java @@ -32,24 +32,21 @@ import android.content.res.Resources; import androidx.fragment.app.FragmentActivity; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; import org.robolectric.shadows.ShadowToast; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = SettingsShadowResources.SettingsShadowTheme.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeEventRuleSettingsTest { @Mock diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java index 7d5efa7c065..2e54d08b27c 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java @@ -33,7 +33,6 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -41,11 +40,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeEventsPreferenceControllerTest { private static final boolean EVENTS_SETTINGS = true; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java index 9217f64393a..2489d174624 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java @@ -33,7 +33,6 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -42,11 +41,12 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeMediaPreferenceControllerTest { private ZenModeMediaPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java index 890f6c2afb2..5589caefa0f 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java @@ -23,7 +23,6 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -31,11 +30,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public final class ZenModeMessagesPreferenceControllerTest { private ZenModeMessagesPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java index 141813b52b1..adecd98eafb 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java @@ -20,7 +20,7 @@ import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEA import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -34,18 +34,18 @@ import android.content.Context; import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/notification/ZenModePriorityCallsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModePriorityCallsPreferenceControllerTest.java index 7131250442e..6b9f643e610 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModePriorityCallsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModePriorityCallsPreferenceControllerTest.java @@ -34,7 +34,6 @@ import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -42,11 +41,15 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + +@RunWith(RobolectricTestRunner.class) public class ZenModePriorityCallsPreferenceControllerTest { private ZenModePriorityCallsPreferenceController mController; @@ -94,8 +97,7 @@ public class ZenModePriorityCallsPreferenceControllerTest { mController = new ZenModePriorityCallsPreferenceController(mContext, mock(Lifecycle.class)); ReflectionHelpers.setField(mController, "mBackend", mBackend); - when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn( - mockPref); + when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(mockPref); mController.displayPreference(mPreferenceScreen); } diff --git a/tests/robotests/src/com/android/settings/notification/ZenModePriorityMessagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModePriorityMessagesPreferenceControllerTest.java index 7b6698dc693..83bf3e4d1f4 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModePriorityMessagesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModePriorityMessagesPreferenceControllerTest.java @@ -34,7 +34,6 @@ import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -42,11 +41,15 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + +@RunWith(RobolectricTestRunner.class) public class ZenModePriorityMessagesPreferenceControllerTest { private ZenModePriorityMessagesPreferenceController mController; @@ -94,8 +97,7 @@ public class ZenModePriorityMessagesPreferenceControllerTest { mController = new ZenModePriorityMessagesPreferenceController(mContext, mock(Lifecycle.class)); ReflectionHelpers.setField(mController, "mBackend", mBackend); - when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn( - mockPref); + when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(mockPref); mController.displayPreference(mPreferenceScreen); } diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java index de20fb4f38b..12e6dfdaf9b 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java @@ -33,7 +33,6 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -41,11 +40,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeRemindersPreferenceControllerTest { private static final boolean REMINDERS_SETTINGS = true; @@ -84,7 +84,6 @@ public class ZenModeRemindersPreferenceControllerTest { mController.displayPreference(mPreferenceScreen); } - @Test public void updateState_TotalSilence() { Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_NO_INTERRUPTIONS); diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java index fd6a9af1fbf..6c2ffacda39 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java @@ -33,7 +33,6 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -41,11 +40,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeRepeatCallersPreferenceControllerTest { private static final boolean REPEAT_CALLERS_SETTINGS = true; @@ -79,8 +79,7 @@ public class ZenModeRepeatCallersPreferenceControllerTest { 15); ReflectionHelpers.setField(mController, "mBackend", mBackend); - when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn( - mockPref); + when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(mockPref); mController.displayPreference(mPreferenceScreen); } diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeScheduleRuleSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeScheduleRuleSettingsTest.java index ecfb7842c91..46f3019b4c7 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeScheduleRuleSettingsTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeScheduleRuleSettingsTest.java @@ -32,21 +32,18 @@ import android.content.res.Resources; import androidx.fragment.app.FragmentActivity; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; import org.robolectric.shadows.ShadowToast; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = SettingsShadowResources.SettingsShadowTheme.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeScheduleRuleSettingsTest { @Mock diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java index ca9f9429228..516d98f1f0a 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java @@ -22,7 +22,7 @@ import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_OFF; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; import static org.mockito.Mockito.mock; @@ -44,7 +44,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.notification.AbstractZenModePreferenceController.ZenModeConfigWrapper; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -52,11 +51,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeSettingsFooterPreferenceControllerTest { private static final String TEST_APP_NAME = "test_app"; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java index 53032ac789c..f899a98cb9e 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java @@ -18,7 +18,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import android.app.NotificationManager; import android.app.NotificationManager.Policy; @@ -26,16 +26,16 @@ import android.content.Context; import android.provider.SearchIndexableResource; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeSettingsTest { private ZenModeSettings.SummaryBuilder mBuilder; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java index ee513170611..bc9e3707620 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java @@ -33,20 +33,20 @@ import androidx.slice.core.SliceAction; import androidx.slice.widget.SliceLiveData; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SliceTester; import com.android.settings.testutils.shadow.ShadowNotificationManager; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.List; @Config(shadows = ShadowNotificationManager.class) -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeSliceBuilderTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java index 9e6eb82e8bc..db551a2f8ff 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java @@ -21,7 +21,7 @@ import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -35,7 +35,6 @@ import android.database.Cursor; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -45,13 +44,14 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeStarredContactsPreferenceControllerTest { private ZenModeStarredContactsPreferenceController mCallsController; @@ -116,7 +116,6 @@ public class ZenModeStarredContactsPreferenceControllerTest { when(mBackend.getPriorityCallSenders()) .thenReturn(NotificationManager.Policy.PRIORITY_SENDERS_ANY); - assertThat(mCallsController.isAvailable()).isFalse(); } @@ -186,7 +185,7 @@ public class ZenModeStarredContactsPreferenceControllerTest { int count = 0; @Override - public Boolean answer(InvocationOnMock invocation) throws Throwable { + public Boolean answer(InvocationOnMock invocation) { if (count < size) { count++; return true; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSystemPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSystemPreferenceControllerTest.java index 57bc3036175..0b57b8186ef 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeSystemPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeSystemPreferenceControllerTest.java @@ -33,7 +33,6 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -41,11 +40,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeSystemPreferenceControllerTest { private ZenModeSystemPreferenceController mController; @@ -75,8 +75,7 @@ public class ZenModeSystemPreferenceControllerTest { mController = new ZenModeSystemPreferenceController(mContext, mock(Lifecycle.class)); ReflectionHelpers.setField(mController, "mBackend", mBackend); - when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn( - mockPref); + when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(mockPref); mController.displayPreference(mPreferenceScreen); } diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectPreferenceControllerTest.java index 65c39f87287..0e523dfd29b 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectPreferenceControllerTest.java @@ -38,7 +38,6 @@ import android.content.res.Resources; import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.DisabledCheckBoxPreference; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -47,11 +46,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeVisEffectPreferenceControllerTest { private ZenModeVisEffectPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceControllerTest.java index 5ae37e37aeb..9d89a9e92d7 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceControllerTest.java @@ -41,7 +41,6 @@ import android.content.Context; import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -49,11 +48,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeVisEffectsAllPreferenceControllerTest { private ZenModeVisEffectsAllPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java index a318a399262..6afd339bd42 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java @@ -39,7 +39,6 @@ import android.content.Context; import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -47,11 +46,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeVisEffectsCustomPreferenceControllerTest { private ZenModeVisEffectsCustomPreferenceController mController; @@ -60,7 +60,6 @@ public class ZenModeVisEffectsCustomPreferenceControllerTest { @Mock private ZenCustomRadioButtonPreference mockPref; private Context mContext; - private FakeFeatureFactory mFeatureFactory; @Mock private PreferenceScreen mScreen; @Mock @@ -73,7 +72,7 @@ public class ZenModeVisEffectsCustomPreferenceControllerTest { MockitoAnnotations.initMocks(this); ShadowApplication shadowApplication = ShadowApplication.getInstance(); mContext = RuntimeEnvironment.application; - mFeatureFactory = FakeFeatureFactory.setupForTest(); + FakeFeatureFactory.setupForTest(); shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager); when(mNotificationManager.getNotificationPolicy()).thenReturn( mock(NotificationManager.Policy.class)); @@ -97,7 +96,6 @@ public class ZenModeVisEffectsCustomPreferenceControllerTest { assertThat(mController.isAvailable()).isTrue(); } - @Test public void updateState_notChecked_noVisEffects() { mBackend.mPolicy = new NotificationManager.Policy(0, 0, 0, 0); diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceControllerTest.java index fe45d1c5db2..e856cca11ce 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceControllerTest.java @@ -41,7 +41,6 @@ import android.content.Context; import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -49,11 +48,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeVisEffectsNonePreferenceControllerTest { private ZenModeVisEffectsNonePreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/notification/ZenOnboardingActivityTest.java b/tests/robotests/src/com/android/settings/notification/ZenOnboardingActivityTest.java index 833d8660960..6cd9430e78e 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenOnboardingActivityTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenOnboardingActivityTest.java @@ -41,7 +41,6 @@ import android.provider.Settings; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -50,18 +49,19 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenOnboardingActivityTest { @Mock - MetricsLogger mMetricsLogger; + private MetricsLogger mMetricsLogger; @Mock - NotificationManager mNm; + private NotificationManager mNm; - ZenOnboardingActivity mActivity; + private ZenOnboardingActivity mActivity; private Context mContext; private FakeFeatureFactory mFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/panel/InternetConnectivityPanelTest.java b/tests/robotests/src/com/android/settings/panel/InternetConnectivityPanelTest.java index aae85ababd5..3a4cf7b0ba6 100644 --- a/tests/robotests/src/com/android/settings/panel/InternetConnectivityPanelTest.java +++ b/tests/robotests/src/com/android/settings/panel/InternetConnectivityPanelTest.java @@ -22,16 +22,16 @@ import static com.google.common.truth.Truth.assertThat; import android.net.Uri; import com.android.settings.slices.CustomSliceRegistry; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class InternetConnectivityPanelTest { diff --git a/tests/robotests/src/com/android/settings/panel/PanelFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/panel/PanelFeatureProviderImplTest.java index 050fd0cd899..754c9379060 100644 --- a/tests/robotests/src/com/android/settings/panel/PanelFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/panel/PanelFeatureProviderImplTest.java @@ -21,15 +21,14 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PanelFeatureProviderImplTest { private Context mContext; @@ -48,5 +47,4 @@ public class PanelFeatureProviderImplTest { assertThat(panel).isInstanceOf(InternetConnectivityPanel.class); } - } diff --git a/tests/robotests/src/com/android/settings/panel/PanelFragmentTest.java b/tests/robotests/src/com/android/settings/panel/PanelFragmentTest.java index cf344d22834..73318f2ac11 100644 --- a/tests/robotests/src/com/android/settings/panel/PanelFragmentTest.java +++ b/tests/robotests/src/com/android/settings/panel/PanelFragmentTest.java @@ -30,17 +30,17 @@ import android.widget.LinearLayout; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.android.controller.ActivityController; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PanelFragmentTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/panel/PanelSlicesAdapterTest.java b/tests/robotests/src/com/android/settings/panel/PanelSlicesAdapterTest.java index 02a7d0aa013..7648d236720 100644 --- a/tests/robotests/src/com/android/settings/panel/PanelSlicesAdapterTest.java +++ b/tests/robotests/src/com/android/settings/panel/PanelSlicesAdapterTest.java @@ -28,7 +28,6 @@ import android.widget.FrameLayout; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.runner.RunWith; @@ -36,10 +35,11 @@ import org.robolectric.Robolectric; import org.junit.Test; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.android.controller.ActivityController; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PanelSlicesAdapterTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/panel/VolumePanelTest.java b/tests/robotests/src/com/android/settings/panel/VolumePanelTest.java index 21019d355b7..11964cd1ab6 100644 --- a/tests/robotests/src/com/android/settings/panel/VolumePanelTest.java +++ b/tests/robotests/src/com/android/settings/panel/VolumePanelTest.java @@ -21,16 +21,16 @@ import static com.google.common.truth.Truth.assertThat; import android.net.Uri; import com.android.settings.slices.CustomSliceRegistry; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class VolumePanelTest { private VolumePanel mPanel; diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java index ad530ba5ccb..cbc5765ccc5 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java @@ -18,9 +18,9 @@ package com.android.settings.password; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.robolectric.RuntimeEnvironment.application; @@ -28,7 +28,6 @@ import android.app.admin.DevicePolicyManager; import android.content.ComponentName; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; import org.junit.After; @@ -37,12 +36,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import java.util.Arrays; import java.util.regex.Pattern; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.class) public class ChooseLockGenericControllerTest { diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java index b2cd0439c93..e3242148ee4 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java @@ -32,9 +32,6 @@ import com.android.internal.widget.LockPatternUtils; import com.android.settings.biometrics.BiometricEnrollBase; import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment; import com.android.settings.search.SearchFeatureProvider; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; -import com.android.settings.testutils.shadow.SettingsShadowResources.SettingsShadowTheme; import com.android.settings.testutils.shadow.ShadowLockPatternUtils; import com.android.settings.testutils.shadow.ShadowStorageManager; import com.android.settings.testutils.shadow.ShadowUserManager; @@ -45,13 +42,12 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config( shadows = { - SettingsShadowResources.class, - SettingsShadowTheme.class, ShadowLockPatternUtils.class, ShadowStorageManager.class, ShadowUserManager.class, @@ -64,17 +60,13 @@ public class ChooseLockGenericTest { @Before public void setUp() { - Global.putInt( - application.getContentResolver(), - Global.DEVICE_PROVISIONED, 1); + Global.putInt(application.getContentResolver(), Global.DEVICE_PROVISIONED, 1); mFragment = new ChooseLockGenericFragment(); } @After public void tearDown() { - Global.putInt( - application.getContentResolver(), - Global.DEVICE_PROVISIONED, 1); + Global.putInt(application.getContentResolver(), Global.DEVICE_PROVISIONED, 1); ShadowStorageManager.reset(); } diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java index 6e3e4294cd3..367cb4c36b2 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java @@ -28,9 +28,7 @@ import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.password.ChooseLockPassword.ChooseLockPasswordFragment; import com.android.settings.password.ChooseLockPassword.IntentBuilder; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowUtils; import com.google.android.setupdesign.GlifLayout; @@ -40,21 +38,17 @@ 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.annotation.Config; import org.robolectric.shadows.ShadowDrawable; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = { - SettingsShadowResources.class, - SettingsShadowResourcesImpl.class, - SettingsShadowResources.SettingsShadowTheme.class, - ShadowUtils.class -}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = {SettingsShadowResources.class, ShadowUtils.class}) public class ChooseLockPasswordTest { @Before - public void setUp() throws Exception { + public void setUp() { SettingsShadowResources.overrideResource( com.android.internal.R.string.config_headlineFontFamily, ""); } diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java index 352e2c43807..a6a6355799b 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java @@ -27,9 +27,6 @@ import android.view.View; import com.android.settings.R; import com.android.settings.password.ChooseLockPattern.ChooseLockPatternFragment; import com.android.settings.password.ChooseLockPattern.IntentBuilder; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowUtils; import com.android.settingslib.testutils.DrawableTestHelper; @@ -38,15 +35,11 @@ import com.google.android.setupdesign.GlifLayout; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = { - SettingsShadowResources.class, - SettingsShadowResourcesImpl.class, - SettingsShadowResources.SettingsShadowTheme.class, - ShadowUtils.class -}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowUtils.class) public class ChooseLockPatternTest { @Test diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java index 12b0ebfd3bd..64e19155294 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java @@ -5,7 +5,7 @@ import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -16,7 +16,6 @@ import android.content.Intent; import android.os.UserHandle; import com.android.internal.widget.LockPatternUtils; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settings.testutils.shadow.ShadowUtils; @@ -26,12 +25,13 @@ import com.google.android.setupdesign.util.ThemeHelper; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowActivity; import org.robolectric.shadows.ShadowActivity.IntentForResult; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowUserManager.class, ShadowUtils.class}) public class ChooseLockSettingsHelperTest { @@ -61,14 +61,12 @@ public class ChooseLockSettingsHelperTest { ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false)); assertEquals(10000L, startedIntent.getLongExtra( ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0L)); - assertEquals( - true, - (startedIntent.getFlags() & Intent.FLAG_ACTIVITY_FORWARD_RESULT) != 0); + assertTrue((startedIntent.getFlags() & Intent.FLAG_ACTIVITY_FORWARD_RESULT) != 0); assertFalse(startedIntent.getBooleanExtra( ConfirmDeviceCredentialBaseFragment.DARK_THEME, false)); assertFalse(startedIntent.getBooleanExtra( ConfirmDeviceCredentialBaseFragment.SHOW_CANCEL_BUTTON, false)); - assertEquals(true, startedIntent.getBooleanExtra( + assertTrue(startedIntent.getBooleanExtra( ConfirmDeviceCredentialBaseFragment.SHOW_WHEN_LOCKED, false)); } @@ -97,14 +95,12 @@ public class ChooseLockSettingsHelperTest { ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false)); assertEquals(10000L, startedIntent.getLongExtra( ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0L)); - assertEquals( - false, - (startedIntent.getFlags() & Intent.FLAG_ACTIVITY_FORWARD_RESULT) != 0); + assertFalse((startedIntent.getFlags() & Intent.FLAG_ACTIVITY_FORWARD_RESULT) != 0); assertFalse(startedIntent.getBooleanExtra( ConfirmDeviceCredentialBaseFragment.DARK_THEME, false)); assertFalse(startedIntent.getBooleanExtra( ConfirmDeviceCredentialBaseFragment.SHOW_CANCEL_BUTTON, false)); - assertEquals(false, startedIntent.getBooleanExtra( + assertFalse(startedIntent.getBooleanExtra( ConfirmDeviceCredentialBaseFragment.SHOW_WHEN_LOCKED, false)); } diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java index 3b38a561f77..195c82d0089 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java @@ -18,7 +18,7 @@ package com.android.settings.password; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; @@ -32,19 +32,18 @@ import androidx.fragment.app.FragmentActivity; import com.android.settings.R; import com.android.settings.password.ChooseLockTypeDialogFragment.OnLockTypeSelectedListener; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.androidx.fragment.FragmentController; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {SettingsShadowResourcesImpl.class, ShadowAlertDialogCompat.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowAlertDialogCompat.class) public class ChooseLockTypeDialogFragmentTest { private Context mContext; @@ -61,8 +60,7 @@ public class ChooseLockTypeDialogFragmentTest { @Test public void testThatDialog_IsShown() { AlertDialog latestDialog = startLockFragment(); - ShadowAlertDialogCompat shadowAlertDialog = ShadowAlertDialogCompat.shadowOf( - latestDialog); + ShadowAlertDialogCompat shadowAlertDialog = ShadowAlertDialogCompat.shadowOf(latestDialog); assertThat(latestDialog).isNotNull(); assertThat(latestDialog.isShowing()).isTrue(); diff --git a/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java b/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java index aa23005b80a..94bb4e8bb7e 100644 --- a/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java +++ b/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java @@ -22,16 +22,13 @@ import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.FragmentManager; import com.android.settings.password.ConfirmDeviceCredentialBaseFragment.LastTryDialog; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; -import org.robolectric.annotation.Config; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = SettingsShadowResourcesImpl.class) +@RunWith(RobolectricTestRunner.class) public class ConfirmCredentialTest { @Test public void testLastTryDialogShownExactlyOnce() { diff --git a/tests/robotests/src/com/android/settings/password/ScreenLockTypeTest.java b/tests/robotests/src/com/android/settings/password/ScreenLockTypeTest.java index 5fa3edb81b1..05c3f644287 100644 --- a/tests/robotests/src/com/android/settings/password/ScreenLockTypeTest.java +++ b/tests/robotests/src/com/android/settings/password/ScreenLockTypeTest.java @@ -20,12 +20,11 @@ import static com.google.common.truth.Truth.assertThat; import android.app.admin.DevicePolicyManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ScreenLockTypeTest { @Test diff --git a/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java b/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java index fd1c5621195..99738e75c33 100644 --- a/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java +++ b/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java @@ -23,18 +23,17 @@ import android.content.Intent; import android.os.Bundle; import android.provider.Settings; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - 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.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.shadows.ShadowActivity; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SetNewPasswordActivityTest { private int mProvisioned; diff --git a/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java b/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java index 67f7b0adc5e..b579347ebde 100644 --- a/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java +++ b/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java @@ -32,8 +32,8 @@ import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -45,16 +45,15 @@ import android.hardware.face.FaceManager; import android.hardware.fingerprint.FingerprintManager; import android.os.Bundle; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public final class SetNewPasswordControllerTest { private static final int CURRENT_USER_ID = 101; diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java index e586958c2d4..0a08319e085 100644 --- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java +++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java @@ -31,15 +31,14 @@ import com.android.settings.R; import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment; import com.android.settings.password.ChooseLockPassword.IntentBuilder; import com.android.settings.password.SetupChooseLockPassword.SetupChooseLockPasswordFragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowUtils; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.Shadows; import org.robolectric.android.controller.ActivityController; import org.robolectric.annotation.Config; @@ -51,17 +50,12 @@ import org.robolectric.shadows.ShadowDialog; import java.util.Collections; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = { - SettingsShadowResources.class, - SettingsShadowResourcesImpl.class, - SettingsShadowResources.SettingsShadowTheme.class, - ShadowUtils.class -}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = {SettingsShadowResources.class, ShadowUtils.class}) public class SetupChooseLockPasswordTest { @Before - public void setUp() throws Exception { + public void setUp() { SettingsShadowResources.overrideResource( com.android.internal.R.string.config_headlineFontFamily, ""); } @@ -148,7 +142,7 @@ public class SetupChooseLockPasswordTest { @Implements(ChooseLockGenericController.class) public static class ShadowChooseLockGenericController { @Implementation - public List getVisibleScreenLockTypes(int quality, + protected List getVisibleScreenLockTypes(int quality, boolean includeDisabled) { return Collections.emptyList(); } diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java index 0dcd31baacf..c11d7ebadb8 100644 --- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java +++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java @@ -37,15 +37,13 @@ import com.android.settings.R; import com.android.settings.SetupRedactionInterstitial; import com.android.settings.password.ChooseLockPattern.ChooseLockPatternFragment; import com.android.settings.password.ChooseLockPattern.IntentBuilder; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; import com.android.settings.testutils.shadow.ShadowUtils; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.Shadows; import org.robolectric.android.controller.ActivityController; import org.robolectric.annotation.Config; @@ -55,13 +53,8 @@ import org.robolectric.util.ReflectionHelpers.ClassParameter; import java.util.Arrays; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = { - SettingsShadowResourcesImpl.class, - SettingsShadowResources.SettingsShadowTheme.class, - ShadowUtils.class, - ShadowAlertDialogCompat.class -}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = {ShadowUtils.class, ShadowAlertDialogCompat.class}) public class SetupChooseLockPatternTest { private SetupChooseLockPattern mActivity; diff --git a/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java b/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java index 0e4e5dca57d..a769048d155 100644 --- a/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java +++ b/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java @@ -22,9 +22,6 @@ import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.FragmentActivity; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; import com.android.settings.testutils.shadow.ShadowUtils; @@ -32,15 +29,11 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = { - SettingsShadowResources.SettingsShadowTheme.class, - ShadowUtils.class, - ShadowAlertDialogCompat.class, - SettingsShadowResourcesImpl.class -}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = {ShadowUtils.class, ShadowAlertDialogCompat.class}) public class SetupSkipDialogTest { private FragmentActivity mActivity; diff --git a/tests/robotests/src/com/android/settings/print/PrintJobMessagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/print/PrintJobMessagePreferenceControllerTest.java index 50dd38b183b..96036d52755 100644 --- a/tests/robotests/src/com/android/settings/print/PrintJobMessagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/print/PrintJobMessagePreferenceControllerTest.java @@ -21,8 +21,8 @@ import static androidx.lifecycle.Lifecycle.Event.ON_STOP; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyObject; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyObject; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -36,7 +36,6 @@ import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -44,9 +43,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PrintJobMessagePreferenceControllerTest { private static final String PREF_KEY = "print_job_message_preference"; diff --git a/tests/robotests/src/com/android/settings/print/PrintJobPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/print/PrintJobPreferenceControllerTest.java index fc92eb3cc8f..09c5bf368af 100644 --- a/tests/robotests/src/com/android/settings/print/PrintJobPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/print/PrintJobPreferenceControllerTest.java @@ -21,8 +21,8 @@ import static androidx.lifecycle.Lifecycle.Event.ON_STOP; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyObject; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyObject; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -37,7 +37,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -45,9 +44,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PrintJobPreferenceControllerTest { private static final String PREF_KEY = "print_job_preference"; @@ -67,7 +67,6 @@ public class PrintJobPreferenceControllerTest { private Preference mPreference; private String mTestLabel; - @Before public void setUp() { MockitoAnnotations.initMocks(this); diff --git a/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java index 51988ff975e..69db28fe24d 100644 --- a/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java @@ -36,7 +36,6 @@ import android.printservice.PrintServiceInfo; import androidx.lifecycle.LifecycleOwner; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedPreference; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -46,13 +45,14 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PrintSettingsPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java b/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java index 0b3ea9cba96..5e5e5731758 100644 --- a/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java +++ b/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java @@ -27,13 +27,13 @@ import android.provider.SearchIndexableResource; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settings.core.PreferenceControllerMixin; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.AbstractPreferenceController; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @@ -41,7 +41,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BaseSearchIndexProviderTest { private static final String TEST_PREF_KEY = "test_pref_key"; diff --git a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java index 37fd88801d2..7f709d6fb9b 100644 --- a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java @@ -29,18 +29,18 @@ import android.widget.Toolbar; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUtils; 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.annotation.Config; import org.robolectric.shadows.ShadowPackageManager; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SearchFeatureProviderImplTest { private SearchFeatureProviderImpl mProvider; @@ -78,8 +78,7 @@ public class SearchFeatureProviderImplTest { final Intent launchIntent = Shadows.shadowOf(mActivity).getNextStartedActivity(); - assertThat(launchIntent.getAction()) - .isEqualTo(Settings.ACTION_APP_SEARCH_SETTINGS); + assertThat(launchIntent.getAction()).isEqualTo(Settings.ACTION_APP_SEARCH_SETTINGS); } @Test diff --git a/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java b/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java index 7cea11f61a5..ff2acdc307b 100644 --- a/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java +++ b/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java @@ -20,7 +20,7 @@ import static android.provider.SearchIndexablesContract.COLUMN_INDEX_NON_INDEXAB import static com.google.common.truth.Truth.assertThat; -import static junit.framework.Assert.fail; +import static org.junit.Assert.fail; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -31,16 +31,16 @@ import android.text.TextUtils; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.FakeIndexProvider; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.wifi.WifiSettings; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SearchIndexableResourcesTest { private SearchFeatureProviderImpl mSearchProvider; diff --git a/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java b/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java index e3ef15e9174..2a8407bd16a 100644 --- a/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java +++ b/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java @@ -13,19 +13,19 @@ import android.provider.SearchIndexablesContract; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SettingsSearchIndexablesProviderTest { private static final String BASE_AUTHORITY = "com.android.settings"; diff --git a/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java b/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java index b4076b5226b..af1a82de905 100644 --- a/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java +++ b/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java @@ -29,7 +29,6 @@ import android.view.Menu; import android.view.MenuItem; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUtils; import com.android.settingslib.core.lifecycle.ObservableFragment; import com.android.settingslib.core.lifecycle.ObservablePreferenceFragment; @@ -39,10 +38,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowUtils.class) public class SearchMenuControllerTest { diff --git a/tests/robotests/src/com/android/settings/security/ChangeScreenLockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/ChangeScreenLockPreferenceControllerTest.java index fda5942b212..9913e554b4d 100644 --- a/tests/robotests/src/com/android/settings/security/ChangeScreenLockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/ChangeScreenLockPreferenceControllerTest.java @@ -36,7 +36,6 @@ import androidx.preference.PreferenceViewHolder; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUtils; import com.android.settings.widget.GearPreference; @@ -45,10 +44,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowUtils.class) public class ChangeScreenLockPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java b/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java index fe7c5594c42..49a4e92ae43 100644 --- a/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java +++ b/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java @@ -22,14 +22,12 @@ import static org.mockito.Mockito.verify; import android.content.DialogInterface; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.shadows.androidx.fragment.FragmentController; - -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ConfigureKeyGuardDialogTest { @Test diff --git a/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java index ebe420512be..3eb21cf1caa 100644 --- a/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java @@ -23,16 +23,16 @@ import android.content.Context; import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowKeyStore; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowKeyStore.class) public class CredentialStoragePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java b/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java index 6a5848215f9..6f326ce6627 100644 --- a/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java +++ b/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java @@ -29,20 +29,20 @@ import android.provider.SearchIndexableResource; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EncryptionAndCredentialTest { @Mock diff --git a/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java index c7fdeae5bc1..9f0e115f0f3 100644 --- a/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java @@ -28,18 +28,17 @@ import android.content.Context; import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowLockPatternUtils; import com.android.settings.testutils.shadow.ShadowUserManager; -import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowLockPatternUtils.class, ShadowUserManager.class}) public class EncryptionStatusPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java index f8d17a8f054..be5593ff97f 100644 --- a/tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java @@ -29,17 +29,17 @@ import androidx.preference.PreferenceScreen; import com.android.internal.widget.LockPatternUtils; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LockUnificationPreferenceControllerTest { private static final int FAKE_PROFILE_USER_ID = 1234; diff --git a/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java index f0bda6e5503..5b6b3464b4c 100644 --- a/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java @@ -17,7 +17,7 @@ package com.android.settings.security; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -27,17 +27,17 @@ import android.provider.Settings; import androidx.preference.SwitchPreference; import com.android.internal.widget.LockPatternUtils; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LockdownButtonPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java index 7e8c0d52202..2db36b7320e 100644 --- a/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java @@ -33,7 +33,6 @@ import com.android.settings.display.AmbientDisplayNotificationsPreferenceControl import com.android.settings.gestures.DoubleTapScreenPreferenceController; import com.android.settings.gestures.PickupGesturePreferenceController; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.XmlTestUtils; import com.android.settings.testutils.shadow.ShadowLockPatternUtils; import com.android.settings.testutils.shadow.ShadowUtils; @@ -44,15 +43,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = { - ShadowUtils.class, ShadowLockPatternUtils.class -}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = {ShadowUtils.class, ShadowLockPatternUtils.class}) public class LockscreenDashboardFragmentTest { @Mock diff --git a/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java index 7ec86113ae3..c4729227b56 100644 --- a/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java @@ -17,9 +17,9 @@ package com.android.settings.security; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -36,7 +36,6 @@ import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; import com.android.internal.widget.LockPatternUtils; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.users.OwnerInfoSettings; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import com.android.settingslib.RestrictedPreference; @@ -46,10 +45,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class OwnerInfoPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java index 8c7eaa54181..79ece904dbb 100644 --- a/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java @@ -23,18 +23,17 @@ import android.os.UserManager; import androidx.lifecycle.LifecycleOwner; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settingslib.core.lifecycle.Lifecycle; -import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowUserManager.class) public class RestrictedEncryptionPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java index 1851ed52afb..9b041d4cc48 100644 --- a/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java @@ -25,17 +25,17 @@ import android.provider.Settings; import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ScreenPinningPreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java index 829210d6bcf..8dc0db59361 100644 --- a/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java @@ -22,15 +22,15 @@ import android.content.Context; import com.android.internal.widget.LockPatternUtils; import com.android.settings.security.trustagent.TrustAgentManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SecurityFeatureProviderImplTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java index 6b968e6f195..5e3c27aa35d 100644 --- a/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java @@ -31,17 +31,17 @@ import androidx.preference.PreferenceScreen; import com.android.internal.widget.LockPatternUtils; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ShowPasswordPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java index f20587db2ea..07d8ac55cdf 100644 --- a/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java @@ -36,20 +36,20 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SimLockPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/security/TopLevelSecurityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/TopLevelSecurityPreferenceControllerTest.java index 17ba6d5f3f2..4e18a3eb12c 100644 --- a/tests/robotests/src/com/android/settings/security/TopLevelSecurityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/TopLevelSecurityPreferenceControllerTest.java @@ -25,7 +25,6 @@ import android.hardware.face.FaceManager; import android.hardware.fingerprint.FingerprintManager; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -33,8 +32,9 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TopLevelSecurityPreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java index 08fdd7d5e51..e474b2bf6aa 100644 --- a/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java @@ -38,7 +38,6 @@ import androidx.lifecycle.LifecycleOwner; import com.android.internal.widget.LockPatternUtils; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -46,10 +45,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class VisiblePatternProfilePreferenceControllerTest { private static final int FAKE_PROFILE_USER_ID = 1234; diff --git a/tests/robotests/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceControllerTest.java index 8f05f74e96d..d2adaad3aa8 100644 --- a/tests/robotests/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceControllerTest.java @@ -35,7 +35,6 @@ import com.android.internal.widget.LockPatternUtils; import com.android.settings.display.TimeoutListPreference; import com.android.settings.security.trustagent.TrustAgentManager; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowDevicePolicyManager; import org.junit.Before; @@ -43,12 +42,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.Collections; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowDevicePolicyManager.class) public class LockAfterTimeoutPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java index d89e6b0c8a0..45d029589ac 100644 --- a/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java @@ -39,7 +39,6 @@ import androidx.preference.PreferenceScreen; import com.android.internal.widget.LockPatternUtils; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -47,10 +46,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LockScreenPreferenceControllerTest { private static final int FAKE_PROFILE_USER_ID = 1234; @@ -69,7 +69,6 @@ public class LockScreenPreferenceControllerTest { private LockScreenPreferenceController mController; private Preference mPreference; - @Before public void setUp() { MockitoAnnotations.initMocks(this); diff --git a/tests/robotests/src/com/android/settings/security/screenlock/PatternVisiblePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/PatternVisiblePreferenceControllerTest.java index 9d7a5071bf4..df6818b1da1 100644 --- a/tests/robotests/src/com/android/settings/security/screenlock/PatternVisiblePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/screenlock/PatternVisiblePreferenceControllerTest.java @@ -27,16 +27,16 @@ import android.content.Context; import androidx.preference.SwitchPreference; import com.android.internal.widget.LockPatternUtils; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PatternVisiblePreferenceControllerTest { private static final int TEST_USER_ID = 0; diff --git a/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java index 028145584d1..7c44561a1f6 100644 --- a/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java @@ -30,16 +30,16 @@ import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.security.trustagent.TrustAgentManager; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PowerButtonInstantLockPreferenceControllerTest { private static final int TEST_USER_ID = 0; diff --git a/tests/robotests/src/com/android/settings/security/screenlock/ScreenLockSettingsTest.java b/tests/robotests/src/com/android/settings/security/screenlock/ScreenLockSettingsTest.java index 6d378ef3d89..2c93fc204fd 100644 --- a/tests/robotests/src/com/android/settings/security/screenlock/ScreenLockSettingsTest.java +++ b/tests/robotests/src/com/android/settings/security/screenlock/ScreenLockSettingsTest.java @@ -24,19 +24,19 @@ import static org.mockito.Mockito.verify; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.security.OwnerInfoPreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.AbstractPreferenceController; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; import java.util.Map; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ScreenLockSettingsTest { private ScreenLockSettings mSettings; 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 07269bf6448..9be374c066b 100644 --- a/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java @@ -29,20 +29,20 @@ import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.security.trustagent.TrustAgentManager.TrustAgentComponentInfo; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.Collections; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ManageTrustAgentsPreferenceControllerTest { @Mock 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 509fae4f328..d9202d437f5 100644 --- a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java @@ -43,7 +43,6 @@ import com.android.internal.widget.LockPatternUtils; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.security.SecuritySettings; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -52,12 +51,13 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TrustAgentListPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentManagerTest.java b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentManagerTest.java index 668734e14d2..7796dc3d4fb 100644 --- a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentManagerTest.java +++ b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentManagerTest.java @@ -24,15 +24,14 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.content.pm.ServiceInfo; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TrustAgentManagerTest { private static final String CANNED_PACKAGE_NAME = "com.test.package"; diff --git a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentsPreferenceControllerTest.java index ede6a8f12fc..7eb64b95b48 100644 --- a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentsPreferenceControllerTest.java @@ -32,7 +32,6 @@ import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowDevicePolicyManager; import com.android.settings.testutils.shadow.ShadowLockPatternUtils; import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal; @@ -42,6 +41,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.annotation.Config; @@ -52,7 +52,7 @@ import org.robolectric.shadows.ShadowApplicationPackageManager; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = { ShadowLockPatternUtils.class, ShadowRestrictedLockUtilsInternal.class, @@ -214,17 +214,14 @@ public class TrustAgentsPreferenceControllerTest { @Implementation public boolean shouldProvideTrust(ResolveInfo resolveInfo, PackageManager pm) { - if (sPermissionGrantedList.contains(resolveInfo)) { - return true; - } - return false; + return sPermissionGrantedList.contains(resolveInfo); } - public static void grantPermissionToResolveInfo(ResolveInfo rInfo) { + private static void grantPermissionToResolveInfo(ResolveInfo rInfo) { sPermissionGrantedList.add(rInfo); } - public static void clearPermissionGrantedList() { + private static void clearPermissionGrantedList() { sPermissionGrantedList.clear(); } } diff --git a/tests/robotests/src/com/android/settings/shortcut/CreateShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/shortcut/CreateShortcutPreferenceControllerTest.java index adcd184eec2..e132aac2f45 100644 --- a/tests/robotests/src/com/android/settings/shortcut/CreateShortcutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/shortcut/CreateShortcutPreferenceControllerTest.java @@ -38,7 +38,6 @@ import android.content.pm.ShortcutInfo; import android.content.pm.ShortcutManager; import com.android.settings.Settings; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowConnectivityManager; import org.junit.Before; @@ -47,6 +46,7 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadow.api.Shadow; @@ -58,7 +58,7 @@ import java.util.List; /** * Tests for {@link CreateShortcutPreferenceController} */ -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowConnectivityManager.class) public class CreateShortcutPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/shortcut/ShortcutsUpdateTaskTest.java b/tests/robotests/src/com/android/settings/shortcut/ShortcutsUpdateTaskTest.java index 4b40e477384..0bc041424f6 100644 --- a/tests/robotests/src/com/android/settings/shortcut/ShortcutsUpdateTaskTest.java +++ b/tests/robotests/src/com/android/settings/shortcut/ShortcutsUpdateTaskTest.java @@ -38,7 +38,6 @@ import android.content.pm.ShortcutInfo; import android.content.pm.ShortcutManager; import com.android.settings.Settings; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -47,6 +46,7 @@ import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowPackageManager; @@ -54,7 +54,7 @@ import org.robolectric.shadows.ShadowPackageManager; import java.util.Arrays; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ShortcutsUpdateTaskTest { private Context mContext; @@ -113,7 +113,6 @@ public class ShortcutsUpdateTaskTest { return makeShortcut(SHORTCUT_ID_PREFIX + cn.flattenToShortString()); } - private ShortcutInfo makeShortcut(String id) { return new ShortcutInfo.Builder(mContext, id).build(); } diff --git a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java index 8e3c1c8d4d5..b1292677898 100644 --- a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java +++ b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java @@ -50,7 +50,6 @@ import androidx.slice.widget.SliceLiveData; import com.android.settings.R; import com.android.settings.testutils.DatabaseTestUtils; import com.android.settings.testutils.FakeToggleController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import com.android.settings.testutils.shadow.ShadowLockPatternUtils; import com.android.settings.testutils.shadow.ShadowThreadUtils; @@ -65,6 +64,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; @@ -85,7 +85,7 @@ import java.util.Set; /** * TODO Investigate using ShadowContentResolver.registerProviderInternal(String, ContentProvider) */ -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowUserManager.class, ShadowThreadUtils.class, ShadowUtils.class, SlicesDatabaseAccessorTest.ShadowApplicationPackageManager.class, ShadowBluetoothAdapter.class, ShadowLockPatternUtils.class, @@ -512,7 +512,7 @@ public class SettingsSliceProviderTest { } @Implementation - public void close() { + protected void close() { mWifiTracker.onDestroy(); } @@ -545,11 +545,12 @@ public class SettingsSliceProviderTest { } @Test + @Config(qualifiers = "mcc998") public void grantWhitelistedPackagePermissions_noWhitelist_shouldNotGrant() { final List uris = new ArrayList<>(); uris.add(Uri.parse("content://settings/slice")); - mProvider.grantWhitelistedPackagePermissions(mContext, uris); + SettingsSliceProvider.grantWhitelistedPackagePermissions(mContext, uris); verify(mManager, never()).grantSlicePermission(anyString(), any(Uri.class)); } @@ -560,7 +561,7 @@ public class SettingsSliceProviderTest { final List uris = new ArrayList<>(); uris.add(Uri.parse("content://settings/slice")); - mProvider.grantWhitelistedPackagePermissions(mContext, uris); + SettingsSliceProvider.grantWhitelistedPackagePermissions(mContext, uris); verify(mManager) .grantSlicePermission("com.android.settings.slice_whitelist_package", uris.get(0)); @@ -616,11 +617,11 @@ public class SettingsSliceProviderTest { } @Implementation - public static void setThreadPolicy(final StrictMode.ThreadPolicy policy) { + protected static void setThreadPolicy(final StrictMode.ThreadPolicy policy) { sSetThreadPolicyCount++; } - public static boolean isThreadPolicyOverridden() { + private static boolean isThreadPolicyOverridden() { return sSetThreadPolicyCount != 0; } } diff --git a/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java index bd59179b2b6..74f4ac2536a 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java +++ b/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java @@ -48,15 +48,15 @@ import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.FakeIndexProvider; import com.android.settings.testutils.FakeSliderController; import com.android.settings.testutils.FakeToggleController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SliceBroadcastReceiverTest { private final String fakeTitle = "title"; diff --git a/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java index 821d3830992..2d893a67836 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java +++ b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java @@ -46,15 +46,15 @@ import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.FakeSliderController; import com.android.settings.testutils.FakeToggleController; import com.android.settings.testutils.FakeUnavailablePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SliceTester; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SliceBuilderUtilsTest { private final String KEY = "KEY"; diff --git a/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java b/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java index 83c35bac58c..b935e762c14 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java +++ b/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java @@ -37,19 +37,19 @@ import com.android.settings.search.SearchFeatureProvider; import com.android.settings.search.SearchFeatureProviderImpl; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.FakeIndexProvider; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SliceDataConverterTest { private static final String FAKE_KEY = "key"; diff --git a/tests/robotests/src/com/android/settings/slices/SliceDataTest.java b/tests/robotests/src/com/android/settings/slices/SliceDataTest.java index 9adee0765a3..579af1fbee0 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceDataTest.java +++ b/tests/robotests/src/com/android/settings/slices/SliceDataTest.java @@ -20,12 +20,11 @@ import static com.google.common.truth.Truth.assertThat; import android.net.Uri; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SliceDataTest { private final String KEY = "KEY"; diff --git a/tests/robotests/src/com/android/settings/slices/SliceRelayReceiverTest.java b/tests/robotests/src/com/android/settings/slices/SliceRelayReceiverTest.java index 5a47e1363c4..4efaa19f2a1 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceRelayReceiverTest.java +++ b/tests/robotests/src/com/android/settings/slices/SliceRelayReceiverTest.java @@ -29,15 +29,15 @@ import android.content.Intent; import android.net.Uri; import android.provider.SettingsSlicesContract; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.SliceBroadcastRelay; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SliceRelayReceiverTest { private Context mContext; @@ -68,6 +68,5 @@ public class SliceRelayReceiverTest { mSliceRelayReceiver.onReceive(mContext, intent); verify(resolver).notifyChange(eq(uri), any()); - } } diff --git a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java index f628c87b39d..f4b68a57781 100644 --- a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java +++ b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java @@ -34,7 +34,6 @@ import com.android.settings.search.SearchFeatureProviderImpl; import com.android.settings.testutils.DatabaseTestUtils; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.FakeIndexProvider; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import com.android.settings.testutils.shadow.ShadowLockPatternUtils; import com.android.settings.testutils.shadow.ShadowUserManager; @@ -44,6 +43,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; @@ -55,8 +55,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; - -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowUserManager.class, ShadowUtils.class, SlicesDatabaseAccessorTest.ShadowApplicationPackageManager.class, ShadowBluetoothAdapter.class, ShadowLockPatternUtils.class}) diff --git a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java index a00d343f8fb..2bc344312eb 100644 --- a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java +++ b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java @@ -28,17 +28,17 @@ import android.database.sqlite.SQLiteDatabase; import com.android.settings.slices.SlicesDatabaseHelper.IndexColumns; import com.android.settings.testutils.DatabaseTestUtils; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.Locale; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SlicesDatabaseHelperTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java b/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java index 4602711a121..827c3f66b3a 100644 --- a/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java +++ b/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java @@ -29,18 +29,18 @@ import android.net.Uri; import com.android.settings.slices.SlicesDatabaseHelper.IndexColumns; import com.android.settings.testutils.DatabaseTestUtils; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SlicesIndexerTest { private final String[] KEYS = new String[]{"key1", "key2", "key3"}; diff --git a/tests/robotests/src/com/android/settings/slices/SpecialCaseSliceManagerTest.java b/tests/robotests/src/com/android/settings/slices/SpecialCaseSliceManagerTest.java index 501c564782a..82726dff70d 100644 --- a/tests/robotests/src/com/android/settings/slices/SpecialCaseSliceManagerTest.java +++ b/tests/robotests/src/com/android/settings/slices/SpecialCaseSliceManagerTest.java @@ -30,14 +30,13 @@ import android.provider.SettingsSlicesContract; import androidx.slice.Slice; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SpecialCaseSliceManagerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java index 3ce21055372..54a79f4dfe3 100644 --- a/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java @@ -46,11 +46,10 @@ import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; import com.android.settings.R; +import com.android.settings.bluetooth.Utils; import com.android.settings.core.FeatureFlags; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowAudioManager; import com.android.settings.testutils.shadow.ShadowBluetoothUtils; -import com.android.settings.testutils.shadow.ShadowMediaRouter; import com.android.settingslib.bluetooth.A2dpProfile; import com.android.settingslib.bluetooth.BluetoothCallback; import com.android.settingslib.bluetooth.BluetoothEventManager; @@ -65,6 +64,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.annotation.Config; @@ -75,10 +75,9 @@ import org.robolectric.shadows.ShadowPackageManager; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = { ShadowAudioManager.class, - ShadowMediaRouter.class, ShadowBluetoothUtils.class, ShadowBluetoothDevice.class} ) @@ -131,7 +130,7 @@ public class AudioOutputSwitchPreferenceControllerTest { mShadowAudioManager = ShadowAudioManager.getShadow(); ShadowBluetoothUtils.sLocalBluetoothManager = mLocalManager; - mLocalBluetoothManager = ShadowBluetoothUtils.getLocalBtManager(mContext); + mLocalBluetoothManager = Utils.getLocalBtManager(mContext); when(mLocalBluetoothManager.getEventManager()).thenReturn(mBluetoothEventManager); when(mLocalBluetoothManager.getProfileManager()).thenReturn(mLocalBluetoothProfileManager); @@ -175,7 +174,7 @@ public class AudioOutputSwitchPreferenceControllerTest { @Test public void constructor_notSupportBluetooth_shouldReturnBeforeUsingLocalBluetoothManager() { ShadowBluetoothUtils.reset(); - mLocalBluetoothManager = ShadowBluetoothUtils.getLocalBtManager(mContext); + mLocalBluetoothManager = Utils.getLocalBtManager(mContext); AudioSwitchPreferenceController controller = new AudioSwitchPreferenceControllerTestable( mContext, TEST_KEY); diff --git a/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java index 5745efdd993..401014572cd 100644 --- a/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java @@ -40,10 +40,9 @@ import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; +import com.android.settings.bluetooth.Utils; import com.android.settings.testutils.shadow.ShadowAudioManager; import com.android.settings.testutils.shadow.ShadowBluetoothUtils; -import com.android.settings.testutils.shadow.ShadowMediaRouter; import com.android.settingslib.bluetooth.BluetoothEventManager; import com.android.settingslib.bluetooth.HeadsetProfile; import com.android.settingslib.bluetooth.HearingAidProfile; @@ -56,6 +55,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowBluetoothDevice; @@ -63,10 +63,9 @@ import org.robolectric.shadows.ShadowBluetoothDevice; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = { ShadowAudioManager.class, - ShadowMediaRouter.class, ShadowBluetoothUtils.class, ShadowBluetoothDevice.class} ) @@ -121,7 +120,7 @@ public class HandsFreeProfileOutputPreferenceControllerTest { mShadowAudioManager = ShadowAudioManager.getShadow(); ShadowBluetoothUtils.sLocalBluetoothManager = mLocalManager; - mLocalBluetoothManager = ShadowBluetoothUtils.getLocalBtManager(mContext); + mLocalBluetoothManager = Utils.getLocalBtManager(mContext); when(mLocalBluetoothManager.getEventManager()).thenReturn(mBluetoothEventManager); when(mLocalBluetoothManager.getProfileManager()).thenReturn(mLocalBluetoothProfileManager); diff --git a/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java index 9a0c2eeafc0..8c7faefd5c7 100644 --- a/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java @@ -41,10 +41,9 @@ import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; +import com.android.settings.bluetooth.Utils; import com.android.settings.testutils.shadow.ShadowAudioManager; import com.android.settings.testutils.shadow.ShadowBluetoothUtils; -import com.android.settings.testutils.shadow.ShadowMediaRouter; import com.android.settingslib.bluetooth.A2dpProfile; import com.android.settingslib.bluetooth.BluetoothEventManager; import com.android.settingslib.bluetooth.HearingAidProfile; @@ -57,6 +56,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowBluetoothDevice; @@ -64,10 +64,9 @@ import org.robolectric.shadows.ShadowBluetoothDevice; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = { ShadowAudioManager.class, - ShadowMediaRouter.class, ShadowBluetoothUtils.class, ShadowBluetoothDevice.class} ) @@ -122,7 +121,7 @@ public class MediaOutputPreferenceControllerTest { mShadowAudioManager = ShadowAudioManager.getShadow(); ShadowBluetoothUtils.sLocalBluetoothManager = mLocalManager; - mLocalBluetoothManager = ShadowBluetoothUtils.getLocalBtManager(mContext); + mLocalBluetoothManager = Utils.getLocalBtManager(mContext); when(mLocalBluetoothManager.getEventManager()).thenReturn(mBluetoothEventManager); when(mLocalBluetoothManager.getProfileManager()).thenReturn(mLocalBluetoothProfileManager); diff --git a/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java b/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java index 54bff58b86b..0c4ad7c5c70 100644 --- a/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java +++ b/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java @@ -24,22 +24,21 @@ import android.content.Context; import android.content.pm.ActivityInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; -import android.content.res.Resources; import com.android.settings.R; import com.android.settings.Settings; import com.android.settings.biometrics.fingerprint.FingerprintEnrollSuggestionActivity; import com.android.settings.biometrics.fingerprint.FingerprintSuggestionActivity; import com.android.settings.notification.ZenSuggestionActivity; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.wallpaper.WallpaperSuggestionActivity; import com.android.settings.wifi.calling.WifiCallingSuggestionActivity; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SettingsSuggestionsTest { @Test @@ -103,19 +102,10 @@ public class SettingsSuggestionsTest { throw new RuntimeException(e); } - final String pName = context.getPackageName(); - final Resources resources = context.getResources(); + final int titleResourceId = (int) info.metaData.get("com.android.settings.title"); + assertThat(titleResourceId).isEqualTo(titleRes); - final String title = (String) info.metaData.get("com.android.settings.title"); - final String actualTitle = - context.getString(resources.getIdentifier(title.substring(8), "string", pName)); - final String expectedTitle = context.getString(titleRes); - assertThat(actualTitle).isEqualTo(expectedTitle); - - final String summary = (String) info.metaData.get("com.android.settings.summary"); - final String actualSummary = - context.getString(resources.getIdentifier(summary.substring(8), "string", pName)); - final String expectedSummary = context.getString(summaryRes); - assertThat(actualSummary).isEqualTo(expectedSummary); + final int summaryResourceId = (int) info.metaData.get("com.android.settings.summary"); + assertThat(summaryResourceId).isEqualTo(summaryRes); } } diff --git a/tests/robotests/src/com/android/settings/support/SupportConfigTest.java b/tests/robotests/src/com/android/settings/support/SupportConfigTest.java index 44e4f2be0ba..52d2f012c1d 100644 --- a/tests/robotests/src/com/android/settings/support/SupportConfigTest.java +++ b/tests/robotests/src/com/android/settings/support/SupportConfigTest.java @@ -19,13 +19,13 @@ package com.android.settings.support; import static com.google.common.truth.Truth.assertThat; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SupportConfigTest { @Test diff --git a/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java b/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java index bff4fc0e86b..dabe9ca6532 100644 --- a/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java +++ b/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java @@ -25,16 +25,16 @@ import android.content.pm.ResolveInfo; import com.android.settings.R; import com.android.settings.search.SearchIndexableRaw; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SupportDashboardActivityTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/support/SupportPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/support/SupportPreferenceControllerTest.java index d8050472aee..735dd34f372 100644 --- a/tests/robotests/src/com/android/settings/support/SupportPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/support/SupportPreferenceControllerTest.java @@ -28,15 +28,15 @@ import android.app.Activity; import androidx.preference.Preference; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SupportPreferenceControllerTest { @@ -74,5 +74,4 @@ public class SupportPreferenceControllerTest { assertThat(controller.handlePreferenceTreeClick(mPreference)).isTrue(); verify(mFeatureFactory.supportFeatureProvider).startSupport(mActivity); } - } diff --git a/tests/robotests/src/com/android/settings/support/actionbar/HelpMenuControllerTest.java b/tests/robotests/src/com/android/settings/support/actionbar/HelpMenuControllerTest.java index b0abf6dfeea..8cd26da1ffe 100644 --- a/tests/robotests/src/com/android/settings/support/actionbar/HelpMenuControllerTest.java +++ b/tests/robotests/src/com/android/settings/support/actionbar/HelpMenuControllerTest.java @@ -23,7 +23,6 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.os.Bundle; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.ObservablePreferenceFragment; import org.junit.Before; @@ -31,8 +30,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class HelpMenuControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java b/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java index f49967a7be6..0962d299b4f 100644 --- a/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java +++ b/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java @@ -2,8 +2,8 @@ package com.android.settings.survey; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -19,7 +19,6 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager; import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.overlay.SurveyFeatureProvider; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -27,13 +26,14 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.HashMap; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SurveyMixinTest { private static final String FAKE_KEY = "fake_key"; diff --git a/tests/robotests/src/com/android/settings/system/AdditionalSystemUpdatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/system/AdditionalSystemUpdatePreferenceControllerTest.java index a1473a7a6a3..0abfc20b59c 100644 --- a/tests/robotests/src/com/android/settings/system/AdditionalSystemUpdatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/system/AdditionalSystemUpdatePreferenceControllerTest.java @@ -19,16 +19,15 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AdditionalSystemUpdatePreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java index 542a4a1bab1..d25148072ff 100644 --- a/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java @@ -20,7 +20,6 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.provider.Settings; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settings.testutils.shadow.ShadowUtils; @@ -28,10 +27,11 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowUserManager.class) public class FactoryResetPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/system/ResetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/system/ResetPreferenceControllerTest.java index 3869903c887..1aca4db9e62 100644 --- a/tests/robotests/src/com/android/settings/system/ResetPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/system/ResetPreferenceControllerTest.java @@ -19,16 +19,15 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ResetPreferenceControllerTest { private static final String KEY_RESET_DASHBOARD = "reset_dashboard"; diff --git a/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java index 2785c66266e..75cd552ab01 100644 --- a/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java @@ -20,7 +20,6 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.XmlTestUtils; import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settings.testutils.shadow.ShadowUserManager; @@ -29,12 +28,13 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {SettingsShadowResources.class, ShadowUserManager.class}) public class SystemDashboardFragmentTest { diff --git a/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java index bd17fd72aee..fbd87c96f5f 100644 --- a/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java @@ -34,7 +34,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUserManager; import org.junit.After; @@ -43,6 +42,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; @@ -50,7 +50,7 @@ import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowUserManager.class) public class SystemUpdatePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java b/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java index eed20099d40..e4e26d2c531 100644 --- a/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java @@ -19,8 +19,6 @@ package com.android.settings.testutils; import android.content.Intent; import android.os.BatteryManager; -import java.lang.reflect.Field; - public class BatteryTestUtils { public static Intent getChargingIntent() { @@ -39,7 +37,7 @@ public class BatteryTestUtils { BatteryManager.BATTERY_STATUS_DISCHARGING); } - public static Intent getCustomBatteryIntent(int plugged, int level, int scale, int status) { + private static Intent getCustomBatteryIntent(int plugged, int level, int scale, int status) { Intent intent = new Intent(); intent.putExtra(BatteryManager.EXTRA_PLUGGED, plugged); intent.putExtra(BatteryManager.EXTRA_LEVEL, level); @@ -48,16 +46,4 @@ public class BatteryTestUtils { return intent; } - - public static void clearStaticInstance(Class clazz, String fieldName) { - Field instance; - try { - instance = clazz.getDeclaredField(fieldName); - instance.setAccessible(true); - instance.set(null, null); - } catch (Exception e) { - throw new RuntimeException(); - } - } - } diff --git a/tests/robotests/src/com/android/settings/testutils/DatabaseTestUtils.java b/tests/robotests/src/com/android/settings/testutils/DatabaseTestUtils.java index 84eaae2f669..1a069aafdb5 100644 --- a/tests/robotests/src/com/android/settings/testutils/DatabaseTestUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/DatabaseTestUtils.java @@ -22,7 +22,7 @@ import com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper; import com.android.settings.fuelgauge.batterytip.BatteryDatabaseManager; import com.android.settings.slices.SlicesDatabaseHelper; -import java.lang.reflect.Field; +import org.robolectric.util.ReflectionHelpers; public class DatabaseTestUtils { @@ -36,41 +36,17 @@ public class DatabaseTestUtils { SlicesDatabaseHelper helper = SlicesDatabaseHelper.getInstance(context); helper.close(); - Field instance; - Class clazz = SlicesDatabaseHelper.class; - try { - instance = clazz.getDeclaredField("sSingleton"); - instance.setAccessible(true); - instance.set(null, null); - } catch (Exception e) { - throw new RuntimeException(); - } + ReflectionHelpers.setStaticField(SlicesDatabaseHelper.class, "sSingleton", null); } private static void clearAnomalyDb(Context context) { AnomalyDatabaseHelper helper = AnomalyDatabaseHelper.getInstance(context); helper.close(); - Field instance; - Class clazz = AnomalyDatabaseHelper.class; - try { - instance = clazz.getDeclaredField("sSingleton"); - instance.setAccessible(true); - instance.set(null, null); - } catch (Exception e) { - throw new RuntimeException(); - } + ReflectionHelpers.setStaticField(AnomalyDatabaseHelper.class, "sSingleton", null); } private static void clearAnomalyDbManager() { - Field instance; - Class clazz = BatteryDatabaseManager.class; - try { - instance = clazz.getDeclaredField("sSingleton"); - instance.setAccessible(true); - instance.set(null, null); - } catch (Exception e) { - throw new RuntimeException(); - } + ReflectionHelpers.setStaticField(BatteryDatabaseManager.class, "sSingleton", null); } } diff --git a/tests/robotests/src/com/android/settings/testutils/FakeCopyableController.java b/tests/robotests/src/com/android/settings/testutils/FakeCopyableController.java index a02377cf268..ac19dd0c778 100644 --- a/tests/robotests/src/com/android/settings/testutils/FakeCopyableController.java +++ b/tests/robotests/src/com/android/settings/testutils/FakeCopyableController.java @@ -21,8 +21,7 @@ import android.content.Context; import com.android.settings.core.BasePreferenceController; import com.android.settings.slices.CopyableSlice; -public class FakeCopyableController extends BasePreferenceController implements - CopyableSlice { +public class FakeCopyableController extends BasePreferenceController implements CopyableSlice { public FakeCopyableController(Context context, String preferenceKey) { super(context, preferenceKey); diff --git a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java index bb475f38312..ef07fd4a880 100644 --- a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java +++ b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java @@ -15,7 +15,7 @@ */ package com.android.settings.testutils; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/testutils/FakeIndexProvider.java b/tests/robotests/src/com/android/settings/testutils/FakeIndexProvider.java index c9177e1c5dd..dce039a2d2a 100644 --- a/tests/robotests/src/com/android/settings/testutils/FakeIndexProvider.java +++ b/tests/robotests/src/com/android/settings/testutils/FakeIndexProvider.java @@ -50,5 +50,4 @@ public class FakeIndexProvider implements Indexable { return result; } }; - } diff --git a/tests/robotests/src/com/android/settings/testutils/FakeSliderController.java b/tests/robotests/src/com/android/settings/testutils/FakeSliderController.java index ca306dad8ff..9e659130d70 100644 --- a/tests/robotests/src/com/android/settings/testutils/FakeSliderController.java +++ b/tests/robotests/src/com/android/settings/testutils/FakeSliderController.java @@ -23,24 +23,24 @@ import com.android.settings.core.SliderPreferenceController; public class FakeSliderController extends SliderPreferenceController { - private final String settingKey = "fake_slider_key"; - public static final String AVAILABILITY_KEY = "fake_slider_availability_key"; public static final int MAX_STEPS = 9; + private static final String SETTING_KEY = "fake_slider_key"; + public FakeSliderController(Context context, String key) { super(context, key); } @Override public int getSliderPosition() { - return Settings.System.getInt(mContext.getContentResolver(), settingKey, 0); + return Settings.System.getInt(mContext.getContentResolver(), SETTING_KEY, 0); } @Override public boolean setSliderPosition(int position) { - return Settings.System.putInt(mContext.getContentResolver(), settingKey, position); + return Settings.System.putInt(mContext.getContentResolver(), SETTING_KEY, position); } @Override @@ -50,8 +50,7 @@ public class FakeSliderController extends SliderPreferenceController { @Override public int getAvailabilityStatus() { - return Settings.Global.getInt(mContext.getContentResolver(), - AVAILABILITY_KEY, AVAILABLE); + return Settings.Global.getInt(mContext.getContentResolver(), AVAILABILITY_KEY, AVAILABLE); } @Override diff --git a/tests/robotests/src/com/android/settings/testutils/FakeToggleController.java b/tests/robotests/src/com/android/settings/testutils/FakeToggleController.java index 8e408f00729..d1677cd7382 100644 --- a/tests/robotests/src/com/android/settings/testutils/FakeToggleController.java +++ b/tests/robotests/src/com/android/settings/testutils/FakeToggleController.java @@ -26,15 +26,15 @@ import com.android.settings.core.TogglePreferenceController; public class FakeToggleController extends TogglePreferenceController { - private String settingKey = "toggle_key"; - public static final String AVAILABILITY_KEY = "fake_toggle_availability_key"; public static final IntentFilter INTENT_FILTER = new IntentFilter( WifiManager.WIFI_AP_STATE_CHANGED_ACTION); - private final int ON = 1; - private final int OFF = 0; + private static final String SETTING_KEY = "toggle_key"; + + private static final int ON = 1; + private static final int OFF = 0; private boolean mIsAsyncUpdate = false; @@ -45,12 +45,12 @@ public class FakeToggleController extends TogglePreferenceController { @Override public boolean isChecked() { return Settings.System.getInt(mContext.getContentResolver(), - settingKey, OFF) == ON; + SETTING_KEY, OFF) == ON; } @Override public boolean setChecked(boolean isChecked) { - return Settings.System.putInt(mContext.getContentResolver(), settingKey, + return Settings.System.putInt(mContext.getContentResolver(), SETTING_KEY, isChecked ? ON : OFF); } diff --git a/tests/robotests/src/com/android/settings/testutils/FakeUnavailablePreferenceController.java b/tests/robotests/src/com/android/settings/testutils/FakeUnavailablePreferenceController.java index eef4761ecb4..658a81caa26 100644 --- a/tests/robotests/src/com/android/settings/testutils/FakeUnavailablePreferenceController.java +++ b/tests/robotests/src/com/android/settings/testutils/FakeUnavailablePreferenceController.java @@ -15,8 +15,7 @@ public class FakeUnavailablePreferenceController extends BasePreferenceControlle @Override public int getAvailabilityStatus() { - return Settings.Global.getInt(mContext.getContentResolver(), - AVAILABILITY_KEY, 0); + return Settings.Global.getInt(mContext.getContentResolver(), AVAILABILITY_KEY, 0); } @Override diff --git a/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java index 6a177950c0d..0828cc78b65 100644 --- a/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java +++ b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 The Android Open Source Project + * Copyright (C) 2018 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. @@ -13,100 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package com.android.settings.testutils; import org.junit.runners.model.InitializationError; import org.robolectric.RobolectricTestRunner; -import org.robolectric.annotation.Config; -import org.robolectric.manifest.AndroidManifest; -import org.robolectric.res.Fs; -import org.robolectric.res.ResourcePath; - -import java.net.MalformedURLException; -import java.net.URL; -import java.util.List; -/** - * Custom test runner for the testing of BluetoothPairingDialogs. This is needed because the - * default behavior for robolectric is just to grab the resource directory in the target package. - * We want to override this to add several spanning different projects. - */ public class SettingsRobolectricTestRunner extends RobolectricTestRunner { - /** - * We don't actually want to change this behavior, so we just call super. - */ public SettingsRobolectricTestRunner(Class testClass) throws InitializationError { super(testClass); } - - /** - * We are going to create our own custom manifest so that we can add multiple resource - * paths to it. This lets us access resources in both Settings and SettingsLib in our tests. - */ - @Override - protected AndroidManifest getAppManifest(Config config) { - try { - // Using the manifest file's relative path, we can figure out the application directory. - final URL appRoot = new URL("file:packages/apps/Settings/"); - final URL manifestPath = new URL(appRoot, "AndroidManifest.xml"); - final URL resDir = new URL(appRoot, "tests/robotests/res"); - final URL assetsDir = new URL(appRoot, "tests/robotests/assets"); - - // By adding any resources from libraries we need the AndroidManifest, we can access - // them from within the parallel universe's resource loader. - return new AndroidManifest(Fs.fromURL(manifestPath), Fs.fromURL(resDir), - Fs.fromURL(assetsDir), "com.android.settings") { - @Override - public List getIncludedResourcePaths() { - final List paths = super.getIncludedResourcePaths(); - addIncludedResourcePaths(paths); - return paths; - } - }; - } catch (MalformedURLException e) { - throw new RuntimeException("SettingsRobolectricTestRunner failure", e); - } - } - - public static void addIncludedResourcePaths(List paths) { - try { - paths.add(new ResourcePath(null, - Fs.fromURL(new URL("file:packages/apps/Settings/res")), null)); - paths.add(new ResourcePath(null, - Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/res")), null)); - paths.add(new ResourcePath(null, - Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/AppPreference/res/")), null)); - paths.add(new ResourcePath(null, - Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/HelpUtils/res/")), null)); - paths.add(new ResourcePath(null, - Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/RestrictedLockUtils/res/")), null)); - paths.add(new ResourcePath(null, - Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/SearchWidget/res/")), null)); - paths.add(new ResourcePath(null, - Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/ActionButtonsPreference/res")), null)); - paths.add(new ResourcePath(null, - Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/SettingsLayoutPreference/res")), null)); - paths.add(new ResourcePath(null, - Fs.fromURL(new URL("file:frameworks/base/core/res/res")), null)); - paths.add(new ResourcePath(null, - Fs.fromURL(new URL("file:external/setupcompat/main/res")), null)); - paths.add(new ResourcePath(null, - Fs.fromURL(new URL("file:external/setupdesign/main/res")), null)); - paths.add(new ResourcePath(null, - Fs.fromURL(new URL("file:out/target/common/obj/JAVA_LIBRARIES/robolectric_android-all-stub_intermediates/classes/raw-res/res")), null)); - paths.add(new ResourcePath(null, - Fs.fromURL(new URL("file:out/soong/.intermediates/prebuilts/sdk/current/androidx/androidx.appcompat_appcompat-nodeps/android_common/aar/res/")), null)); - paths.add(new ResourcePath(null, - Fs.fromURL(new URL("file:out/soong/.intermediates/prebuilts/sdk/current/extras/material-design-x/com.google.android.material_material-nodeps/android_common/aar/res/")), null)); - paths.add(new ResourcePath(null, - Fs.fromURL(new URL("file:out/soong/.intermediates/prebuilts/sdk/current/androidx/androidx.cardview_cardview-nodeps/android_common/aar/res")), null)); - paths.add(new ResourcePath(null, - Fs.fromURL(new URL("file:out/soong/.intermediates/prebuilts/sdk/current/androidx/androidx.slice_slice-view-nodeps/android_common/aar/res")), null)); - paths.add(new ResourcePath(null, - Fs.fromURL(new URL("file:out/soong/.intermediates/prebuilts/sdk/current/androidx/androidx.preference_preference-nodeps/android_common/aar/res")), null)); - } catch (MalformedURLException e) { - throw new RuntimeException("SettingsRobolectricTestRunner failure", e); - } - } } diff --git a/tests/robotests/src/com/android/settings/testutils/ShadowIconDrawableFactory.java b/tests/robotests/src/com/android/settings/testutils/ShadowIconDrawableFactory.java deleted file mode 100644 index cfba1e1988c..00000000000 --- a/tests/robotests/src/com/android/settings/testutils/ShadowIconDrawableFactory.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (C) 2018 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.testutils; - -import android.content.pm.ApplicationInfo; -import android.graphics.Color; -import android.graphics.drawable.ColorDrawable; -import android.graphics.drawable.Drawable; -import android.util.IconDrawableFactory; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; - -@Implements(IconDrawableFactory.class) -public class ShadowIconDrawableFactory { - - @Implementation - public Drawable getBadgedIcon(ApplicationInfo appInfo) { - return new ColorDrawable(Color.BLUE); - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowBluetoothDevice.java b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowBluetoothDevice.java deleted file mode 100644 index 124b5ead8a4..00000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowBluetoothDevice.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2017 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.testutils.shadow; - -import android.bluetooth.BluetoothDevice; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; - -@Implements(BluetoothDevice.class) -public class SettingsShadowBluetoothDevice { - private String mAddress; - - public void __constructor__(String address) { - mAddress = address; - } - - @Implementation - public String getAddress() { - return mAddress; - } - - @Implementation - public int hashCode() { - return mAddress.hashCode(); - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java index c6735087350..b68a4ee2b93 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java @@ -1,37 +1,19 @@ package com.android.settings.testutils.shadow; -import static android.util.TypedValue.TYPE_REFERENCE; - import static org.robolectric.RuntimeEnvironment.application; import static org.robolectric.shadow.api.Shadow.directlyOn; -import android.annotation.DimenRes; -import android.content.res.ColorStateList; import android.content.res.Resources; import android.content.res.Resources.NotFoundException; -import android.content.res.Resources.Theme; -import android.content.res.TypedArray; -import android.graphics.Color; -import android.graphics.drawable.ColorDrawable; -import android.graphics.drawable.Drawable; -import android.util.AttributeSet; import android.util.SparseArray; -import android.util.TypedValue; import androidx.annotation.ArrayRes; -import androidx.annotation.ColorRes; -import androidx.annotation.Nullable; - -import com.android.settings.R; -import org.robolectric.android.XmlResourceParserImpl; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import org.robolectric.annotation.RealObject; import org.robolectric.shadows.ShadowResources; -import org.robolectric.util.ReflectionHelpers; import org.robolectric.util.ReflectionHelpers.ClassParameter; -import org.w3c.dom.Node; /** * Shadow Resources and Theme classes to handle resource references that Robolectric shadows cannot @@ -46,9 +28,7 @@ public class SettingsShadowResources extends ShadowResources { private static SparseArray sResourceOverrides = new SparseArray<>(); public static void overrideResource(int id, Object value) { - synchronized (sResourceOverrides) { - sResourceOverrides.put(id, value); - } + sResourceOverrides.put(id, value); } public static void overrideResource(String name, Object value) { @@ -61,75 +41,12 @@ public class SettingsShadowResources extends ShadowResources { } public static void reset() { - synchronized (sResourceOverrides) { - sResourceOverrides.clear(); - } - } - - @Implementation - public int getDimensionPixelSize(@DimenRes int id) throws NotFoundException { - // Handle requests for private dimension resources, - // TODO: Consider making a set of private dimension resource ids if this happens repeatedly. - if (id == com.android.internal.R.dimen.preference_fragment_padding_bottom) { - return 0; - } - return directlyOn(realResources, Resources.class).getDimensionPixelSize(id); - } - - @Implementation - public int getColor(@ColorRes int id, @Nullable Theme theme) throws NotFoundException { - if (id == R.color.battery_icon_color_error) { - return Color.WHITE; - } - return directlyOn(realResources, Resources.class).getColor(id, theme); + sResourceOverrides.clear(); } @Implementation - public ColorStateList getColorStateList(@ColorRes int id, @Nullable Theme theme) - throws NotFoundException { - if (id == com.android.internal.R.color.text_color_primary) { - return ColorStateList.valueOf(Color.WHITE); - } - return directlyOn(realResources, Resources.class).getColorStateList(id, theme); - } - - /** - * Deprecated because SDK 24+ uses - * {@link SettingsShadowResourcesImpl#loadDrawable(Resources, TypedValue, int, int, Theme)} - * - * TODO: Delete when all tests have been migrated to sdk 26 - */ - @Deprecated - @Implementation - public Drawable loadDrawable(TypedValue value, int id, Theme theme) - throws NotFoundException { - // The drawable item in switchbar_background.xml refers to a very recent color attribute - // that Robolectric isn't yet aware of. - // TODO: Remove this once Robolectric is updated. - if (id == R.drawable.switchbar_background) { - return new ColorDrawable(); - } else if (id == R.drawable.ic_launcher_settings) { - // ic_launcher_settings uses adaptive-icon, which is not supported by robolectric, - // change it to a normal drawable. - id = R.drawable.ic_settings_wireless; - } else if (id == R.drawable.app_filter_spinner_background) { - id = R.drawable.ic_expand_more_inverse; - } - return super.loadDrawable(value, id, theme); - } - - @Implementation - public int[] getIntArray(@ArrayRes int id) throws NotFoundException { - // The Robolectric isn't aware of resources in settingslib, so we need to stub it here - if (id == com.android.settings.R.array.batterymeter_bolt_points - || id == com.android.settings.R.array.batterymeter_plus_points) { - return new int[2]; - } - - final Object override; - synchronized (sResourceOverrides) { - override = sResourceOverrides.get(id); - } + protected int[] getIntArray(@ArrayRes int id) throws NotFoundException { + final Object override = sResourceOverrides.get(id); if (override instanceof int[]) { return (int[]) override; } @@ -137,11 +54,8 @@ public class SettingsShadowResources extends ShadowResources { } @Implementation - public String getString(int id) { - final Object override; - synchronized (sResourceOverrides) { - override = sResourceOverrides.get(id); - } + protected String getString(int id) { + final Object override = sResourceOverrides.get(id); if (override instanceof String) { return (String) override; } @@ -150,11 +64,8 @@ public class SettingsShadowResources extends ShadowResources { } @Implementation - public int getInteger(int id) { - final Object override; - synchronized (sResourceOverrides) { - override = sResourceOverrides.get(id); - } + protected int getInteger(int id) { + final Object override = sResourceOverrides.get(id); if (override instanceof Integer) { return (Integer) override; } @@ -163,66 +74,12 @@ public class SettingsShadowResources extends ShadowResources { } @Implementation - public boolean getBoolean(int id) { - final Object override; - synchronized (sResourceOverrides) { - override = sResourceOverrides.get(id); - } + protected boolean getBoolean(int id) { + final Object override = sResourceOverrides.get(id); if (override instanceof Boolean) { return (boolean) override; } return directlyOn(realResources, Resources.class, "getBoolean", ClassParameter.from(int.class, id)); } - - @Implements(value = Theme.class) - public static class SettingsShadowTheme extends ShadowLegacyTheme { - - @RealObject - Theme realTheme; - - @Implementation - protected TypedArray obtainStyledAttributes( - AttributeSet set, int[] attrs, int defStyleAttr, int defStyleRes) { - // Replace all private string references with a placeholder. - if (set != null) { - synchronized (set) { - for (int i = 0; i < set.getAttributeCount(); ++i) { - final String attributeValue = set.getAttributeValue(i); - final Node node = ReflectionHelpers.callInstanceMethod( - XmlResourceParserImpl.class, set, "getAttributeAt", - ReflectionHelpers.ClassParameter.from(int.class, i)); - if (attributeValue.contains("attr/fingerprint_layout_theme")) { - // Workaround for https://github.com/robolectric/robolectric/issues/2641 - node.setNodeValue("@style/FingerprintLayoutTheme"); - } - } - } - } - return super.obtainStyledAttributes(set, attrs, defStyleAttr, defStyleRes); - } - - @Implementation - public synchronized boolean resolveAttribute(int resid, TypedValue outValue, - boolean resolveRefs) { - // The real Resources instance in Robolectric tests somehow fails to find the - // preferenceTheme attribute in the layout. Let's do it ourselves. - if (getResources().getResourceName(resid) - .equals("com.android.settings:attr/preferenceTheme")) { - final int preferenceThemeResId = - getResources().getIdentifier( - "PreferenceTheme", "style", "com.android.settings"); - outValue.type = TYPE_REFERENCE; - outValue.data = preferenceThemeResId; - outValue.resourceId = preferenceThemeResId; - return true; - } - return directlyOn(realTheme, Theme.class) - .resolveAttribute(resid, outValue, resolveRefs); - } - - private Resources getResources() { - return ReflectionHelpers.callInstanceMethod(ShadowLegacyTheme.class, this, "getResources"); - } - } } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResourcesImpl.java b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResourcesImpl.java deleted file mode 100644 index c76991e218c..00000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResourcesImpl.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (C) 2017 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.testutils.shadow; - -import android.content.res.Resources; -import android.content.res.ResourcesImpl; -import android.graphics.drawable.ColorDrawable; -import android.graphics.drawable.Drawable; -import android.util.TypedValue; - -import com.android.settings.R; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; -import org.robolectric.shadows.ShadowLegacyResourcesImpl; - -@Implements( - value = ResourcesImpl.class, - isInAndroidSdk = false, - minSdk = 26 -) -public class SettingsShadowResourcesImpl extends ShadowLegacyResourcesImpl { - - @Implementation - public Drawable loadDrawable(Resources wrapper, TypedValue value, int id, int density, - Resources.Theme theme) { - // The drawable item in switchbar_background.xml refers to a very recent color attribute - // that Robolectric isn't yet aware of. - // TODO: Remove this once Robolectric is updated. - if (id == R.drawable.switchbar_background - || id == R.color.ripple_material_light - || id == R.color.ripple_material_dark) { - return new ColorDrawable(); - } else if (id == R.drawable.ic_launcher_settings) { - // ic_launcher_settings uses adaptive-icon, which is not supported by robolectric, - // change it to a normal drawable. - id = R.drawable.ic_settings_wireless; - } else if (id == R.drawable.app_filter_spinner_background) { - id = R.drawable.ic_expand_more_inverse; - } else if (id == R.drawable.color_bar_progress - || id == R.drawable.ring_progress) { - // color_bar_progress and ring_progress use hidden resources, so just use the regular - // progress_horizontal drawable - id = android.R.drawable.progress_horizontal; - } - - return super.loadDrawable(wrapper, value, id, density, theme); - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowTypedArray.java b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowTypedArray.java deleted file mode 100644 index 1e64dd117bc..00000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowTypedArray.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2018 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.testutils.shadow; - -import static org.robolectric.shadow.api.Shadow.directlyOn; - -import android.content.res.ColorStateList; -import android.content.res.TypedArray; -import android.graphics.Color; - -import androidx.annotation.Nullable; -import androidx.annotation.StyleableRes; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; -import org.robolectric.annotation.RealObject; -import org.robolectric.shadows.ShadowTypedArray; - -@Implements(value = TypedArray.class) -public class SettingsShadowTypedArray extends ShadowTypedArray { - - @RealObject - TypedArray realTypedArray; - - @Implementation - @Nullable - public ColorStateList getColorStateList(@StyleableRes int index) { - if (index == com.android.internal.R.styleable.TextView_textColorLink) { - return ColorStateList.valueOf(Color.WHITE); - } - return directlyOn(realTypedArray, TypedArray.class).getColorStateList(index); - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessPoint.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessPoint.java index 2cb6964b779..7d206f45047 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessPoint.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessPoint.java @@ -25,7 +25,7 @@ import org.robolectric.annotation.Implements; public class ShadowAccessPoint { @Implementation - public String getSavedNetworkSummary() { + protected String getSavedNetworkSummary() { return "saved"; } } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManager.java deleted file mode 100644 index 124f635ea80..00000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManager.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (C) 2017 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.testutils.shadow; - -import android.accessibilityservice.AccessibilityServiceInfo; -import android.content.ComponentName; -import android.view.accessibility.AccessibilityManager; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; - -import java.util.ArrayList; -import java.util.List; - -@Implements(AccessibilityManager.class) -public class ShadowAccessibilityManager { - private static final List mInstalledAccessibilityList = - new ArrayList<>(); - - public static void addAccessibilityService(String serviceName) { - AccessibilityServiceInfo serviceInfo = new AccessibilityServiceInfo(); - serviceInfo.setComponentName(ComponentName.unflattenFromString(serviceName)); - mInstalledAccessibilityList.add(serviceInfo); - } - - @Implementation - public List getInstalledAccessibilityServiceList() { - return mInstalledAccessibilityList; - } - - @Implementation - public static boolean isAccessibilityButtonSupported() { - return true; - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityServiceInfo.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityServiceInfo.java index 551f263990c..5a65be0067a 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityServiceInfo.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityServiceInfo.java @@ -31,7 +31,7 @@ public class ShadowAccessibilityServiceInfo { } @Implementation - public ComponentName getComponentName() { + protected ComponentName getComponentName() { return sComponentName; } } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccountManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccountManager.java index bf54d2fa7c0..409c2612eca 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccountManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccountManager.java @@ -36,7 +36,7 @@ public class ShadowAccountManager { private static final Map> sAccountsByUserId = new HashMap<>(); @Implementation - public AuthenticatorDescription[] getAuthenticatorTypesAsUser(int userId) { + protected AuthenticatorDescription[] getAuthenticatorTypesAsUser(int userId) { return sAuthenticators.values().toArray(new AuthenticatorDescription[sAuthenticators.size()]); } @@ -50,7 +50,7 @@ public class ShadowAccountManager { } @Implementation @NonNull - public Account[] getAccountsAsUser(int userId) { + protected Account[] getAccountsAsUser(int userId) { if (sAccountsByUserId.containsKey(userId)) { return sAccountsByUserId.get(userId).toArray(new Account[0]); } else { diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowActivityManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowActivityManager.java index b7698b302ce..38d658c3544 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowActivityManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowActivityManager.java @@ -26,7 +26,7 @@ public class ShadowActivityManager { private static int sCurrentUserId = 0; @Implementation - public static int getCurrentUser() { + protected static int getCurrentUser() { return sCurrentUserId; } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowActivityWithLoadManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowActivityWithLoadManager.java deleted file mode 100644 index a6d6babcb36..00000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowActivityWithLoadManager.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) 2016 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.testutils.shadow; - -import android.app.Activity; - -import androidx.loader.app.LoaderManager; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; -import org.robolectric.shadows.ShadowActivity; - -/* - * Shadow for {@link Activity} that has LoadManager accessors. - */ -@Implements(Activity.class) -public class ShadowActivityWithLoadManager extends ShadowActivity { - - private LoaderManager mLoaderManager; - - @Implementation - public LoaderManager getLoaderManager() { - return mLoaderManager; - } - - // Non-Android setter. - public void setLoaderManager(LoaderManager loaderManager) { - mLoaderManager = loaderManager; - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAppInfoBase.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAppInfoBase.java index c41aa8ee223..f8cdb2269a9 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAppInfoBase.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAppInfoBase.java @@ -25,12 +25,12 @@ import org.robolectric.annotation.Implements; public class ShadowAppInfoBase { @Implementation - public void onResume() { + protected void onResume() { // No-op. } @Implementation - public void onPause() { + protected void onPause() { // No-op. } } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowApplicationsState.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowApplicationsState.java index 3ee4fcb1647..8239ed9ab83 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowApplicationsState.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowApplicationsState.java @@ -26,7 +26,7 @@ import org.robolectric.annotation.Implements; @Implements(ApplicationsState.class) public class ShadowApplicationsState { @Implementation - public Looper getBackgroundLooper() { + protected Looper getBackgroundLooper() { return Looper.getMainLooper(); } } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioHelper.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioHelper.java index cee04ca351e..4a519aaa0f6 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioHelper.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioHelper.java @@ -28,12 +28,12 @@ import org.robolectric.annotation.Implements; public class ShadowAudioHelper { @Implementation - public boolean isSingleVolume() { + protected boolean isSingleVolume() { return true; } @Implementation - public int getManagedProfileId(UserManager um) { + protected int getManagedProfileId(UserManager um) { return UserHandle.USER_CURRENT; } } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioManager.java index 6636a6cf431..e651bafa47c 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioManager.java @@ -31,9 +31,9 @@ import android.media.AudioDeviceCallback; import android.media.AudioManager; import android.os.Handler; +import java.util.List; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; -import org.robolectric.annotation.Resetter; import org.robolectric.shadow.api.Shadow; import java.util.ArrayList; @@ -43,8 +43,7 @@ public class ShadowAudioManager extends org.robolectric.shadows.ShadowAudioManag private int mRingerMode; private int mDeviceCodes; private boolean mMusicActiveRemotely; - private boolean mBluetoothScoOn; - private ArrayList mDeviceCallbacks = new ArrayList(); + private List mDeviceCallbacks = new ArrayList<>(); @Implementation private int getRingerModeInternal() { @@ -100,11 +99,4 @@ public class ShadowAudioManager extends org.robolectric.shadows.ShadowAudioManag return 0; } } - - public void setBluetoothScoOn(boolean bluetoothScoOn) { - mBluetoothScoOn = bluetoothScoOn; - } - - @Implementation - public boolean isBluetoothScoOn() { return mBluetoothScoOn; } } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBidiFormatter.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBidiFormatter.java deleted file mode 100644 index 4ca894314a4..00000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBidiFormatter.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (C) 2017 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.testutils.shadow; - -import androidx.core.text.BidiFormatter; -import androidx.core.text.TextDirectionHeuristicCompat; - -import org.robolectric.annotation.Implements; - -@Implements(BidiFormatter.class) -public class ShadowBidiFormatter { - - public CharSequence unicodeWrap(CharSequence str, TextDirectionHeuristicCompat heuristic, - boolean isolate) { - return str; - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothAdapter.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothAdapter.java index 371c1b10798..2444df66bf0 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothAdapter.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothAdapter.java @@ -28,10 +28,10 @@ import java.util.List; public class ShadowBluetoothAdapter extends org.robolectric.shadows.ShadowBluetoothAdapter { private int mState; - private List mSupportedProfiles = new ArrayList(); + private List mSupportedProfiles = new ArrayList<>(); @Implementation - public List getSupportedProfiles() { + protected List getSupportedProfiles() { return mSupportedProfiles; } @@ -44,7 +44,7 @@ public class ShadowBluetoothAdapter extends org.robolectric.shadows.ShadowBlueto } @Implementation - public int getConnectionState() { + protected int getConnectionState() { return mState; } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothDevice.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothDevice.java index 0b1665ca82d..0e903bbe15c 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothDevice.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothDevice.java @@ -29,32 +29,32 @@ public class ShadowBluetoothDevice extends org.robolectric.shadows.ShadowBluetoo private int mSimAccessPermission = BluetoothDevice.ACCESS_UNKNOWN; @Implementation - public void setMessageAccessPermission(int value) { + protected void setMessageAccessPermission(int value) { mMessageAccessPermission = value; } @Implementation - public int getMessageAccessPermission() { + protected int getMessageAccessPermission() { return mMessageAccessPermission; } @Implementation - public void setPhonebookAccessPermission(int value) { + protected void setPhonebookAccessPermission(int value) { mPhonebookAccessPermission = value; } @Implementation - public int getPhonebookAccessPermission() { + protected int getPhonebookAccessPermission() { return mPhonebookAccessPermission; } @Implementation - public void setSimAccessPermission(int value) { + protected void setSimAccessPermission(int value) { mSimAccessPermission = value; } @Implementation - public int getSimAccessPermission() { + protected int getSimAccessPermission() { return mSimAccessPermission; } } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothPan.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothPan.java deleted file mode 100644 index 2724d98d703..00000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothPan.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (C) 2018 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.testutils.shadow; - -import android.bluetooth.BluetoothPan; -import android.bluetooth.BluetoothProfile; -import android.content.Context; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; - -@Implements(BluetoothPan.class) -public class ShadowBluetoothPan { - @Implementation - public void __constructor__(Context context, BluetoothProfile.ServiceListener l) { - // Do nothing, implement it to avoid null pointer error inside BluetoothPan - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothUtils.java index fcf79e2ff72..c0094428026 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothUtils.java @@ -27,12 +27,11 @@ import org.robolectric.annotation.Resetter; @Implements(Utils.class) public class ShadowBluetoothUtils { - public static LocalBluetoothManager sLocalBluetoothManager; - + public static LocalBluetoothManager sLocalBluetoothManager; @Implementation - public static LocalBluetoothManager getLocalBtManager(Context context) { + protected static LocalBluetoothManager getLocalBtManager(Context context) { return sLocalBluetoothManager; } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCachedBluetoothDeviceManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCachedBluetoothDeviceManager.java index ee04c4f1d38..2d77240d436 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCachedBluetoothDeviceManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCachedBluetoothDeviceManager.java @@ -38,7 +38,7 @@ public class ShadowCachedBluetoothDeviceManager { } @Implementation - public synchronized Collection getCachedDevicesCopy() { + protected synchronized Collection getCachedDevicesCopy() { return mCachedDevices; } } \ No newline at end of file diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowConnectivityManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowConnectivityManager.java index 794fcbbf2b8..4e217267ef6 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowConnectivityManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowConnectivityManager.java @@ -35,7 +35,7 @@ public class ShadowConnectivityManager extends org.robolectric.shadows.ShadowCon } @Implementation - public boolean isNetworkSupported(int networkType) { + protected boolean isNetworkSupported(int networkType) { return mSupportedNetworkTypes.get(networkType); } @@ -44,7 +44,7 @@ public class ShadowConnectivityManager extends org.robolectric.shadows.ShadowCon } @Implementation - public boolean isTetheringSupported() { + protected boolean isTetheringSupported() { return mTetheringSupported; } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContentResolver.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContentResolver.java index 7bfb1c55b8e..4d4cfc7701d 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContentResolver.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContentResolver.java @@ -42,12 +42,12 @@ public class ShadowContentResolver { private static Map sMasterSyncAutomatically = new HashMap<>(); @Implementation - public static SyncAdapterType[] getSyncAdapterTypesAsUser(int userId) { + protected static SyncAdapterType[] getSyncAdapterTypesAsUser(int userId) { return sSyncAdapterTypes; } @Implementation - public final Cursor query(Uri uri, String[] projection, String selection, + protected final Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) { MatrixCursor cursor = new MatrixCursor(INDEXABLES_RAW_COLUMNS); MatrixCursor.RowBuilder builder = cursor.newRow() @@ -56,26 +56,26 @@ public class ShadowContentResolver { } @Implementation - public static int getIsSyncableAsUser(Account account, String authority, int userId) { + protected static int getIsSyncableAsUser(Account account, String authority, int userId) { return sSyncable.containsKey(authority) ? sSyncable.get(authority) : 1; } @Implementation - public static boolean getSyncAutomaticallyAsUser(Account account, String authority, + protected static boolean getSyncAutomaticallyAsUser(Account account, String authority, int userId) { return sSyncAutomatically.containsKey(authority) ? sSyncAutomatically.get(authority) : true; } @Implementation - public static void setSyncAutomaticallyAsUser(Account account, String authority, boolean sync, - int userId) { + protected static void setSyncAutomaticallyAsUser(Account account, String authority, + boolean sync, int userId) { if (TextUtils.isEmpty(authority)) { throw new IllegalArgumentException("Authority must be non-empty"); } } @Implementation - public static boolean getMasterSyncAutomaticallyAsUser(int userId) { + protected static boolean getMasterSyncAutomaticallyAsUser(int userId) { return sMasterSyncAutomatically.containsKey(userId) ? sMasterSyncAutomatically.get(userId) : true; } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContextImplWithRegisterReceiver.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContextImplWithRegisterReceiver.java deleted file mode 100644 index c1f82933b93..00000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContextImplWithRegisterReceiver.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2016 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.testutils.shadow; - -import android.content.BroadcastReceiver; -import android.content.Intent; -import android.content.IntentFilter; -import android.os.Handler; -import android.os.UserHandle; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; -import org.robolectric.shadows.ShadowContextImpl; - -/* - * Shadow for {@link ContextImpl} that has registerReceiverAsUser method. - */ -@Implements(className = ShadowContextImpl.CLASS_NAME) -public class ShadowContextImplWithRegisterReceiver extends ShadowContextImpl { - - @Implementation - public Intent registerReceiverAsUser(BroadcastReceiver receiver, UserHandle user, - IntentFilter filter, String broadcastPermission, Handler scheduler) { - return super.registerReceiver(receiver, filter, broadcastPermission, scheduler); - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataSaverBackend.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataSaverBackend.java index 88b0b5fc0f7..4d1a2ed3044 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataSaverBackend.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataSaverBackend.java @@ -11,12 +11,12 @@ public class ShadowDataSaverBackend { private static boolean isEnabled = true; @Implementation - public boolean isDataSaverEnabled() { + protected boolean isDataSaverEnabled() { return isEnabled; } @Implementation - public void setDataSaverEnabled(boolean enabled) { + protected void setDataSaverEnabled(boolean enabled) { isEnabled = enabled; } } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataUsageUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataUsageUtils.java index 9b8821a6b57..9973a2d19fe 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataUsageUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataUsageUtils.java @@ -17,25 +17,25 @@ public class ShadowDataUsageUtils { public static int DEFAULT_SUBSCRIPTION_ID = SubscriptionManager.INVALID_SUBSCRIPTION_ID; @Implementation - public static boolean hasMobileData(Context context) { + protected static boolean hasMobileData(Context context) { return IS_MOBILE_DATA_SUPPORTED; } @Implementation - public static boolean hasWifiRadio(Context context) { + protected static boolean hasWifiRadio(Context context) { return IS_WIFI_SUPPORTED; } @Implementation - public static int getDefaultSubscriptionId(Context context) { + protected static int getDefaultSubscriptionId(Context context) { return DEFAULT_SUBSCRIPTION_ID; } @Implementation - public static boolean hasSim(Context context) { + protected static boolean hasSim(Context context) { return HAS_SIM; } @Implementation - public static boolean hasEthernet(Context context) { return false; } + protected static boolean hasEthernet(Context context) { return false; } } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDatabaseIndexingUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDatabaseIndexingUtils.java deleted file mode 100644 index 8aa5dab9107..00000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDatabaseIndexingUtils.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) 2017 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.testutils.shadow; - -import android.content.Context; -import android.content.pm.ResolveInfo; - -import com.android.settings.search.DatabaseIndexingUtils; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; - -/** - * Shadow of {@link DatabaseIndexingUtils} - */ -@Implements(DatabaseIndexingUtils.class) -public class ShadowDatabaseIndexingUtils { - @Implementation - public static boolean isWellKnownProvider(ResolveInfo info, Context context) { - return true; - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDevicePolicyManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDevicePolicyManager.java index b4e64924628..6d2dbef467c 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDevicePolicyManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDevicePolicyManager.java @@ -5,7 +5,6 @@ import android.annotation.Nullable; import android.annotation.UserIdInt; import android.app.admin.DevicePolicyManager; import android.content.ComponentName; -import android.os.PersistableBundle; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Implementation; @@ -13,7 +12,6 @@ import org.robolectric.annotation.Implements; import org.robolectric.shadow.api.Shadow; import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.Objects; @@ -23,7 +21,7 @@ public class ShadowDevicePolicyManager extends org.robolectric.shadows.ShadowDev private final Map mProfileTimeouts = new HashMap<>(); private Map mSupportMessagesMap = new HashMap<>(); private boolean mIsAdminActiveAsUser = false; - ComponentName mDeviceOwnerComponentName; + private ComponentName mDeviceOwnerComponentName; private int mDeviceOwnerUserId = -1; public void setShortSupportMessageForUser(ComponentName admin, int userHandle, String message) { @@ -31,29 +29,28 @@ public class ShadowDevicePolicyManager extends org.robolectric.shadows.ShadowDev } @Implementation - public @Nullable - CharSequence getShortSupportMessageForUser(@NonNull ComponentName admin, + protected @Nullable CharSequence getShortSupportMessageForUser(@NonNull ComponentName admin, int userHandle) { return mSupportMessagesMap.get(Objects.hash(admin, userHandle)); } @Implementation - public boolean isAdminActiveAsUser(@NonNull ComponentName admin, int userId) { + protected boolean isAdminActiveAsUser(@NonNull ComponentName admin, int userId) { return mIsAdminActiveAsUser; } @Implementation - public int getDeviceOwnerUserId() { + protected int getDeviceOwnerUserId() { return mDeviceOwnerUserId; } @Implementation - public long getMaximumTimeToLock(ComponentName admin, @UserIdInt int userHandle) { + protected long getMaximumTimeToLock(ComponentName admin, @UserIdInt int userHandle) { return mProfileTimeouts.getOrDefault(userHandle, 0L); } @Implementation - public ComponentName getDeviceOwnerComponentOnAnyUser() { + protected ComponentName getDeviceOwnerComponentOnAnyUser() { return mDeviceOwnerComponentName; } @@ -77,10 +74,4 @@ public class ShadowDevicePolicyManager extends org.robolectric.shadows.ShadowDev return (ShadowDevicePolicyManager) Shadow.extract( RuntimeEnvironment.application.getSystemService(DevicePolicyManager.class)); } - - public @Nullable - List getTrustAgentConfiguration( - @Nullable ComponentName admin, @NonNull ComponentName agent) { - return null; - } } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDoubleTwistPreferenceController.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDoubleTwistPreferenceController.java index 2f37ec8370e..4cb9446bd84 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDoubleTwistPreferenceController.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDoubleTwistPreferenceController.java @@ -12,13 +12,14 @@ import org.robolectric.annotation.Implements; @Implements(DoubleTwistPreferenceController.class) public class ShadowDoubleTwistPreferenceController { private static int sManagedProfileId = UserHandle.USER_NULL; + @Implementation - public static boolean isGestureAvailable(Context context) { + protected static boolean isGestureAvailable(Context context) { return true; } @Implementation - public static int getManagedProfileId(UserManager userManager) { + protected static int getManagedProfileId(UserManager userManager) { return sManagedProfileId; } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDynamicLayout.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDynamicLayout.java deleted file mode 100644 index d3741bb10ab..00000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDynamicLayout.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2018 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.testutils.shadow; - -import android.text.DynamicLayout; -import android.text.Layout.Directions; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; - -@Implements(DynamicLayout.class) -public class ShadowDynamicLayout { - - @Implementation - public int getLineTop(int line) { - return 0; - } - - @Implementation - public int getLineStart(int line) { - return 0; - } - - @Implementation - public final Directions getLineDirections(int line) { - return new Directions(new int[]{0, 1}); - } -} \ No newline at end of file diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowEntityHeaderController.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowEntityHeaderController.java index 56f49794344..4e22a32c08f 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowEntityHeaderController.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowEntityHeaderController.java @@ -42,9 +42,8 @@ public class ShadowEntityHeaderController { } @Implementation - public static EntityHeaderController newInstance(Activity activity, Fragment fragment, + protected static EntityHeaderController newInstance(Activity activity, Fragment fragment, View header) { return sMockController; } - -} +} \ No newline at end of file diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowEventLogWriter.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowEventLogWriter.java deleted file mode 100644 index 9caf09f3e8d..00000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowEventLogWriter.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) 2017 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.testutils.shadow; - - -import android.content.Context; - -import com.android.settingslib.core.instrumentation.EventLogWriter; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; - -@Implements(value = EventLogWriter.class, callThroughByDefault = false) -public class ShadowEventLogWriter { - @Implementation - public void visible(Context context, int source, int category) { - - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java index cb185a501bb..90c59105b40 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java @@ -19,64 +19,16 @@ package com.android.settings.testutils.shadow; import android.hardware.fingerprint.Fingerprint; import android.hardware.fingerprint.FingerprintManager; -import androidx.annotation.NonNull; - -import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; -import org.robolectric.shadow.api.Shadow; -import java.util.Arrays; -import java.util.Collections; import java.util.List; -import java.util.stream.IntStream; @Implements(FingerprintManager.class) public class ShadowFingerprintManager extends org.robolectric.shadows.ShadowFingerprintManager { - - public boolean hardwareDetected = true; - - @NonNull - private List mFingerprints = Collections.emptyList(); - - @Implementation - protected boolean isHardwareDetected() { - return hardwareDetected; - } - - @Implementation - protected boolean hasEnrolledFingerprints() { - return !mFingerprints.isEmpty(); - } - - @Implementation - protected List getEnrolledFingerprints() { - return mFingerprints; - } - @Implementation protected List getEnrolledFingerprints(int userId) { - return mFingerprints; - } - - public void setEnrolledFingerprints(Fingerprint... fingerprints) { - mFingerprints = Arrays.asList(fingerprints); - } - - public void setDefaultFingerprints(int num) { - setEnrolledFingerprints( - IntStream.range(0, num) - .mapToObj(i -> new Fingerprint( - "Fingerprint " + i, - 0, /* groupId */ - i, /* fingerId */ - 0 /* deviceId */)) - .toArray(Fingerprint[]::new)); - } - - public static ShadowFingerprintManager get() { - return (ShadowFingerprintManager) Shadow.extract( - RuntimeEnvironment.application.getSystemService(FingerprintManager.class)); + return getEnrolledFingerprints(); } } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFragment.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFragment.java index 050b292cdb6..a70d4d6baf7 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFragment.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFragment.java @@ -17,31 +17,22 @@ package com.android.settings.testutils.shadow; import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; -/** - * Override the {@link #setTargetFragment(Fragment, int)} to skip an illegal state exception - * in SDK 26. SDK 26 requires that the target fragment be in the same {@link FragmentManager} as - * the current {@link Fragment}. This is infeasible with our current framework. - */ -@Implements( - value = Fragment.class, - minSdk = 26 -) +@Implements(value = Fragment.class) public class ShadowFragment { private Fragment mTargetFragment; @Implementation - public void setTargetFragment(Fragment fragment, int requestCode) { + protected void setTargetFragment(Fragment fragment, int requestCode) { mTargetFragment = fragment; } @Implementation - final public Fragment getTargetFragment() { + protected Fragment getTargetFragment() { return mTargetFragment; } } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowHelpUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowHelpUtils.java index 98735022045..7d5fd87b829 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowHelpUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowHelpUtils.java @@ -42,7 +42,7 @@ public class ShadowHelpUtils { } @Implementation - public static Intent getHelpIntent(Context context, String helpUriString, + protected static Intent getHelpIntent(Context context, String helpUriString, String backupContext) { mGetHelpIntentCalled = true; return new Intent().setClassName( diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowInputDevice.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowInputDevice.java index 4dec502d483..c21f7cc1d22 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowInputDevice.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowInputDevice.java @@ -36,12 +36,12 @@ public class ShadowInputDevice extends org.robolectric.shadows.ShadowInputDevice private int mDeviceId; @Implementation - public static int[] getDeviceIds() { + protected static int[] getDeviceIds() { return sDeviceIds; } @Implementation - public static InputDevice getDevice(int id) { + protected static InputDevice getDevice(int id) { return sDeviceMap.get(id); } @@ -56,7 +56,7 @@ public class ShadowInputDevice extends org.robolectric.shadows.ShadowInputDevice } @Implementation - public int getId() { + protected int getId() { return mDeviceId; } @@ -70,6 +70,4 @@ public class ShadowInputDevice extends org.robolectric.shadows.ShadowInputDevice public void setId(int id) { mDeviceId = id; } - } - diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowInputManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowInputManager.java index 5b09645ac99..c0f71342b8c 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowInputManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowInputManager.java @@ -27,31 +27,31 @@ import org.robolectric.annotation.Implements; import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; -import java.util.Collections; import java.util.List; -/* - * Shadow for {@ InputManager} that has assessors for registered {@link InputDeviceListener}s. +/** + * Shadow for {@link InputManager} that has accessors for registered + * {@link InputManager.InputDeviceListener}s. */ @Implements(value = InputManager.class, callThroughByDefault = false) public class ShadowInputManager { - private ArrayList mInputDeviceListeners; + private List mInputDeviceListeners; @Implementation - public void __constructor__(IInputManager service) { + protected void __constructor__(IInputManager service) { mInputDeviceListeners = new ArrayList<>(); } @Implementation - public static InputManager getInstance() { + protected static InputManager getInstance() { return ReflectionHelpers.callConstructor( InputManager.class, from(IInputManager.class, null)); } @Implementation - public void registerInputDeviceListener(InputManager.InputDeviceListener listener, + protected void registerInputDeviceListener(InputManager.InputDeviceListener listener, Handler handler) { // TODO: Use handler. if (!mInputDeviceListeners.contains(listener)) { @@ -60,14 +60,7 @@ public class ShadowInputManager { } @Implementation - public void unregisterInputDeviceListener(InputManager.InputDeviceListener listener) { - if (mInputDeviceListeners.contains(listener)) { - mInputDeviceListeners.remove(listener); - } - } - - // Non-Android accessor. - public List getRegisteredInputDeviceListeners() { - return Collections.unmodifiableList(mInputDeviceListeners); + protected void unregisterInputDeviceListener(InputManager.InputDeviceListener listener) { + mInputDeviceListeners.remove(listener); } } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowInputMethodManagerWithMethodList.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowInputMethodManagerWithMethodList.java index 0b7d69ba3a6..98022477a6f 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowInputMethodManagerWithMethodList.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowInputMethodManagerWithMethodList.java @@ -42,7 +42,7 @@ public class ShadowInputMethodManagerWithMethodList extends ShadowInputMethodMan } @Implementation - public List getInputMethodList() { + protected List getInputMethodList() { return mInputMethodInfos; } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowKeyStore.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowKeyStore.java index c025a33a2f5..098dcfc357e 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowKeyStore.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowKeyStore.java @@ -33,7 +33,7 @@ public class ShadowKeyStore { } @Implementation - public boolean isHardwareBacked() { + protected boolean isHardwareBacked() { return sIsHardwareBacked; } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLocalBluetoothAdapter.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLocalBluetoothAdapter.java deleted file mode 100644 index ddac6c71a68..00000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLocalBluetoothAdapter.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2018 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.testutils.shadow; - -import com.android.settingslib.bluetooth.LocalBluetoothAdapter; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; - -@Implements(LocalBluetoothAdapter.class) -public class ShadowLocalBluetoothAdapter { - - private static String sName; - private boolean isBluetoothEnabled = true; - - public static void setName(String name) { - sName = name; - } - - @Implementation - public String getName() { - return sName; - } - - @Implementation - public boolean isEnabled() { - return isBluetoothEnabled; - } - - @Implementation - public boolean enable() { - isBluetoothEnabled = true; - return true; - } - - @Implementation - public boolean disable() { - isBluetoothEnabled = false; - return true; - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLocalBluetoothProfileManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLocalBluetoothProfileManager.java deleted file mode 100644 index 9e64e34f3b2..00000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLocalBluetoothProfileManager.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2018 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.testutils.shadow; - -import android.content.Context; - -import com.android.settingslib.bluetooth.BluetoothEventManager; -import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; -import com.android.settingslib.bluetooth.LocalBluetoothAdapter; -import com.android.settingslib.bluetooth.LocalBluetoothProfileManager; - -import org.robolectric.annotation.Implements; - -@Implements(LocalBluetoothProfileManager.class) -public class ShadowLocalBluetoothProfileManager { - - public void __constructor__(Context context, - LocalBluetoothAdapter adapter, - CachedBluetoothDeviceManager deviceManager, - BluetoothEventManager eventManager) { - - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java index 86276689b57..663ab91e580 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java @@ -29,45 +29,34 @@ import java.util.List; @Implements(LockPatternUtils.class) public class ShadowLockPatternUtils { - private int mPasswordQuality = 1; private static boolean sDeviceEncryptionEnabled; @Implementation - public boolean isSecure(int id) { + protected boolean isSecure(int id) { return true; } @Implementation - public int getActivePasswordQuality(int userId) { + protected int getActivePasswordQuality(int userId) { return DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED; } @Implementation - public int getKeyguardStoredPasswordQuality(int userHandle) { - return mPasswordQuality; + protected int getKeyguardStoredPasswordQuality(int userHandle) { + return 1; } @Implementation - public static boolean isDeviceEncryptionEnabled() { + protected static boolean isDeviceEncryptionEnabled() { return sDeviceEncryptionEnabled; } @Implementation - public List getEnabledTrustAgents(int userId) { + protected List getEnabledTrustAgents(int userId) { return null; } public static void setDeviceEncryptionEnabled(boolean deviceEncryptionEnabled) { sDeviceEncryptionEnabled = deviceEncryptionEnabled; } - - // Non-Android accessor. - public int getPasswordQuality() { - return mPasswordQuality; - } - - // Non-Android accessor. - public void setPasswordQuality(int passwordQuality) { - mPasswordQuality = passwordQuality; - } } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowMediaRouter.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowMediaRouter.java deleted file mode 100644 index a69fabaa93a..00000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowMediaRouter.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 2018 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.testutils.shadow; - -import static org.robolectric.RuntimeEnvironment.application; - -import android.media.MediaRouter; - -import org.robolectric.annotation.Implements; -import org.robolectric.shadow.api.Shadow; - -import java.util.concurrent.CopyOnWriteArrayList; - -@Implements(value = MediaRouter.class) -public class ShadowMediaRouter extends org.robolectric.shadows.ShadowMediaRouter { - MediaRouter.RouteInfo mSelectedRoute; - - final CopyOnWriteArrayList mCallbacks = - new CopyOnWriteArrayList<>(); - - public MediaRouter.RouteInfo getSelectedRoute(int type) { - return mSelectedRoute; - } - - public void addCallback(int types, MediaRouter.Callback cb) { - mCallbacks.add(cb); - } - - public void removeCallback(MediaRouter.Callback cb) { - if (mCallbacks.contains(cb)) { - mCallbacks.remove(cb); - } - } - - public static ShadowMediaRouter getShadow() { - return Shadow.extract(application.getSystemService(MediaRouter.class)); - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowNfcAdapter.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowNfcAdapter.java index 07c8e544d6a..fb8c068f3ba 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowNfcAdapter.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowNfcAdapter.java @@ -36,30 +36,30 @@ public class ShadowNfcAdapter { private boolean mIsNfcEnabled = false; @Implementation - public void enableReaderMode(Activity activity, NfcAdapter.ReaderCallback callback, int flags, - Bundle extras) { + protected void enableReaderMode(Activity activity, NfcAdapter.ReaderCallback callback, + int flags, Bundle extras) { sReaderModeEnabled = true; } @Implementation - public static NfcAdapter getDefaultAdapter(Context context) { + protected static NfcAdapter getDefaultAdapter(Context context) { return ReflectionHelpers.callConstructor( NfcAdapter.class, ClassParameter.from(Context.class, context)); } @Implementation - public boolean isEnabled() { + protected boolean isEnabled() { return mIsNfcEnabled; } @Implementation - public boolean enable() { + protected boolean enable() { mIsNfcEnabled = true; return true; } @Implementation - public boolean disable() { + protected boolean disable() { mIsNfcEnabled = false; return true; } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowNotificationManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowNotificationManager.java index 307870319b6..a1b1a23b547 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowNotificationManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowNotificationManager.java @@ -27,15 +27,13 @@ public class ShadowNotificationManager { private int mZenMode; - @Implementation - public void setZenMode(int mode, Uri conditionId, String reason) { + protected void setZenMode(int mode, Uri conditionId, String reason) { mZenMode = mode; } @Implementation - public int getZenMode() { + protected int getZenMode() { return mZenMode; } } - diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowOs.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowOs.java index d1ac84c60a2..72dfcb80de7 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowOs.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowOs.java @@ -40,7 +40,7 @@ public class ShadowOs { private static final byte[] IPV6_BYTES = new byte[16]; @Implementation - public static InetAddress inet_pton(int family, String address) { + protected static InetAddress inet_pton(int family, String address) { if ((AF_INET == family && IPV4_PATTERN.matcher(address).find()) || (AF_INET6 == family && IPV6_PATTERN.matcher(address).find())) { try { diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPackageMonitor.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPackageMonitor.java deleted file mode 100644 index 5a5f076ca04..00000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPackageMonitor.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (C) 2016 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.testutils.shadow; - -import static org.robolectric.util.ReflectionHelpers.ClassParameter.from; - -import android.content.Context; -import android.os.Looper; -import android.os.UserHandle; - -import com.android.internal.content.PackageMonitor; -import com.android.internal.os.BackgroundThread; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; -import org.robolectric.annotation.RealObject; -import org.robolectric.shadow.api.Shadow; -import org.robolectric.shadows.ShadowApplication; -import org.robolectric.shadows.ShadowMessageQueue; - -/* - * Shadow for hidden {@link PackageMonitor}. - */ -@Implements(value = PackageMonitor.class, isInAndroidSdk = false) -public class ShadowPackageMonitor { - - @RealObject - private PackageMonitor mPackageMonitor; - - @Implementation - public void register(Context context, Looper thread, UserHandle user, boolean externalStorage) { - // Call through to @RealObject's method. - Shadow.directlyOn(mPackageMonitor, PackageMonitor.class, "register", - from(Context.class, context), from(Looper.class, thread), - from(UserHandle.class, user), from(Boolean.TYPE, externalStorage)); - // When thread is null, the {@link BackgroundThread} is used. Here we have to - // setup background Robolectric scheduler for it. - if (thread == null) { - setupBackgroundThreadScheduler(); - } - } - - private static void setupBackgroundThreadScheduler() { - ShadowMessageQueue shadowMessageQueue = Shadow.extract( - BackgroundThread.getHandler().getLooper().getQueue()); - shadowMessageQueue.setScheduler( - ShadowApplication.getInstance().getBackgroundThreadScheduler()); - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowParcel.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowParcel.java index 6e42fea56d5..665e415aa53 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowParcel.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowParcel.java @@ -16,17 +16,17 @@ public class ShadowParcel { public static boolean sReadBoolResult; @Implementation - public int readInt() { + protected int readInt() { return sReadIntResult; } @Implementation - public void writeInt(int val) { + protected void writeInt(int val) { sWriteIntResult = val; } @Implementation - public boolean readBoolean() { + protected boolean readBoolean() { return sReadBoolResult; } } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPermissionChecker.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPermissionChecker.java deleted file mode 100644 index 35c6630ba47..00000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPermissionChecker.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright (C) 2017 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.testutils.shadow; - -import android.content.Context; -import android.content.pm.PackageManager; -import android.text.TextUtils; - -import androidx.annotation.NonNull; -import androidx.core.content.PermissionChecker; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; - -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; - -/** - * This class provides shadow for API that is not supported in current roboletric - */ -@Implements(PermissionChecker.class) -public class ShadowPermissionChecker { - - private static Map sPermissions = new HashMap<>(); - - public static void clear() { - sPermissions.clear(); - } - - public static void addPermission(String permission, int pid, int uid, String packageName, - int permissionValue) { - sPermissions.put(new PermissionInfo(permission, pid, uid, packageName), permissionValue); - } - - @Implementation - public static int checkPermission(@NonNull Context context, @NonNull String permission, - int pid, int uid, String packageName) { - return sPermissions.getOrDefault(new PermissionInfo(permission, pid, uid, packageName), - PackageManager.PERMISSION_DENIED); - } - - private static class PermissionInfo { - private final int mPid; - private final int mUid; - private final String mPackageName; - private final String mPermission; - - public PermissionInfo(String permission, int pid, int uid, String packageName) { - mPid = pid; - mUid = uid; - mPackageName = packageName; - mPermission = permission; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (!(obj instanceof PermissionInfo)) { - return false; - } - - final PermissionInfo other = (PermissionInfo) obj; - return mPid == other.mPid - && mUid == other.mUid - && TextUtils.equals(mPackageName, other.mPackageName) - && TextUtils.equals(mPermission, other.mPermission); - } - - @Override - public int hashCode() { - return Objects.hash(mPid, mUid, mPackageName, mPermission); - } - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPowerManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPowerManager.java index 9fcc599b1c9..22c38bec7e4 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPowerManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPowerManager.java @@ -26,22 +26,22 @@ import org.robolectric.annotation.Implements; public class ShadowPowerManager { @Implementation - public int getMinimumScreenBrightnessSetting() { + protected int getMinimumScreenBrightnessSetting() { return 0; } @Implementation - public int getMaximumScreenBrightnessSetting() { + protected int getMaximumScreenBrightnessSetting() { return 0; } @Implementation - public int getMinimumScreenBrightnessForVrSetting() { + protected int getMinimumScreenBrightnessForVrSetting() { return 0; } @Implementation - public int getMaximumScreenBrightnessForVrSetting() { + protected int getMaximumScreenBrightnessForVrSetting() { return 0; } } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPowerWhitelistBackend.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPowerWhitelistBackend.java index 4500b23b2a4..c40e9c9b936 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPowerWhitelistBackend.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPowerWhitelistBackend.java @@ -22,7 +22,7 @@ import org.robolectric.annotation.Implements; @Implements(PowerWhitelistBackend.class) public class ShadowPowerWhitelistBackend { - public void __constructor__() { + protected void __constructor__() { // Do nothing } } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowProcess.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowProcess.java deleted file mode 100644 index eea3ee896e7..00000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowProcess.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.android.settings.testutils.shadow; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; - -@Implements(android.os.Process.class) -public class ShadowProcess { - private static int sUid; - - public static void setMyUid(int uid) { - sUid = uid; - } - - @Implementation - public static int myUid() { - return sUid; - } -} \ No newline at end of file diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRecoverySystem.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRecoverySystem.java index 3a98a0b8d45..836b1c8a0f8 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRecoverySystem.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRecoverySystem.java @@ -29,7 +29,7 @@ public class ShadowRecoverySystem { private static int sWipeEuiccCalledCount; @Implementation - public static boolean wipeEuiccData(Context context, final String packageName) { + protected static boolean wipeEuiccData(Context context, final String packageName) { sWipeEuiccCalledCount++; return true; } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtils.java index c054656547e..ceb032cf4ba 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtils.java @@ -29,7 +29,7 @@ public class ShadowRestrictedLockUtils { private static boolean sAdminSupportDetailsIntentLaunched; @Implementation - public static void sendShowAdminSupportDetailsIntent(Context context, EnforcedAdmin admin) { + protected static void sendShowAdminSupportDetailsIntent(Context context, EnforcedAdmin admin) { sAdminSupportDetailsIntentLaunched = true; } @@ -40,6 +40,4 @@ public class ShadowRestrictedLockUtils { public static void clearAdminSupportDetailsIntentLaunch() { sAdminSupportDetailsIntentLaunched = false; } - - } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtilsInternal.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtilsInternal.java index 150843194ae..e39056cedf3 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtilsInternal.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtilsInternal.java @@ -48,7 +48,7 @@ public class ShadowRestrictedLockUtilsInternal { } @Implementation - public static EnforcedAdmin checkIfMeteredDataRestricted(Context context, + protected static EnforcedAdmin checkIfMeteredDataRestricted(Context context, String packageName, int userId) { if (sIsRestricted) { return new EnforcedAdmin(); @@ -60,7 +60,7 @@ public class ShadowRestrictedLockUtilsInternal { } @Implementation - public static EnforcedAdmin checkIfAccountManagementDisabled(Context context, + protected static EnforcedAdmin checkIfAccountManagementDisabled(Context context, String accountType, int userId) { if (accountType == null) { return null; @@ -79,25 +79,25 @@ public class ShadowRestrictedLockUtilsInternal { } @Implementation - public static EnforcedAdmin checkIfKeyguardFeaturesDisabled(Context context, + protected static EnforcedAdmin checkIfKeyguardFeaturesDisabled(Context context, int features, final @UserIdInt int userId) { return (sKeyguardDisabledFeatures & features) == 0 ? null : new EnforcedAdmin(); } @Implementation - public static boolean hasBaseUserRestriction(Context context, + protected static boolean hasBaseUserRestriction(Context context, String userRestriction, int userId) { return sIsRestricted; } @Implementation - public static EnforcedAdmin checkIfRestrictionEnforced(Context context, + protected static EnforcedAdmin checkIfRestrictionEnforced(Context context, String userRestriction, int userId) { return sIsRestricted ? new EnforcedAdmin() : null; } @Implementation - public static EnforcedAdmin checkIfMaximumTimeToLockIsSet(Context context) { + protected static EnforcedAdmin checkIfMaximumTimeToLockIsSet(Context context) { return sMaximumTimeToLockIsSet ? new EnforcedAdmin() : null; } @@ -132,5 +132,4 @@ public class ShadowRestrictedLockUtilsInternal { public static void setMaximumTimeToLockIsSet(boolean isSet) { sMaximumTimeToLockIsSet = isSet; } - } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictionUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictionUtils.java index 372116ca95d..90292f1bd81 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictionUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictionUtils.java @@ -13,7 +13,7 @@ public class ShadowRestrictionUtils { private static boolean isRestricted = false; @Implementation - public EnforcedAdmin checkIfRestrictionEnforced(Context context, String restriction) { + protected EnforcedAdmin checkIfRestrictionEnforced(Context context, String restriction) { if (isRestricted) { return new EnforcedAdmin(); } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRotationPolicy.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRotationPolicy.java index 47566cc34a7..a99c80e665d 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRotationPolicy.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRotationPolicy.java @@ -25,20 +25,22 @@ import org.robolectric.annotation.Implements; @Implements(RotationPolicy.class) public class ShadowRotationPolicy { + private static boolean rotationLockEnabled = false; private static boolean rotationSupported = true; + @Implementation - public static void setRotationLock(Context context, final boolean enabled) { + protected static void setRotationLock(Context context, final boolean enabled) { rotationLockEnabled = enabled; } @Implementation - public static boolean isRotationLocked(Context context) { + protected static boolean isRotationLocked(Context context) { return rotationLockEnabled; } @Implementation - public static boolean isRotationSupported(Context context) { + protected static boolean isRotationSupported(Context context) { return rotationSupported; } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRunnableAsyncTask.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRunnableAsyncTask.java deleted file mode 100644 index d35ea5cb535..00000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRunnableAsyncTask.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2017 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.testutils.shadow; - -import android.os.AsyncTask; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; -import org.robolectric.shadows.ShadowAsyncTask; - -import java.util.concurrent.Executor; - -/** - * Shadow async task to handle runnables in roboletric - */ -@Implements(AsyncTask.class) -public class ShadowRunnableAsyncTask extends - ShadowAsyncTask { - - @Implementation - public AsyncTask executeOnExecutor(Executor executor, - Params... params) { - return super.execute(params); - } -} \ No newline at end of file diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRuntimePermissionPresenter.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRuntimePermissionPresenter.java deleted file mode 100644 index e0576b2e6db..00000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRuntimePermissionPresenter.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2017 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.testutils.shadow; - -import android.content.Context; -import android.permission.RuntimePermissionPresenter; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; - -@Implements(RuntimePermissionPresenter.class) -public class ShadowRuntimePermissionPresenter { - private static RuntimePermissionPresenter mRuntimePermissionPresenter; - - @Implementation - public static RuntimePermissionPresenter getInstance(Context context) { - return mRuntimePermissionPresenter; - } - - public static void setRuntimePermissionPresenter( - RuntimePermissionPresenter runtimePermissionPresenter) { - mRuntimePermissionPresenter = runtimePermissionPresenter; - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSettingsPreferenceFragment.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSettingsPreferenceFragment.java deleted file mode 100644 index e5f95c37d04..00000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSettingsPreferenceFragment.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2017 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.testutils.shadow; - -import android.os.Bundle; - -import com.android.settings.SettingsPreferenceFragment; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; - -/** - * Shadow of {@link SettingsPreferenceFragment}. - * - * Override the {@link #onCreate(Bundle)} to skip a null pointer exception in - * {@link android.content.res.Resources.Theme}, much the same as {@link ShadowDashboardFragment}. - */ -@Implements(SettingsPreferenceFragment.class) -public class ShadowSettingsPreferenceFragment { - - @Implementation - public void onCreate(Bundle savedInstanceState) { - // do nothing - } -} \ No newline at end of file diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowShortcutManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowShortcutManager.java deleted file mode 100644 index 825e5aa3c4a..00000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowShortcutManager.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (C) 2018 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.testutils.shadow; - -import static org.robolectric.RuntimeEnvironment.application; - -import android.content.pm.ShortcutInfo; -import android.content.pm.ShortcutManager; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; -import org.robolectric.annotation.Resetter; -import org.robolectric.shadow.api.Shadow; - -import java.util.List; - -@Implements(ShortcutManager.class) -public class ShadowShortcutManager extends org.robolectric.shadows.ShadowShortcutManager { - - private List mPinnedShortcuts; - private List mLastUpdatedShortcuts; - - @Resetter - public void reset() { - mPinnedShortcuts = null; - mLastUpdatedShortcuts = null; - } - - public static ShadowShortcutManager get() { - return Shadow.extract(application.getSystemService(ShortcutManager.class)); - } - - @Implementation - public boolean updateShortcuts(List shortcutInfoList) { - mLastUpdatedShortcuts = shortcutInfoList; - return true; - } - - public List getLastUpdatedShortcuts() { - return mLastUpdatedShortcuts; - } - - @Implementation - public List getPinnedShortcuts() { - return mPinnedShortcuts; - } - - public void setPinnedShortcuts(List shortcutInfos) { - mPinnedShortcuts = shortcutInfos; - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowStorageManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowStorageManager.java index 366dd915eb9..a8185a412d8 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowStorageManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowStorageManager.java @@ -48,27 +48,27 @@ public class ShadowStorageManager { } @Implementation - public VolumeInfo findVolumeById(String id) { + protected VolumeInfo findVolumeById(String id) { return createVolumeInfo(id); } @Implementation - public DiskInfo findDiskById(String id) { + protected DiskInfo findDiskById(String id) { return new DiskInfo(id, DiskInfo.FLAG_SD); } @Implementation - public VolumeRecord findRecordByUuid(String fsUuid) { + protected VolumeRecord findRecordByUuid(String fsUuid) { return createVolumeRecord(fsUuid); } @Implementation - public void unmount(String volId) { + protected void unmount(String volId) { sIsUnmountCalled = true; } @Implementation - public void forgetVolume(String fsUuid) { + protected void forgetVolume(String fsUuid) { sIsForgetCalled = true; } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSystemSettings.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSystemSettings.java deleted file mode 100644 index e50a7692f47..00000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSystemSettings.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright (C) 2017 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.testutils.shadow; - - -import android.content.ContentResolver; -import android.provider.Settings; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; - -import java.util.HashMap; -import java.util.Map; - -@Implements(Settings.System.class) -public class ShadowSystemSettings { - - private static final Map sValueMap = new HashMap<>(); - - @Implementation - public static boolean putInt(ContentResolver resolver, String name, int value) { - sValueMap.put(name, value); - return true; - } - - @Implementation - public static boolean putString(ContentResolver resolver, String name, String value) { - sValueMap.put(name, value); - return true; - } - - @Implementation - public static String getString(ContentResolver resolver, String name) { - return (String) sValueMap.get(name); - } - - @Implementation - public static String getStringForUser(ContentResolver resolver, String name, int userHandle) { - return getString(resolver, name); - } - - @Implementation - public static boolean putIntForUser(ContentResolver cr, String name, int value, - int userHandle) { - return putInt(cr, name, value); - } - - @Implementation - public static int getIntForUser(ContentResolver cr, String name, int def, int userHandle) { - return getInt(cr, name, def); - } - - @Implementation - public static int getInt(ContentResolver resolver, String name, int defaultValue) { - Integer value = (Integer) sValueMap.get(name); - return value == null ? defaultValue : value; - } - - public static void reset() { - sValueMap.clear(); - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTextUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTextUtils.java deleted file mode 100644 index b465521448a..00000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTextUtils.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (C) 2016 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.testutils.shadow; - -import android.icu.util.ULocale; -import android.os.SystemProperties; -import android.provider.Settings; -import android.text.TextUtils; -import android.view.View; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; - -import java.util.Locale; - -/** - * Important: The current robolectric doesn't support API 24, so I copy the code - * from API 24 here to make it compatible. Once robolectric is upgraded to 24, - * We can delete this shadow class. - **/ -@Implements(TextUtils.class) -public class ShadowTextUtils { - - @Implementation - public static int getLayoutDirectionFromLocale(Locale locale) { - return ((locale != null && !locale.equals(Locale.ROOT) - && ULocale.forLocale(locale).isRightToLeft()) - // If forcing into RTL layout mode, return RTL as default - || SystemProperties.getBoolean(Settings.Global.DEVELOPMENT_FORCE_RTL, false)) - ? View.LAYOUT_DIRECTION_RTL - : View.LAYOUT_DIRECTION_LTR; - } - -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowThreadUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowThreadUtils.java index 9513098e862..285d88ddb47 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowThreadUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowThreadUtils.java @@ -33,22 +33,21 @@ public class ShadowThreadUtils { } @Implementation - public static void postOnBackgroundThread(Runnable runnable) { + protected static void postOnBackgroundThread(Runnable runnable) { runnable.run(); } @Implementation - public static void postOnMainThread(Runnable runnable) { + protected static void postOnMainThread(Runnable runnable) { runnable.run(); } @Implementation - public static boolean isMainThread() { + protected static boolean isMainThread() { return sIsMainThread; } public static void setIsMainThread(boolean isMainThread) { sIsMainThread = isMainThread; } - } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTileService.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTileService.java deleted file mode 100644 index 2270ff33834..00000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTileService.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.android.settings.testutils.shadow; - -import android.content.Intent; -import android.service.quicksettings.Tile; -import android.service.quicksettings.TileService; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; -import org.robolectric.annotation.RealObject; -import org.robolectric.shadows.ShadowService; - -/** - * Shadow for {@link TileService}. - */ -@Implements(TileService.class) -public class ShadowTileService extends ShadowService { - - @RealObject TileService realService; - - private Tile mTile; - - public void __constructor__() { } - - @Implementation - public final Tile getQsTile() { - return mTile; - } - - @Implementation - public final void startActivityAndCollapse(Intent intent) { - realService.startActivity(intent); - } - - // Non-Android setter. - public void setTile(Tile tile) { - mTile = tile; - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTileUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTileUtils.java index 1409daa23dc..722df7757d6 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTileUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTileUtils.java @@ -32,19 +32,17 @@ import java.util.Map; @Implements(TileUtils.class) public class ShadowTileUtils { - public static final int ICON_RES_ID = R.drawable.ic_settings; public static final String MOCK_SUMMARY = "summary"; @Implementation - public static String getTextFromUri(Context context, String uriString, + protected static String getTextFromUri(Context context, String uriString, Map providerMap, String key) { return MOCK_SUMMARY; } @Implementation - public static Pair getIconFromUri(Context context, String packageName, + protected static Pair getIconFromUri(Context context, String packageName, String uriString, Map providerMap) { - return Pair.create(RuntimeEnvironment.application.getPackageName(), ICON_RES_ID); + return Pair.create(RuntimeEnvironment.application.getPackageName(), R.drawable.ic_settings); } - } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTimeZoneNames.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTimeZoneNames.java deleted file mode 100644 index 2bcc92a28ad..00000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTimeZoneNames.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (C) 2016 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.testutils.shadow; - -import android.icu.text.TimeZoneNames; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; - -/** - * TimeZoneNames.getDisplayName tries to access files which doesn't exist for Robolectric. Stub it - * out for a naive implementation. - */ -@Implements(TimeZoneNames.class) -public class ShadowTimeZoneNames { - - @Implementation - public String getDisplayName(String tzID, TimeZoneNames.NameType type, long date) { - return "[DisplayName]" + tzID; - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java index 092795601c7..4797e8c68fb 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java @@ -21,13 +21,9 @@ import android.content.Context; import android.hardware.fingerprint.FingerprintManager; import android.os.UserHandle; import android.os.UserManager; -import android.util.Log; import com.android.settings.Utils; -import com.android.settings.overlay.FeatureFactory; -import com.android.settings.search.SearchFeatureProviderImpl; -import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; @@ -44,12 +40,12 @@ public class ShadowUtils { private static Map sAppNameMap; @Implementation - public static int enforceSameOwner(Context context, int userId) { + protected static int enforceSameOwner(Context context, int userId) { return userId; } @Implementation - public static FingerprintManager getFingerprintManagerOrNull(Context context) { + protected static FingerprintManager getFingerprintManagerOrNull(Context context) { return sFingerprintManager; } @@ -80,7 +76,7 @@ public class ShadowUtils { * Returns true if Monkey is running. */ @Implementation - public static boolean isMonkeyRunning() { + protected static boolean isMonkeyRunning() { return sIsUserAMonkey; } @@ -89,17 +85,17 @@ public class ShadowUtils { } @Implementation - public static ComponentName getDeviceOwnerComponent(Context context) { + protected static ComponentName getDeviceOwnerComponent(Context context) { return sDeviceOwnerComponentName; } @Implementation - public static int getManagedProfileId(UserManager um, int parentUserId) { + protected static int getManagedProfileId(UserManager um, int parentUserId) { return UserHandle.USER_NULL; } @Implementation - public static CharSequence getApplicationLabel(Context context, String packageName) { + protected static CharSequence getApplicationLabel(Context context, String packageName) { if (sAppNameMap != null) { return sAppNameMap.get(packageName); } @@ -107,7 +103,7 @@ public class ShadowUtils { } @Implementation - public static boolean isPackageEnabled(Context context, String packageName) { + protected static boolean isPackageEnabled(Context context, String packageName) { return true; } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowWifiManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowWifiManager.java index b41b396dd66..19cdfe327aa 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowWifiManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowWifiManager.java @@ -37,23 +37,23 @@ public class ShadowWifiManager extends org.robolectric.shadows.ShadowWifiManager @HiddenApi // @SystemApi @Implementation - public void connect(WifiConfiguration config, WifiManager.ActionListener listener) { + protected void connect(WifiConfiguration config, WifiManager.ActionListener listener) { savedWifiConfig = config; } @HiddenApi @Implementation - public void save(WifiConfiguration config, WifiManager.ActionListener listener) { + protected void save(WifiConfiguration config, WifiManager.ActionListener listener) { savedWifiConfig = config; } @Implementation - public List getPasspointConfigurations() { + protected List getPasspointConfigurations() { return Collections.emptyList(); } @Implementation - public boolean isDualModeSupported() { + protected boolean isDualModeSupported() { return false; } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowWifiP2pManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowWifiP2pManager.java index 8c383470ab6..2fd8f6b5e36 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowWifiP2pManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowWifiP2pManager.java @@ -23,18 +23,15 @@ import org.robolectric.annotation.Implements; import org.robolectric.annotation.Resetter; /** - * Shadown class for WifiP2pManager. + * Shadow class for WifiP2pManager. */ @Implements(value = WifiP2pManager.class) public class ShadowWifiP2pManager extends org.robolectric.shadows.ShadowWifiP2pManager { private static int sFactoryResetCount; - /** - * factoryReset mock method. - */ @Implementation - public void factoryReset(WifiP2pManager.Channel c, WifiP2pManager.ActionListener listener) { + protected void factoryReset(WifiP2pManager.Channel c, WifiP2pManager.ActionListener listener) { if (c != null) { sFactoryResetCount++; } else { @@ -42,9 +39,6 @@ public class ShadowWifiP2pManager extends org.robolectric.shadows.ShadowWifiP2pM } } - /** - * Reset variables in shadow class. - */ @Resetter public static void reset() { sFactoryResetCount = 0; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowZoneGetter.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowZoneGetter.java deleted file mode 100644 index 655acf14798..00000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowZoneGetter.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (C) 2017 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.testutils.shadow; - -import android.content.Context; - -import com.android.settingslib.datetime.ZoneGetter; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.TimeZone; - -@Implements(ZoneGetter.class) -public class ShadowZoneGetter { - - @Implementation - public static List> getZonesList(Context context) { - List> zones = new ArrayList<>(); - zones.add(createDisplayEntry(TimeZone.getDefault(), "gmt-1:00", "FakePlace", 10000)); - return zones; - } - - private static Map createDisplayEntry( - TimeZone tz, CharSequence gmtOffsetText, CharSequence displayName, int offsetMillis) { - Map map = new HashMap<>(); - map.put(ZoneGetter.KEY_ID, tz.getID()); - map.put(ZoneGetter.KEY_DISPLAYNAME, displayName.toString()); - map.put(ZoneGetter.KEY_DISPLAY_LABEL, displayName); - map.put(ZoneGetter.KEY_GMT, gmtOffsetText.toString()); - map.put(ZoneGetter.KEY_OFFSET_LABEL, gmtOffsetText); - map.put(ZoneGetter.KEY_OFFSET, offsetMillis); - return map; - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowZoneGetterData.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowZoneGetterData.java deleted file mode 100644 index 1e6dbcedaf3..00000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowZoneGetterData.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 2017 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.testutils.shadow; - - -import android.icu.util.TimeZone; - -import com.android.settingslib.datetime.ZoneGetter; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; - -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@Implements(ZoneGetter.ZoneGetterData.class) -public class ShadowZoneGetterData { - private static final Map> TIME_ZONE_LOOKUP = new HashMap<>(); - - static { - TIME_ZONE_LOOKUP.put("FR", Collections.singletonList( - TimeZone.getTimeZone("Europe/Paris", TimeZone.TIMEZONE_JDK).getID())); - TIME_ZONE_LOOKUP.put("ML", Collections.singletonList( - TimeZone.getTimeZone("Europe/Amsterdam", TimeZone.TIMEZONE_JDK).getID())); - TIME_ZONE_LOOKUP.put("US", Arrays.asList( - TimeZone.getTimeZone("America/New_York", TimeZone.TIMEZONE_JDK).getID())); - TIME_ZONE_LOOKUP.put("JP", Collections.singletonList( - TimeZone.getTimeZone("Asia/Tokyo", TimeZone.TIMEZONE_JDK).getID())); - } - - @Implementation - public List lookupTimeZoneIdsByCountry(String country) { - return TIME_ZONE_LOOKUP.get(country); - } -} diff --git a/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java index 8093af57644..dd0260b6604 100644 --- a/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java @@ -27,7 +27,6 @@ import android.provider.Settings.Global; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settingslib.RestrictedSwitchPreference; @@ -36,10 +35,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowUserManager.class}) public class AddUserWhenLockedPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java index a7915283d91..95fc3f80637 100644 --- a/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.users; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Answers.RETURNS_DEEP_STUBS; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.when; import android.content.Context; @@ -31,20 +31,19 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AutoSyncDataPreferenceControllerTest { @Mock(answer = RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java index 1850f3a2253..70f516552a5 100644 --- a/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.users; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Answers.RETURNS_DEEP_STUBS; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.when; import android.content.Context; @@ -29,20 +29,19 @@ import androidx.fragment.app.Fragment; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AutoSyncPersonalDataPreferenceControllerTest { @Mock(answer = RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/users/AutoSyncWorkDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AutoSyncWorkDataPreferenceControllerTest.java index 9e185f59184..21b47590dfb 100644 --- a/tests/robotests/src/com/android/settings/users/AutoSyncWorkDataPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/AutoSyncWorkDataPreferenceControllerTest.java @@ -19,7 +19,7 @@ package com.android.settings.users; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Answers.RETURNS_DEEP_STUBS; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; import android.content.Context; @@ -29,8 +29,6 @@ import android.os.UserManager; import androidx.fragment.app.Fragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -39,8 +37,9 @@ import org.mockito.MockitoAnnotations; import java.util.ArrayList; import java.util.List; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AutoSyncWorkDataPreferenceControllerTest { private static final int MANAGED_PROFILE_ID = 10; diff --git a/tests/robotests/src/com/android/settings/users/EditUserInfoControllerTest.java b/tests/robotests/src/com/android/settings/users/EditUserInfoControllerTest.java index cd33b3907d4..b9dfbbbc8c3 100644 --- a/tests/robotests/src/com/android/settings/users/EditUserInfoControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/EditUserInfoControllerTest.java @@ -38,7 +38,6 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -46,9 +45,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.android.controller.ActivityController; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EditUserInfoControllerTest { @Mock private Fragment mFragment; @@ -69,7 +69,7 @@ public class EditUserInfoControllerTest { public class TestEditUserInfoController extends EditUserInfoController { private EditUserPhotoController mPhotoController; - public EditUserPhotoController getPhotoController() { + private EditUserPhotoController getPhotoController() { return mPhotoController; } diff --git a/tests/robotests/src/com/android/settings/users/MultiUserFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/MultiUserFooterPreferenceControllerTest.java index 94330a9124a..8342cf06e70 100644 --- a/tests/robotests/src/com/android/settings/users/MultiUserFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/MultiUserFooterPreferenceControllerTest.java @@ -23,14 +23,15 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) +@Ignore public class MultiUserFooterPreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/users/UserCapabilitiesTest.java b/tests/robotests/src/com/android/settings/users/UserCapabilitiesTest.java index 894def75a67..382ac5d364e 100644 --- a/tests/robotests/src/com/android/settings/users/UserCapabilitiesTest.java +++ b/tests/robotests/src/com/android/settings/users/UserCapabilitiesTest.java @@ -22,17 +22,16 @@ import android.content.Context; import android.os.UserHandle; import android.os.UserManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUserManager; -import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowUserManager.class}) public class UserCapabilitiesTest { diff --git a/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java index abdf4f513ff..36f0591da00 100644 --- a/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java @@ -24,8 +24,6 @@ import android.content.Context; import android.os.UserHandle; import android.os.UserManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -34,8 +32,9 @@ import org.mockito.MockitoAnnotations; import java.util.Arrays; import java.util.List; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class UserFeatureProviderImplTest { private static final int FIRST_USER_ID = 0; diff --git a/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java b/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java index ed79cf22ea9..345784aa51e 100644 --- a/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java @@ -25,7 +25,6 @@ import android.content.Context; import android.os.UserHandle; import android.view.View; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedPreferenceHelper; import org.junit.Before; @@ -33,10 +32,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class UserPreferenceTest { @Mock diff --git a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java index 62135fefb48..b682388dde9 100644 --- a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java +++ b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java @@ -19,9 +19,9 @@ package com.android.settings.users; import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.notNull; -import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -51,18 +51,19 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.dashboard.SummaryLoader; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowDevicePolicyManager; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settingslib.RestrictedPreference; 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; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.android.controller.ActivityController; import org.robolectric.annotation.Config; @@ -71,12 +72,8 @@ import org.robolectric.util.ReflectionHelpers; import java.util.Collections; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) -@Config( - shadows = { - ShadowUserManager.class, - ShadowDevicePolicyManager.class - }) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = {ShadowUserManager.class, ShadowDevicePolicyManager.class}) public class UserSettingsTest { private static final String KEY_USER_GUEST = "user_guest"; @@ -209,6 +206,7 @@ public class UserSettingsTest { } @Test + @Ignore public void updateUserList_cannotAddUserButCanSwitchUser_shouldNotShowAddUser() { Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.DEVICE_PROVISIONED, 1); @@ -303,6 +301,7 @@ public class UserSettingsTest { } @Test + @Ignore public void updateUserList_canAddUserAndSwitchUser_shouldShowAddUser() { Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.DEVICE_PROVISIONED, 1); @@ -326,7 +325,5 @@ public class UserSettingsTest { mFragment.updateUserList(); verify(addUser).setVisible(true); - } - } diff --git a/tests/robotests/src/com/android/settings/utils/AnnotationSpanTest.java b/tests/robotests/src/com/android/settings/utils/AnnotationSpanTest.java index f1386a5ef89..c5db9ae07e3 100644 --- a/tests/robotests/src/com/android/settings/utils/AnnotationSpanTest.java +++ b/tests/robotests/src/com/android/settings/utils/AnnotationSpanTest.java @@ -22,16 +22,15 @@ import android.content.Context; import android.content.Intent; import android.content.pm.ResolveInfo; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.shadows.ShadowPackageManager; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AnnotationSpanTest { private Intent mTestIntent; diff --git a/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java b/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java index 23938a5ccae..f7702be0ffa 100644 --- a/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java +++ b/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java @@ -20,13 +20,12 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LocalClassLoaderContextThemeWrapperTest { private LocalClassLoaderContextThemeWrapper mContextThemeWrapper; diff --git a/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java b/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java index 8736d75975e..2b81f1683bc 100644 --- a/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java @@ -23,15 +23,14 @@ import android.content.pm.PackageInfo; import androidx.fragment.app.Fragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppDialogFragmentTest { @Mock diff --git a/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java b/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java index f8c08eaf27e..7856b06a0b3 100644 --- a/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java +++ b/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java @@ -23,12 +23,11 @@ import static org.mockito.Mockito.when; import android.net.ConnectivityManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public final class VpnUtilsTest { @Test public void testIsAlwaysOnVpnSet() { diff --git a/tests/robotests/src/com/android/settings/wallpaper/FallbackHomeActivityTest.java b/tests/robotests/src/com/android/settings/wallpaper/FallbackHomeActivityTest.java index 686eb82faf6..b89f4b37a40 100644 --- a/tests/robotests/src/com/android/settings/wallpaper/FallbackHomeActivityTest.java +++ b/tests/robotests/src/com/android/settings/wallpaper/FallbackHomeActivityTest.java @@ -20,20 +20,23 @@ import static com.google.common.truth.Truth.assertThat; import android.annotation.NonNull; import android.annotation.Nullable; +import android.app.Application; import android.app.WallpaperColors; import android.app.WallpaperManager; import android.app.WallpaperManager.OnColorsChangedListener; +import android.content.Context; import android.os.Handler; import com.android.settings.FallbackHome; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; +import org.robolectric.Shadows; import org.robolectric.android.controller.ActivityController; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; @@ -42,12 +45,9 @@ import org.robolectric.shadow.api.Shadow; import java.util.ArrayList; import java.util.List; +import org.robolectric.shadows.ShadowApplication; -/** - * Build/Install/Run: - * make RunSettingsRoboTests -j40 ROBOTEST_FILTER=FallbackHomeActivityTest - */ -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FallbackHomeActivityTest { private ActivityController mController; @@ -55,6 +55,12 @@ public class FallbackHomeActivityTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); + + final Application application = RuntimeEnvironment.application; + WallpaperManager wallpaperManager = WallpaperManager.getInstance(application); + ShadowApplication shadowApplication = Shadows.shadowOf(application); + shadowApplication.setSystemService(Context.WALLPAPER_SERVICE, wallpaperManager); + mController = Robolectric.buildActivity(FallbackHome.class); } @@ -73,7 +79,8 @@ public class FallbackHomeActivityTest { } @Implements(WallpaperManager.class) - public static class ShadowWallpaperManager { + public static class ShadowWallpaperManager extends + org.robolectric.shadows.ShadowWallpaperManager { private final List mListener = new ArrayList<>(); @@ -82,23 +89,23 @@ public class FallbackHomeActivityTest { } @Implementation - public boolean isWallpaperServiceEnabled() { + protected boolean isWallpaperServiceEnabled() { return true; } @Implementation - public @Nullable WallpaperColors getWallpaperColors(int which) { + protected @Nullable WallpaperColors getWallpaperColors(int which) { return null; } @Implementation - public void addOnColorsChangedListener(@NonNull OnColorsChangedListener listener, + protected void addOnColorsChangedListener(@NonNull OnColorsChangedListener listener, @NonNull Handler handler) { mListener.add(listener); } @Implementation - public void removeOnColorsChangedListener(@NonNull OnColorsChangedListener listener) { + protected void removeOnColorsChangedListener(@NonNull OnColorsChangedListener listener) { mListener.remove(listener); } } diff --git a/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java index 67d5dc60977..54a41a3935a 100644 --- a/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java +++ b/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java @@ -20,27 +20,27 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.when; +import android.app.Application; import android.app.WallpaperManager; import android.content.Context; import android.content.res.Resources; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.android.controller.ActivityController; +import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import org.robolectric.annotation.Resetter; +import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WallpaperSuggestionActivityTest { @Mock @@ -48,12 +48,14 @@ public class WallpaperSuggestionActivityTest { @Mock private Resources mResources; - private ActivityController mController; - @Before public void setUp() { MockitoAnnotations.initMocks(this); - mController = Robolectric.buildActivity(WallpaperSuggestionActivity.class); + + final Application application = RuntimeEnvironment.application; + WallpaperManager wallpaperManager = WallpaperManager.getInstance(application); + ShadowApplication shadowApplication = Shadows.shadowOf(application); + shadowApplication.setSystemService(Context.WALLPAPER_SERVICE, wallpaperManager); } @After @@ -89,7 +91,8 @@ public class WallpaperSuggestionActivityTest { } @Implements(WallpaperManager.class) - public static class ShadowWallpaperManager { + public static class ShadowWallpaperManager extends + org.robolectric.shadows.ShadowWallpaperManager { private static int sWallpaperId; @@ -103,12 +106,12 @@ public class WallpaperSuggestionActivityTest { } @Implementation - public boolean isWallpaperServiceEnabled() { + protected boolean isWallpaperServiceEnabled() { return true; } @Implementation - public int getWallpaperId(int which) { + protected int getWallpaperId(int which) { return sWallpaperId; } } diff --git a/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypePreferenceControllerTest.java index e5519a314b8..8871cc8bb27 100644 --- a/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypePreferenceControllerTest.java @@ -25,15 +25,15 @@ import android.content.Intent; import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WallpaperTypePreferenceControllerTest { private Context mContext; @@ -57,7 +57,7 @@ public class WallpaperTypePreferenceControllerTest { } @Test - public void testhandlePreferenceTreeClick_intentNull_shouldDoNothing() { + public void testHandlePreferenceTreeClick_intentNull_shouldDoNothing() { mPreference.setIntent(null); final boolean handled = mController.handlePreferenceTreeClick(mPreference); @@ -66,7 +66,7 @@ public class WallpaperTypePreferenceControllerTest { } @Test - public void testhandlePreferenceTreeClick_shouldLaunchIntent() { + public void testHandlePreferenceTreeClick_shouldLaunchIntent() { mPreference.setIntent(mIntent); final boolean handled = mController.handlePreferenceTreeClick(mPreference); diff --git a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java index 73d6b4a50cb..1435529a784 100644 --- a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java +++ b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java @@ -20,9 +20,9 @@ import static android.provider.Settings.ACTION_WEBVIEW_SETTINGS; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -44,7 +44,6 @@ import android.webkit.UserPackage; import androidx.fragment.app.FragmentActivity; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.RadioButtonPreference; import com.android.settingslib.applications.DefaultAppInfo; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; @@ -55,13 +54,14 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; import java.util.Arrays; import java.util.Collections; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WebViewAppPickerTest { private final static String DEFAULT_PACKAGE_NAME = "DEFAULT_PACKAGE_NAME"; diff --git a/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java b/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java index 3ae29d36bd6..a76a1df2ac1 100644 --- a/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java +++ b/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java @@ -32,15 +32,15 @@ import android.net.wifi.p2p.WifiP2pManager; import com.android.settings.R; import com.android.settings.dashboard.SummaryLoader; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiDisplaySettingsTest { @Mock diff --git a/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java b/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java index 454813fb14f..befac3fa2bc 100644 --- a/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java @@ -21,7 +21,7 @@ import static androidx.lifecycle.Lifecycle.Event.ON_STOP; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -33,7 +33,6 @@ import android.view.View; import androidx.lifecycle.LifecycleOwner; import androidx.recyclerview.widget.RecyclerView; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -41,9 +40,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ActionBarShadowControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/widget/AppCheckBoxPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/AppCheckBoxPreferenceTest.java index 5b72a51e964..57c6e01749e 100644 --- a/tests/robotests/src/com/android/settings/widget/AppCheckBoxPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/AppCheckBoxPreferenceTest.java @@ -25,14 +25,14 @@ import android.view.View; import androidx.preference.PreferenceViewHolder; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppCheckBoxPreferenceTest { private static final String SUMMARY = "summary info"; diff --git a/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java index ce366fe78de..aa5e3e768a2 100644 --- a/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java @@ -24,14 +24,14 @@ import android.view.View; import androidx.preference.PreferenceViewHolder; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppSwitchPreferenceTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/widget/AspectRatioFrameLayoutTest.java b/tests/robotests/src/com/android/settings/widget/AspectRatioFrameLayoutTest.java index 59a90c561f4..492a3273c6b 100644 --- a/tests/robotests/src/com/android/settings/widget/AspectRatioFrameLayoutTest.java +++ b/tests/robotests/src/com/android/settings/widget/AspectRatioFrameLayoutTest.java @@ -21,15 +21,14 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.view.View; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AspectRatioFrameLayoutTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/widget/BottomLabelLayoutTest.java b/tests/robotests/src/com/android/settings/widget/BottomLabelLayoutTest.java index 7b7bcfaa401..ea0d89ad81f 100644 --- a/tests/robotests/src/com/android/settings/widget/BottomLabelLayoutTest.java +++ b/tests/robotests/src/com/android/settings/widget/BottomLabelLayoutTest.java @@ -23,14 +23,14 @@ import android.widget.LinearLayout; import android.widget.Space; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BottomLabelLayoutTest { private BottomLabelLayout mBottomLabelLayout; diff --git a/tests/robotests/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java b/tests/robotests/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java index 480b53d7361..ac95afa53a1 100644 --- a/tests/robotests/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java +++ b/tests/robotests/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java @@ -16,17 +16,16 @@ package com.android.settings.widget; -import static junit.framework.Assert.assertEquals; - -import com.android.settings.testutils.SettingsRobolectricTestRunner; +import static org.junit.Assert.assertEquals; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DefaultIndicatorSeekBarTest { private DefaultIndicatorSeekBar mDefaultIndicatorSeekBar; diff --git a/tests/robotests/src/com/android/settings/widget/DisabledCheckBoxPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/DisabledCheckBoxPreferenceTest.java index 02add358f97..4762306d99b 100644 --- a/tests/robotests/src/com/android/settings/widget/DisabledCheckBoxPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/DisabledCheckBoxPreferenceTest.java @@ -18,7 +18,7 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; @@ -33,14 +33,13 @@ import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; import androidx.preference.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DisabledCheckBoxPreferenceTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/widget/DonutViewTest.java b/tests/robotests/src/com/android/settings/widget/DonutViewTest.java index 3b8bdceeb93..cc41f92acf9 100644 --- a/tests/robotests/src/com/android/settings/widget/DonutViewTest.java +++ b/tests/robotests/src/com/android/settings/widget/DonutViewTest.java @@ -2,13 +2,12 @@ package com.android.settings.widget; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DonutViewTest { @Test public void getPercentageStringSpannable_doesntCrashForMissingPercentage() { diff --git a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java index 56395493483..1d600a49f99 100644 --- a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java @@ -18,9 +18,9 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -46,8 +46,6 @@ import androidx.fragment.app.FragmentActivity; import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.ShadowIconDrawableFactory; import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.widget.LayoutPreference; @@ -57,10 +55,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EntityHeaderControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) @@ -260,7 +258,6 @@ public class EntityHeaderControllerTest { } @Test - @Config(shadows = ShadowIconDrawableFactory.class) public void setIcon_usingAppEntry_shouldLoadIconFromDrawableFactory() { final View view = mLayoutInflater .inflate(R.layout.settings_entity_header, null /* root */); @@ -270,9 +267,7 @@ public class EntityHeaderControllerTest { mController.setIcon(entry).done(mActivity); final ImageView iconView = view.findViewById(R.id.entity_header_icon); - // Icon is set - assertThat(iconView.getDrawable()).isNotNull(); - // ... and entry.icon is still empty. This means the icon didn't come from cache. + // ... entry.icon is still empty. This means the icon didn't come from cache. assertThat(entry.icon).isNull(); } diff --git a/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java index 3cbbbbec7d5..58005165a9f 100644 --- a/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java @@ -27,16 +27,15 @@ import android.widget.TextView; import androidx.preference.PreferenceViewHolder; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FixedLineSummaryPreferenceTest { @Mock diff --git a/tests/robotests/src/com/android/settings/widget/FloatingAppBarScrollingViewBehaviorTest.java b/tests/robotests/src/com/android/settings/widget/FloatingAppBarScrollingViewBehaviorTest.java index 6acc4d984fe..be63fab54e7 100644 --- a/tests/robotests/src/com/android/settings/widget/FloatingAppBarScrollingViewBehaviorTest.java +++ b/tests/robotests/src/com/android/settings/widget/FloatingAppBarScrollingViewBehaviorTest.java @@ -23,7 +23,6 @@ import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.google.android.material.appbar.AppBarLayout; @@ -31,9 +30,10 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FloatingAppBarScrollingViewBehaviorTest { private FloatingAppBarScrollingViewBehavior mScrollingViewBehavior; diff --git a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java index 79f344d9220..bf6b95ebe55 100644 --- a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java +++ b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java @@ -40,17 +40,17 @@ import androidx.recyclerview.widget.RecyclerView; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class HighlightablePreferenceGroupAdapterTest { private static final String TEST_KEY = "key"; diff --git a/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java b/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java index 07a0aa97ba1..022ccef6aff 100644 --- a/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java @@ -18,8 +18,8 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyLong; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -27,15 +27,14 @@ import android.content.Context; import android.os.Handler; import android.view.View; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LoadingViewControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java index e5cff2172a1..16818b40caf 100644 --- a/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java @@ -31,14 +31,14 @@ import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.PreferenceViewHolder; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class MasterCheckBoxPreferenceTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java index 04b30892558..1ddabc15983 100644 --- a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java @@ -31,15 +31,15 @@ import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.PreferenceViewHolder; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class MasterSwitchPreferenceTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java b/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java index 92f75e99e3e..59cd13d753d 100644 --- a/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java @@ -23,18 +23,18 @@ import static org.mockito.Mockito.when; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.AbstractPreferenceController; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PreferenceCategoryControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java b/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java index 55d212ffef1..56a5f7a7c58 100644 --- a/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java +++ b/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java @@ -31,7 +31,6 @@ import android.os.UserManager; import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.DefaultAppInfo; import org.junit.Before; @@ -42,15 +41,15 @@ import org.mockito.InOrder; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RadioButtonPickerFragmentTest { - @Mock(answer = Answers.RETURNS_DEEP_STUBS) private Activity mActivity; @Mock diff --git a/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java index 8a6aabf5d4a..c7b7e47f15a 100644 --- a/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java @@ -18,7 +18,7 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -30,14 +30,14 @@ import android.view.View; import androidx.preference.PreferenceViewHolder; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RadioButtonPreferenceTest { private Application mContext; diff --git a/tests/robotests/src/com/android/settings/widget/RingProgressBarTest.java b/tests/robotests/src/com/android/settings/widget/RingProgressBarTest.java index 8dc78a5740b..1d76f1bf332 100644 --- a/tests/robotests/src/com/android/settings/widget/RingProgressBarTest.java +++ b/tests/robotests/src/com/android/settings/widget/RingProgressBarTest.java @@ -16,21 +16,19 @@ package com.android.settings.widget; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import android.content.Context; import android.view.View.MeasureSpec; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) -@org.robolectric.annotation.Config(shadows = SettingsShadowResourcesImpl.class) +@RunWith(RobolectricTestRunner.class) public class RingProgressBarTest { private Context mContext = RuntimeEnvironment.application; @@ -62,7 +60,7 @@ public class RingProgressBarTest { @Test public void testDefaultAttributes() { - assertEquals(false, mProgressBar.isIndeterminate()); + assertFalse(mProgressBar.isIndeterminate()); assertEquals(0, mProgressBar.getProgress()); assertEquals(10000, mProgressBar.getMax()); } diff --git a/tests/robotests/src/com/android/settings/widget/RoundedHomepageIconTest.java b/tests/robotests/src/com/android/settings/widget/RoundedHomepageIconTest.java index 5bc8ddae4fb..21ba907e621 100644 --- a/tests/robotests/src/com/android/settings/widget/RoundedHomepageIconTest.java +++ b/tests/robotests/src/com/android/settings/widget/RoundedHomepageIconTest.java @@ -37,7 +37,6 @@ import android.graphics.drawable.ShapeDrawable; import android.os.Bundle; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.drawer.CategoryKey; import com.android.settingslib.drawer.Tile; import com.android.settingslib.testutils.DrawableTestHelper; @@ -45,9 +44,10 @@ import com.android.settingslib.testutils.DrawableTestHelper; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RoundedHomepageIconTest { private Context mContext; @@ -112,5 +112,4 @@ public class RoundedHomepageIconTest { assertThat(icon.mBackgroundColor) .isEqualTo(mContext.getColor(R.color.material_blue_500)); } - } diff --git a/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java b/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java index 7edfd0be636..8cb0539a30e 100644 --- a/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java +++ b/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java @@ -25,16 +25,15 @@ import android.view.ViewGroup; import androidx.viewpager.widget.PagerAdapter; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.Locale; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RtlCompatibleViewPagerTest { private Locale mLocaleEn; @@ -81,7 +80,7 @@ public class RtlCompatibleViewPagerTest { private static final int ITEM_COUNT = 2; - public ViewPagerAdapter() { + private ViewPagerAdapter() { } @Override diff --git a/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java b/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java index 20405ab6fac..b32e32c6a09 100644 --- a/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java +++ b/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java @@ -18,9 +18,9 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -29,16 +29,15 @@ import static org.robolectric.RuntimeEnvironment.application; import android.graphics.Rect; import android.widget.FrameLayout; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - 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.shadows.ShadowView; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ScrollToParentEditTextTest { private static final int EDIT_TEXT_SIZE = 20; diff --git a/tests/robotests/src/com/android/settings/widget/SeekBarPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/SeekBarPreferenceTest.java index 8f7063c5289..a675e0231bc 100644 --- a/tests/robotests/src/com/android/settings/widget/SeekBarPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/SeekBarPreferenceTest.java @@ -21,14 +21,13 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.os.Parcelable; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SeekBarPreferenceTest { private static final int MAX = 75; diff --git a/tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java b/tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java index d91b0f86cf4..9aaabc9673c 100644 --- a/tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java @@ -21,16 +21,15 @@ import static org.mockito.Mockito.verify; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SummaryUpdaterTest { private Context mContext; @@ -112,7 +111,7 @@ public class SummaryUpdaterTest { return mTestSummary; } - public void setTestSummary(String summary) { + private void setTestSummary(String summary) { mTestSummary = summary; } } diff --git a/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java b/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java index 04b85dc50db..35fa2c66a6d 100644 --- a/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java +++ b/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java @@ -25,16 +25,16 @@ import android.graphics.drawable.ColorDrawable; import android.widget.TextView; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SwitchBarTest { private static final int COLOR_BACKGROUND = 1; diff --git a/tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceTest.java index e1c500211ea..f337990d071 100644 --- a/tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceTest.java @@ -26,16 +26,16 @@ import android.view.View; import android.widget.Button; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TwoStateButtonPreferenceTest { private TwoStateButtonPreference mPreference; diff --git a/tests/robotests/src/com/android/settings/widget/UpdatableListPreferenceDialogFragmentTest.java b/tests/robotests/src/com/android/settings/widget/UpdatableListPreferenceDialogFragmentTest.java index ae55217b699..029de613bbc 100644 --- a/tests/robotests/src/com/android/settings/widget/UpdatableListPreferenceDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/widget/UpdatableListPreferenceDialogFragmentTest.java @@ -26,19 +26,19 @@ import android.widget.ArrayAdapter; import androidx.preference.ListPreference; import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothUtils; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.ArrayList; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowBluetoothUtils.class) public class UpdatableListPreferenceDialogFragmentTest { @@ -78,15 +78,13 @@ public class UpdatableListPreferenceDialogFragmentTest { @Test public void onListPreferenceUpdated_verifyAdapterCanBeUpdate() { - assertThat(mUpdatableListPrefDlgFragment.getAdapter().getCount()). - isEqualTo(0); + assertThat(mUpdatableListPrefDlgFragment.getAdapter().getCount()).isEqualTo(0); ListPreference listPreference = new ListPreference(mContext); final CharSequence[] charSequences = {"Test_DEVICE_1", "Test_DEVICE_2"}; listPreference.setEntries(charSequences); mUpdatableListPrefDlgFragment.onListPreferenceUpdated(listPreference); - assertThat(mUpdatableListPrefDlgFragment.getAdapter().getCount()). - isEqualTo(2); + assertThat(mUpdatableListPrefDlgFragment.getAdapter().getCount()).isEqualTo(2); } } \ No newline at end of file diff --git a/tests/robotests/src/com/android/settings/widget/UsageGraphTest.java b/tests/robotests/src/com/android/settings/widget/UsageGraphTest.java index 4b23e7f8627..7f09c3b88fb 100644 --- a/tests/robotests/src/com/android/settings/widget/UsageGraphTest.java +++ b/tests/robotests/src/com/android/settings/widget/UsageGraphTest.java @@ -26,15 +26,15 @@ import android.content.Context; import android.content.res.Resources; import android.util.SparseIntArray; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.R; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class UsageGraphTest { private UsageGraph mGraph; diff --git a/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java index 80d25391494..4412ac80486 100644 --- a/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java @@ -18,8 +18,8 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -33,16 +33,15 @@ import android.widget.TextView; import androidx.preference.PreferenceViewHolder; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ValidatedEditTextPreferenceTest { @Mock diff --git a/tests/robotests/src/com/android/settings/widget/VideoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/widget/VideoPreferenceControllerTest.java index 902b8ae8616..7fa2d282295 100644 --- a/tests/robotests/src/com/android/settings/widget/VideoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/VideoPreferenceControllerTest.java @@ -73,5 +73,4 @@ public class VideoPreferenceControllerTest { verify(mPreference).onViewVisible(anyBoolean()); } - } diff --git a/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java index 764de18929b..396b9df8520 100644 --- a/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java @@ -32,16 +32,16 @@ import android.view.TextureView; import androidx.preference.PreferenceViewHolder; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class VideoPreferenceTest { private static final int VIDEO_WIDTH = 100; private static final int VIDEO_HEIGHT = 150; diff --git a/tests/robotests/src/com/android/settings/wifi/AddNetworkFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/AddNetworkFragmentTest.java index 2b4b4bef3b0..db699e5ae99 100644 --- a/tests/robotests/src/com/android/settings/wifi/AddNetworkFragmentTest.java +++ b/tests/robotests/src/com/android/settings/wifi/AddNetworkFragmentTest.java @@ -24,17 +24,17 @@ import static org.mockito.Mockito.verify; import android.view.View; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowConnectivityManager; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import org.robolectric.shadows.androidx.fragment.FragmentController; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowConnectivityManager.class) public class AddNetworkFragmentTest { diff --git a/tests/robotests/src/com/android/settings/wifi/AppStateChangeWifiStateBridgeTest.java b/tests/robotests/src/com/android/settings/wifi/AppStateChangeWifiStateBridgeTest.java index b65e5aefc0b..c32c76b45d3 100644 --- a/tests/robotests/src/com/android/settings/wifi/AppStateChangeWifiStateBridgeTest.java +++ b/tests/robotests/src/com/android/settings/wifi/AppStateChangeWifiStateBridgeTest.java @@ -22,7 +22,6 @@ import static org.mockito.Mockito.mock; import android.Manifest; import android.content.pm.PackageInfo; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.ApplicationsState.AppEntry; import com.android.settingslib.applications.ApplicationsState.AppFilter; @@ -31,8 +30,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppStateChangeWifiStateBridgeTest { @Mock @@ -77,7 +77,7 @@ public class AppStateChangeWifiStateBridgeTest { mState.permissionDeclared = true; mState.packageInfo = mock(PackageInfo.class); mState.packageInfo.requestedPermissions - = new String[]{ Manifest.permission.NETWORK_SETTINGS }; + = new String[] { Manifest.permission.NETWORK_SETTINGS }; mEntry.extraInfo = mState; assertThat(mFilter.filterApp(mEntry)).isFalse(); } diff --git a/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java index 91598c010c2..c5bd555fa9a 100644 --- a/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java @@ -22,16 +22,15 @@ import static org.mockito.Mockito.when; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class CellularFallbackPreferenceControllerTest { private static final String KEY_CELLULAR_FALLBACK = "wifi_cellular_data_fallback"; diff --git a/tests/robotests/src/com/android/settings/wifi/ChangeWifiStateDetailsTest.java b/tests/robotests/src/com/android/settings/wifi/ChangeWifiStateDetailsTest.java index 6d8996068e4..ad38413ed0e 100644 --- a/tests/robotests/src/com/android/settings/wifi/ChangeWifiStateDetailsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/ChangeWifiStateDetailsTest.java @@ -17,8 +17,8 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -27,16 +27,16 @@ import android.content.Context; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ChangeWifiStateDetailsTest { private static final String PACKAGE_NAME = "app"; diff --git a/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java index be8eeae93d5..2e3a111cd15 100644 --- a/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java @@ -11,18 +11,18 @@ import android.content.Context; import android.net.ConnectivityManager; import android.net.NetworkInfo; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.XmlTestUtils; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ConfigureWifiSettingsTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/wifi/ConnectedAccessPointPreferenceTest.java b/tests/robotests/src/com/android/settings/wifi/ConnectedAccessPointPreferenceTest.java index 452fe0346da..c4fae41f5a5 100644 --- a/tests/robotests/src/com/android/settings/wifi/ConnectedAccessPointPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/wifi/ConnectedAccessPointPreferenceTest.java @@ -26,7 +26,6 @@ import android.content.Context; import android.view.View; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.wifi.AccessPoint; import org.junit.Before; @@ -34,9 +33,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ConnectedAccessPointPreferenceTest { @Mock diff --git a/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java b/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java index 94f10ddd88b..2bb2ee2b92f 100644 --- a/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java @@ -28,15 +28,15 @@ import androidx.preference.PreferenceViewHolder; import com.android.settings.LinkifyUtils; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LinkablePreferenceTest { private static final String TITLE = "Title"; diff --git a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogActivityTest.java b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogActivityTest.java index 4889c830d60..48f8ec0099d 100644 --- a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogActivityTest.java +++ b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogActivityTest.java @@ -20,26 +20,21 @@ import static com.google.common.truth.Truth.assertThat; import androidx.appcompat.app.AlertDialog; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = { - ShadowAlertDialogCompat.class, - SettingsShadowResourcesImpl.class -}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowAlertDialogCompat.class) public class NetworkRequestDialogActivityTest { @Test public void LaunchActivity_shouldShowNetworkRequestDialog() { - NetworkRequestDialogActivity activity = Robolectric - .setupActivity(NetworkRequestDialogActivity.class); + Robolectric.setupActivity(NetworkRequestDialogActivity.class); AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog(); diff --git a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java index 8cf02b82964..c9cdc154356 100644 --- a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java @@ -37,8 +37,6 @@ import android.widget.Button; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.FragmentActivity; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; import com.android.settings.wifi.NetworkRequestErrorDialogFragment.ERROR_DIALOG_TYPE; import com.android.settingslib.wifi.AccessPoint; @@ -50,18 +48,16 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; - -import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; - import org.robolectric.shadows.ShadowLooper; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {SettingsShadowResourcesImpl.class, ShadowAlertDialogCompat.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowAlertDialogCompat.class) public class NetworkRequestDialogFragmentTest { - final String KEY_SSID = "key_ssid"; + private static final String KEY_SSID = "key_ssid"; private FragmentActivity mActivity; private NetworkRequestDialogFragment networkRequestDialogFragment; diff --git a/tests/robotests/src/com/android/settings/wifi/NetworkRequestErrorDialogFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/NetworkRequestErrorDialogFragmentTest.java index c6659a5e3cf..303f6af6721 100644 --- a/tests/robotests/src/com/android/settings/wifi/NetworkRequestErrorDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/wifi/NetworkRequestErrorDialogFragmentTest.java @@ -30,8 +30,6 @@ import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.FragmentActivity; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; import com.android.settings.wifi.NetworkRequestErrorDialogFragment.ERROR_DIALOG_TYPE; @@ -39,13 +37,12 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; - -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {SettingsShadowResourcesImpl.class, ShadowAlertDialogCompat.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowAlertDialogCompat.class) public class NetworkRequestErrorDialogFragmentTest { private FragmentActivity mActivity; diff --git a/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java index bf4c6e7afdf..2cf7b21569d 100644 --- a/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java @@ -29,16 +29,16 @@ import android.provider.Settings; import androidx.preference.Preference; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NotifyOpenNetworkPreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java index b44d8e2a0c6..47f1c262460 100644 --- a/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java @@ -24,7 +24,7 @@ import static com.android.settings.wifi.UseOpenWifiPreferenceController import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -43,7 +43,6 @@ import androidx.preference.Preference; import androidx.preference.SwitchPreference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import com.google.common.collect.Lists; @@ -56,13 +55,14 @@ import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class UseOpenWifiPreferenceControllerTest { private static ComponentName sEnableActivityComponent; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java index 411e68e4c9c..7ebb18e8004 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java @@ -22,7 +22,6 @@ import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyBoolean; import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.anyString; -import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -39,7 +38,6 @@ import android.widget.Spinner; import android.widget.TextView; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowConnectivityManager; import com.android.settingslib.wifi.AccessPoint; @@ -48,10 +46,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowConnectivityManager.class) public class WifiConfigControllerTest { @@ -141,7 +140,6 @@ public class WifiConfigControllerTest { assertThat(password).isNotNull(); password.setText(LONG_PSK); assertThat(mController.isSubmittable()).isFalse(); - } @Test @@ -158,7 +156,6 @@ public class WifiConfigControllerTest { assertThat(password).isNotNull(); password.setText(GOOD_PSK); assertThat(mController.isSubmittable()).isTrue(); - } @Test @@ -167,7 +164,6 @@ public class WifiConfigControllerTest { assertThat(password).isNotNull(); password.setText(HEX_PSK); assertThat(mController.isSubmittable()).isTrue(); - } @Test @@ -324,14 +320,14 @@ public class WifiConfigControllerTest { private void securitySpinnerTestHelper(boolean saeVisible, boolean suitebVisible, boolean oweVisible) { WifiManager wifiManager = mock(WifiManager.class); - when(wifiManager.isWpa3SaeSupported()).thenReturn(saeVisible ? true : false); - when(wifiManager.isWpa3SuiteBSupported()).thenReturn(suitebVisible ? true : false); - when(wifiManager.isOweSupported()).thenReturn(oweVisible ? true : false); + when(wifiManager.isWpa3SaeSupported()).thenReturn(saeVisible); + when(wifiManager.isWpa3SuiteBSupported()).thenReturn(suitebVisible); + when(wifiManager.isOweSupported()).thenReturn(oweVisible); mController = new TestWifiConfigController(mConfigUiBase, mView, null /* accessPoint */, WifiConfigUiBase.MODE_MODIFY, wifiManager); - final Spinner securitySpinner = ((Spinner) mView.findViewById(R.id.security)); + final Spinner securitySpinner = mView.findViewById(R.id.security); final ArrayAdapter adapter = (ArrayAdapter) securitySpinner.getAdapter(); boolean saeFound = false; boolean suitebFound = false; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java b/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java index 6535685b221..d7f8ef89593 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java @@ -23,10 +23,6 @@ import static org.mockito.Mockito.doReturn; import android.content.Intent; import android.net.wifi.WifiConfiguration; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; -import com.android.settings.testutils.shadow.SettingsShadowTypedArray; import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; import com.android.settings.testutils.shadow.ShadowConnectivityManager; import com.android.settings.testutils.shadow.ShadowWifiManager; @@ -37,17 +33,15 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = { - SettingsShadowResources.SettingsShadowTheme.class, ShadowConnectivityManager.class, - SettingsShadowTypedArray.class, ShadowWifiManager.class, - ShadowAlertDialogCompat.class, - SettingsShadowResourcesImpl.class + ShadowAlertDialogCompat.class }) public class WifiDialogActivityTest { diff --git a/tests/robotests/src/com/android/settings/wifi/WifiDialogTest.java b/tests/robotests/src/com/android/settings/wifi/WifiDialogTest.java index 6974a59cd78..4ce29aa57c9 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiDialogTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiDialogTest.java @@ -4,7 +4,6 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowEntityHeaderController; import com.android.settings.wifi.WifiDialog.WifiDialogListener; import com.android.settingslib.wifi.AccessPoint; @@ -14,10 +13,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowEntityHeaderController.class) public class WifiDialogTest { @Mock private AccessPoint mockAccessPoint; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java index 53b3a648b09..65cc8111e36 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java @@ -25,7 +25,6 @@ import android.content.Context; import android.net.ConnectivityManager; import android.net.wifi.WifiManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal; import com.android.settings.widget.SwitchWidgetController; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; @@ -35,9 +34,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowRestrictedLockUtilsInternal.class) public class WifiEnablerTest { diff --git a/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java index 6cbace92cf8..c4a5c787d8f 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java @@ -21,8 +21,8 @@ import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -38,7 +38,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -47,10 +46,13 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiInfoPreferenceControllerTest { + private static final String TEST_MAC_ADDRESS = "42:0a:23:43:ac:02"; + @Mock private Context mContext; @Mock(answer = Answers.RETURNS_DEEP_STUBS) @@ -68,8 +70,6 @@ public class WifiInfoPreferenceControllerTest { private LifecycleOwner mLifecycleOwner; private WifiInfoPreferenceController mController; - private static final String TEST_MAC_ADDRESS = "42:0a:23:43:ac:02"; - @Before public void setUp() { MockitoAnnotations.initMocks(this); diff --git a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java index 5aef03653ad..4db63e7d3ef 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -36,7 +36,6 @@ import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal; import com.android.settings.widget.MasterSwitchPreference; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; @@ -46,10 +45,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowRestrictedLockUtilsInternal.class) public class WifiMasterSwitchPreferenceControllerTest { @@ -92,7 +92,6 @@ public class WifiMasterSwitchPreferenceControllerTest { assertThat(mController.isAvailable()).isFalse(); } - @Test public void onResume_shouldRegisterCallback() { mController.onResume(); diff --git a/tests/robotests/src/com/android/settings/wifi/WifiScanningRequiredFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/WifiScanningRequiredFragmentTest.java index e50d9ad1f0f..9291e0bb3f2 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiScanningRequiredFragmentTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiScanningRequiredFragmentTest.java @@ -37,27 +37,25 @@ import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; -import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiScanningRequiredFragmentTest { private WifiScanningRequiredFragment mFragment; private Context mContext; private ContentResolver mResolver; @Mock - Fragment mCallbackFragment; + private Fragment mCallbackFragment; @Mock - AlertDialog.Builder mBuilder; + private AlertDialog.Builder mBuilder; @Before public void setUp() { @@ -71,11 +69,6 @@ public class WifiScanningRequiredFragmentTest { Settings.Global.putInt(mResolver, Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0); } - @After - public void tearDown() { - SettingsShadowResources.reset(); - } - @Test public void onClick_positiveButtonSetsWifiScanningOn() throws Settings.SettingNotFoundException { diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java index c9e6c1e1944..22ccd3c2295 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java @@ -36,7 +36,6 @@ import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.search.SearchIndexableRaw; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.wifi.WifiTracker; import org.junit.Before; @@ -44,13 +43,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiSettingsTest { private static final int NUM_NETWORKS = 4; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSliceTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSliceTest.java index cdd1664d47b..752c3892a2d 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiSliceTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiSliceTest.java @@ -38,17 +38,17 @@ import androidx.slice.core.SliceQuery; import androidx.slice.widget.SliceLiveData; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SliceTester; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiSliceTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java index d40ead143be..02bf172e891 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java @@ -18,8 +18,8 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -30,7 +30,6 @@ import android.content.IntentFilter; import android.net.wifi.WifiManager; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener; import com.android.settingslib.wifi.WifiStatusTracker; @@ -39,9 +38,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiSummaryUpdaterTest { @Mock private WifiStatusTracker mWifiTracker; @Mock private SummaryListener mListener; @@ -49,7 +49,6 @@ public class WifiSummaryUpdaterTest { private Context mContext; private WifiSummaryUpdater mSummaryUpdater; - @Before public void setUp() { MockitoAnnotations.initMocks(this); @@ -127,7 +126,7 @@ public class WifiSummaryUpdaterTest { } private class SummaryListener implements OnSummaryChangeListener { - String summary; + private String summary; @Override public void onSummaryChanged(String summary) { diff --git a/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java b/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java index 806399d191f..a95624b7ecc 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java @@ -18,12 +18,11 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiUtilsTest { @Test diff --git a/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java index 6deae7f5c10..166b29b0d59 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java @@ -22,30 +22,27 @@ import static android.provider.Settings.Global.WIFI_WAKEUP_ENABLED; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; import android.content.Context; import android.location.LocationManager; import android.provider.Settings; +import android.text.TextUtils; import androidx.preference.Preference; import androidx.preference.SwitchPreference; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; -import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiWakeupPreferenceControllerTest { private Context mContext; @@ -69,11 +66,6 @@ public class WifiWakeupPreferenceControllerTest { doReturn(true).when(mLocationManager).isLocationEnabled(); } - @After - public void tearDown() { - SettingsShadowResources.reset(); - } - @Test public void handlePreferenceTreeClick_nonMatchingKey_shouldDoNothing() { final SwitchPreference pref = new SwitchPreference(mContext); @@ -102,72 +94,77 @@ public class WifiWakeupPreferenceControllerTest { @Test public void updateState_preferenceSetCheckedWhenWakeupSettingEnabled() { - final SwitchPreference preference = mock(SwitchPreference.class); + final SwitchPreference preference = new SwitchPreference(mContext); Settings.Global.putInt(mContext.getContentResolver(), WIFI_WAKEUP_ENABLED, 1); Settings.Global.putInt(mContext.getContentResolver(), WIFI_SCAN_ALWAYS_AVAILABLE, 1); mController.updateState(preference); - verify(preference).setChecked(true); - verify(preference).setSummary(R.string.wifi_wakeup_summary); + assertThat(preference.isChecked()).isTrue(); + assertThat(preference.getSummary()) + .isEqualTo(mContext.getString(R.string.wifi_wakeup_summary)); } @Test public void updateState_preferenceSetUncheckedWhenWakeupSettingDisabled() { - final SwitchPreference preference = mock(SwitchPreference.class); + final SwitchPreference preference = new SwitchPreference(mContext); Settings.Global.putInt(mContext.getContentResolver(), WIFI_WAKEUP_ENABLED, 0); mController.updateState(preference); - verify(preference).setChecked(false); - verify(preference).setSummary(R.string.wifi_wakeup_summary); + assertThat(preference.isChecked()).isFalse(); + assertThat(preference.getSummary()) + .isEqualTo(mContext.getString(R.string.wifi_wakeup_summary)); } @Test public void updateState_preferenceSetUncheckedWhenWifiScanningDisabled() { - final SwitchPreference preference = mock(SwitchPreference.class); + final SwitchPreference preference = new SwitchPreference(mContext); Settings.Global.putInt(mContext.getContentResolver(), WIFI_WAKEUP_ENABLED, 1); Settings.Global.putInt(mContext.getContentResolver(), WIFI_SCAN_ALWAYS_AVAILABLE, 0); mController.updateState(preference); - verify(preference).setChecked(false); + assertThat(preference.isChecked()).isFalse(); } @Test public void updateState_preferenceSetUncheckedWhenWakeupSettingEnabledNoLocation() { - final SwitchPreference preference = mock(SwitchPreference.class); + final SwitchPreference preference = new SwitchPreference(mContext); Settings.Global.putInt(mContext.getContentResolver(), WIFI_WAKEUP_ENABLED, 1); doReturn(false).when(mLocationManager).isLocationEnabled(); mController.updateState(preference); - verify(preference).setChecked(false); - verify(preference).setSummary(mController.getNoLocationSummary()); + assertThat(preference.isChecked()).isFalse(); + assertThat(TextUtils.equals(preference.getSummary(), mController.getNoLocationSummary())) + .isTrue(); } @Test public void updateState_preferenceSetUncheckedWhenWakeupSettingDisabledLocationEnabled() { - final SwitchPreference preference = mock(SwitchPreference.class); + final SwitchPreference preference = new SwitchPreference(mContext); Settings.Global.putInt(mContext.getContentResolver(), WIFI_WAKEUP_ENABLED, 0); doReturn(false).when(mLocationManager).isLocationEnabled(); mController.updateState(preference); - verify(preference).setChecked(false); - verify(preference).setSummary(mController.getNoLocationSummary()); + assertThat(preference.isChecked()).isFalse(); + assertThat(TextUtils.equals(preference.getSummary(), mController.getNoLocationSummary())) + .isTrue(); } @Test public void updateState_preferenceSetUncheckedWhenWifiScanningDisabledLocationEnabled() { - final SwitchPreference preference = mock(SwitchPreference.class); + final SwitchPreference preference = new SwitchPreference(mContext); Settings.Global.putInt(mContext.getContentResolver(), WIFI_WAKEUP_ENABLED, 1); Settings.Global.putInt(mContext.getContentResolver(), WIFI_SCAN_ALWAYS_AVAILABLE, 0); doReturn(false).when(mLocationManager).isLocationEnabled(); mController.updateState(preference); - verify(preference).setChecked(false); - verify(preference).setSummary(mController.getNoLocationSummary()); + assertThat(preference.isChecked()).isFalse(); + assertThat(TextUtils.equals(preference.getSummary(), mController.getNoLocationSummary())) + .isTrue(); } } diff --git a/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java b/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java index f393804ec14..ea306d0c055 100644 --- a/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java @@ -23,8 +23,6 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.net.wifi.WifiManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowNfcAdapter; import org.junit.After; @@ -34,11 +32,12 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {ShadowNfcAdapter.class, SettingsShadowResourcesImpl.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowNfcAdapter.class) public class WriteWifiConfigToNfcDialogTest { @Mock diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java index d60f8cfa0a1..b194d73e0cf 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java @@ -18,17 +18,15 @@ package com.android.settings.wifi.calling; import static com.google.common.truth.Truth.assertThat; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiCallingSettingsForSubTest { @Test public void getHelpResource_shouldReturn0() { - assertThat(new WifiCallingSettingsForSub().getHelpResource()) - .isEqualTo(0); + assertThat(new WifiCallingSettingsForSub().getHelpResource()).isEqualTo(0); } } diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java index 11dd56e6f48..f9109ce3e24 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java @@ -55,7 +55,6 @@ import com.android.settings.slices.SliceBroadcastReceiver; import com.android.settings.slices.SliceData; import com.android.settings.slices.SlicesFeatureProvider; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -63,12 +62,13 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiCallingSliceHelperTest { private Context mContext; @@ -387,7 +387,6 @@ public class WifiCallingSliceHelperTest { rowContent = (RowContent) rowItems.get(3); assertThat(rowContent.getTitleItem().getText()).isEqualTo(mContext.getText( com.android.internal.R.string.wfc_mode_cellular_preferred_summary)); - } private PendingIntent getBroadcastIntent(String action) { @@ -444,7 +443,7 @@ public class WifiCallingSliceHelperTest { return mSubId; } - protected void setDefaultVoiceSubId(int id) { + private void setDefaultVoiceSubId(int id) { mSubId = id; } @@ -463,11 +462,11 @@ public class WifiCallingSliceHelperTest { return defaultValue; } - public void setActivationAppIntent(Intent intent) { + private void setActivationAppIntent(Intent intent) { mActivationAppIntent = intent; } - public void setIsWifiCallingPrefEditable(boolean isWifiCallingPrefEditable) { + private void setIsWifiCallingPrefEditable(boolean isWifiCallingPrefEditable) { this.isWifiCallingPrefEditable = isWifiCallingPrefEditable; } } diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java index eab9e51a094..7e1d389b385 100644 --- a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java @@ -18,10 +18,10 @@ package com.android.settings.wifi.details; import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; @@ -65,8 +65,6 @@ import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.ShadowBidiFormatter; import com.android.settings.testutils.shadow.ShadowDevicePolicyManager; import com.android.settings.testutils.shadow.ShadowEntityHeaderController; import com.android.settings.widget.EntityHeaderController; @@ -86,6 +84,7 @@ import org.mockito.InOrder; import org.mockito.Matchers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @@ -95,12 +94,8 @@ import java.net.UnknownHostException; import java.util.Arrays; import java.util.stream.Collectors; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = { - ShadowDevicePolicyManager.class, - ShadowEntityHeaderController.class, - ShadowBidiFormatter.class -}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = {ShadowDevicePolicyManager.class, ShadowEntityHeaderController.class}) public class WifiDetailPreferenceControllerTest { private static final int LEVEL = 1; diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java index dd5dcc9a7b7..30665e6a865 100644 --- a/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java @@ -26,15 +26,15 @@ import android.net.wifi.WifiConfiguration; import androidx.preference.DropDownPreference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiMeteredPreferenceControllerTest { private static final int METERED_OVERRIDE_NONE = 0; @@ -91,6 +91,6 @@ public class WifiMeteredPreferenceControllerTest { mPreferenceController = spy(new WifiMeteredPreferenceController(mContext, null)); mPreferenceController.getMeteredOverride(); - mPreferenceController.onPreferenceChange(mDropDownPreference, new Integer(1)); + mPreferenceController.onPreferenceChange(mDropDownPreference, 1); } } diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiPrivacyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiPrivacyPreferenceControllerTest.java index a4bcfff9b88..8bbb2be7c60 100644 --- a/tests/robotests/src/com/android/settings/wifi/details/WifiPrivacyPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/details/WifiPrivacyPreferenceControllerTest.java @@ -27,15 +27,15 @@ import android.net.wifi.WifiConfiguration; import androidx.preference.DropDownPreference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiPrivacyPreferenceControllerTest { private static final int PRIVACY_RANDOMIZED = 0; @@ -84,6 +84,6 @@ public class WifiPrivacyPreferenceControllerTest { mPreferenceController = spy(new WifiPrivacyPreferenceController(mContext)); mPreferenceController.getRandomizationValue(); - mPreferenceController.onPreferenceChange(mDropDownPreference, new String("1")); + mPreferenceController.onPreferenceChange(mDropDownPreference, "1"); } } diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java index 8921311b760..c2d99a65d89 100644 --- a/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.wifi.p2p; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -28,16 +28,15 @@ import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class P2pCategoryPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java index 849c35acc88..0635c713137 100644 --- a/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.wifi.p2p; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.when; import android.net.wifi.p2p.WifiP2pDevice; @@ -26,16 +26,15 @@ import android.net.wifi.p2p.WifiP2pDevice; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class P2pThisDevicePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java index 75c5ffc2691..096880359e2 100644 --- a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java @@ -20,8 +20,8 @@ import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -36,7 +36,6 @@ import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -45,8 +44,9 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiP2PPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/wifi/qrcode/QrCameraTest.java b/tests/robotests/src/com/android/settings/wifi/qrcode/QrCameraTest.java index 2595bb65218..e32ac6b5a8b 100644 --- a/tests/robotests/src/com/android/settings/wifi/qrcode/QrCameraTest.java +++ b/tests/robotests/src/com/android/settings/wifi/qrcode/QrCameraTest.java @@ -22,13 +22,11 @@ import static org.mockito.Mockito.mock; import android.content.Context; import android.graphics.Bitmap; -import android.graphics.Color; import android.graphics.Rect; import android.util.Size; import android.view.SurfaceHolder; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.google.zxing.BinaryBitmap; import com.google.zxing.LuminanceSource; @@ -43,10 +41,10 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class QrCameraTest { @Mock diff --git a/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsPreferenceControllerTest.java index 6d609b869ea..7f7ecc5c694 100644 --- a/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsPreferenceControllerTest.java @@ -32,7 +32,6 @@ import android.net.wifi.WifiManager; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowAccessPoint; import com.android.settings.testutils.shadow.ShadowThreadUtils; import com.android.settings.testutils.shadow.ShadowWifiManager; @@ -44,10 +43,11 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowThreadUtils.class, ShadowWifiManager.class}) public class SavedAccessPointsPreferenceControllerTest { @@ -86,7 +86,6 @@ public class SavedAccessPointsPreferenceControllerTest { verify(mController).refreshSavedAccessPoints(); } - @Test public void postRefresh_shouldRefreshApList() { doNothing().when(mController).refreshSavedAccessPoints(); diff --git a/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsWifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsWifiSettingsTest.java index 97ad7d9b2f3..f76184cc51c 100644 --- a/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsWifiSettingsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsWifiSettingsTest.java @@ -28,7 +28,6 @@ import android.net.wifi.WifiManager; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.wifi.WifiConfigController; import com.android.settings.wifi.WifiDialog; import com.android.settingslib.core.AbstractPreferenceController; @@ -39,9 +38,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SavedAccessPointsWifiSettingsTest { @Mock @@ -90,8 +90,7 @@ public class SavedAccessPointsWifiSettingsTest { mSettings.onForget(mWifiDialog); - verify(mWifiManager) - .forget(mWifiConfiguration.networkId, mSavedApController); + verify(mWifiManager).forget(mWifiConfiguration.networkId, mSavedApController); } @Test diff --git a/tests/robotests/src/com/android/settings/wifi/tether/TetherServiceTest.java b/tests/robotests/src/com/android/settings/wifi/tether/TetherServiceTest.java index fb7bef183ad..f6fd660fa8b 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/TetherServiceTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/TetherServiceTest.java @@ -17,9 +17,9 @@ package com.android.settings.wifi.tether; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -29,13 +29,12 @@ import android.content.Context; import android.content.SharedPreferences; import android.net.wifi.WifiManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.shadows.ShadowApplication.Wrapper; @@ -43,7 +42,7 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TetherServiceTest { @Mock diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java index 6faff11d011..6bc2869cc15 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.wifi.tether; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -33,16 +33,16 @@ import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiTetherApBandPreferenceControllerTest { private static final String ALL_BANDS = "5.0 GHz Band preferred"; diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java index 519aa54e4a5..f027147eb23 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java @@ -23,15 +23,14 @@ import android.provider.Settings; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiTetherAutoOffPreferenceControllerTest { private static final String KEY_PREF = "wifi_tether_auto_off"; diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java index 1b063d0ff86..62fb2773b4d 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.wifi.tether; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -30,7 +30,6 @@ import android.net.wifi.WifiManager; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.ValidatedEditTextPreference; import org.junit.Before; @@ -39,9 +38,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiTetherPasswordPreferenceControllerTest { private static final String VALID_PASS = "12345678"; diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java index c81c490ed12..d8cd878ae78 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.wifi.tether; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -36,26 +36,24 @@ import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.MasterSwitchPreference; import com.android.settingslib.core.lifecycle.Lifecycle; -import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = { WifiTetherPreferenceControllerTest.ShadowWifiTetherSettings.class, - WifiTetherPreferenceControllerTest.ShadowWifiTetherSwitchBarController.class, WifiTetherPreferenceControllerTest.ShadowWifiTetherSoftApManager.class }) public class WifiTetherPreferenceControllerTest { @@ -99,11 +97,6 @@ public class WifiTetherPreferenceControllerTest { mController.displayPreference(mScreen); } - @After - public void tearDown() { - ShadowWifiTetherSwitchBarController.reset(); - } - @Test public void isAvailable_noTetherRegex_shouldReturnFalse() { when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{}); @@ -181,7 +174,7 @@ public class WifiTetherPreferenceControllerTest { public static final class ShadowWifiTetherSettings { @Implementation - public static boolean isTetherSettingPageEnabled() { + protected static boolean isTetherSettingPageEnabled() { return true; } } @@ -189,35 +182,13 @@ public class WifiTetherPreferenceControllerTest { @Implements(WifiTetherSoftApManager.class) public static final class ShadowWifiTetherSoftApManager { @Implementation - public void registerSoftApCallback() { + protected void registerSoftApCallback() { // do nothing } @Implementation - public void unRegisterSoftApCallback() { + protected void unRegisterSoftApCallback() { // do nothing } } - - @Implements(WifiTetherSwitchBarController.class) - public static final class ShadowWifiTetherSwitchBarController { - - private static boolean onStartCalled; - private static boolean onStopCalled; - - public static void reset() { - onStartCalled = false; - onStopCalled = false; - } - - @Implementation - public void onStart() { - onStartCalled = true; - } - - @Implementation - public void onStop() { - onStopCalled = true; - } - } } diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java index a9d4a43c4fe..cb58778b2ec 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.wifi.tether; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -30,7 +30,6 @@ import android.net.wifi.WifiManager; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.ValidatedEditTextPreference; import org.junit.Before; @@ -39,9 +38,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiTetherSSIDPreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceControllerTest.java index bbf15add06a..8a7c34a3d0b 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceControllerTest.java @@ -14,16 +14,15 @@ import android.net.wifi.WifiManager; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiTetherSecurityPreferenceControllerTest { private static final String WPA2_PSK = String.valueOf(WifiConfiguration.KeyMgmt.WPA2_PSK); diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java index ef1a3b68854..40d651e0ddc 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java @@ -18,8 +18,8 @@ package com.android.settings.wifi.tether; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.nullable; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -36,7 +36,6 @@ import android.os.UserManager; import android.widget.TextView; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowWifiManager; import org.junit.Before; @@ -44,6 +43,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; @@ -54,7 +54,7 @@ import java.util.List; import androidx.fragment.app.FragmentActivity; import androidx.preference.PreferenceScreen; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowWifiManager.class}) public class WifiTetherSettingsTest { private static final String[] WIFI_REGEXS = {"wifi_regexs"}; diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java index d22776f647f..1a5a2288bb4 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java @@ -34,7 +34,6 @@ import android.net.NetworkPolicyManager; import android.net.wifi.WifiManager; import android.provider.Settings; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.SwitchBar; import com.android.settings.widget.SwitchBarController; @@ -43,9 +42,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiTetherSwitchBarControllerTest { @Mock private WifiManager mWifiManager; @@ -79,8 +79,7 @@ public class WifiTetherSwitchBarControllerTest { Settings.Global.putInt(RuntimeEnvironment.application.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 1); - final WifiTetherSwitchBarController controller = new WifiTetherSwitchBarController( - mContext, new SwitchBarController(mSwitchBar)); + new WifiTetherSwitchBarController(mContext, new SwitchBarController(mSwitchBar)); assertThat(mSwitchBar.isEnabled()).isFalse(); } -- GitLab From abbc61960125b3190b503fa3374f943d0e393067 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Thu, 13 Dec 2018 11:20:40 -0800 Subject: [PATCH 13/22] Remove SettingsRobolectricTestRunner Test: rerun robotests Change-Id: I7054d8d5cfc4756beb8d3032bc92361534229494 --- .../settings/SetupWizardUtilsTest.java | 2 -- .../RolesPreferenceControllerTest.java | 4 +-- .../SettingsRobolectricTestRunner.java | 27 ------------------- .../settings/wifi/ButtonPreferenceTest.java | 8 +++--- 4 files changed, 6 insertions(+), 35 deletions(-) delete mode 100644 tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java diff --git a/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java b/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java index 513697362f9..60077910a89 100644 --- a/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java +++ b/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java @@ -21,8 +21,6 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Intent; import android.os.SystemProperties; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import com.google.android.setupcompat.util.WizardManagerHelper; import com.google.android.setupdesign.util.ThemeHelper; diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/RolesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/RolesPreferenceControllerTest.java index 0946f3734f1..5bf2b7e40ad 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/RolesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/RolesPreferenceControllerTest.java @@ -32,7 +32,6 @@ import android.provider.Settings; import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -40,8 +39,9 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RolesPreferenceControllerTest { private static final String PREFERENCE_KEY = "roles"; diff --git a/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java deleted file mode 100644 index 0828cc78b65..00000000000 --- a/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 2018 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.testutils; - -import org.junit.runners.model.InitializationError; -import org.robolectric.RobolectricTestRunner; - -public class SettingsRobolectricTestRunner extends RobolectricTestRunner { - - public SettingsRobolectricTestRunner(Class testClass) throws InitializationError { - super(testClass); - } -} diff --git a/tests/robotests/src/com/android/settings/wifi/ButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/wifi/ButtonPreferenceTest.java index 3dc109f9078..7f0598dce85 100644 --- a/tests/robotests/src/com/android/settings/wifi/ButtonPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/wifi/ButtonPreferenceTest.java @@ -22,18 +22,18 @@ import android.content.Context; import android.view.View; import android.widget.ImageButton; -import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import androidx.preference.PreferenceViewHolder; +import com.android.settings.R; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ButtonPreferenceTest { private Context mContext; -- GitLab From b6dad935ec04ad2352dbd9f22529efa63986534b Mon Sep 17 00:00:00 2001 From: Vishwath Mohan Date: Tue, 11 Dec 2018 11:59:01 -0800 Subject: [PATCH 14/22] Add settings to control Extended Access mode. This CL adds settings (and two toggle controls) that help configure how trust (from Trust Agents) should be interpreted by the platform, allowing them to function in a purely extend unlock mode (where they can extend how long an already unlocked device stays unlocked, but cannot unlock a locked device). These are temporary settings to help with dogfooding the new behavior, and will eventually be removed. b/120871688 below is the tracking bug to remove them. Bug: 111435975 Bug: 120871688 Test: Tested with SmartLock modalities to confirm behavior in both legacy and extend unlock modes is WAI. Change-Id: If25098520ba98e82c98cc51fb226d8f2ce1aba80 --- res/values/strings.xml | 11 +++++ res/xml/screen_lock_settings.xml | 15 +++++- ...gentsExtendUnlockPreferenceController.java | 48 +++++++++++++++++++ ...stLostLocksScreenPreferenceController.java | 48 +++++++++++++++++++ 4 files changed, 121 insertions(+), 1 deletion(-) create mode 100644 src/com/android/settings/security/trustagent/TrustAgentsExtendUnlockPreferenceController.java create mode 100644 src/com/android/settings/security/trustagent/TrustLostLocksScreenPreferenceController.java diff --git a/res/values/strings.xml b/res/values/strings.xml index b6d923953bf..6a5c7bbde65 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -798,6 +798,17 @@ Show lockdown option Display power button option that turns off Smart Lock, fingerprint unlocking, and notifications on the lock screen + + + SmartLock only extends unlock + + If enabled, SmartLock will keep your device unlocked for longer, but can no longer unlock a locked device. + + + Lock screen when trust is lost + + If enabled, the device will lock when the last trust agent loses trust + None diff --git a/res/xml/screen_lock_settings.xml b/res/xml/screen_lock_settings.xml index 43f96e92a3c..29c8de984cc 100644 --- a/res/xml/screen_lock_settings.xml +++ b/res/xml/screen_lock_settings.xml @@ -40,4 +40,17 @@ android:key="power_button_instantly_locks" android:title="@string/lockpattern_settings_enable_power_button_instantly_locks" /> - \ No newline at end of file + + + + + + diff --git a/src/com/android/settings/security/trustagent/TrustAgentsExtendUnlockPreferenceController.java b/src/com/android/settings/security/trustagent/TrustAgentsExtendUnlockPreferenceController.java new file mode 100644 index 00000000000..bfbebaff865 --- /dev/null +++ b/src/com/android/settings/security/trustagent/TrustAgentsExtendUnlockPreferenceController.java @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2018 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.security.trustagent; + +import android.content.Context; +import android.os.UserHandle; +import android.provider.Settings; + +import com.android.settings.core.TogglePreferenceController; + +public class TrustAgentsExtendUnlockPreferenceController extends TogglePreferenceController { + + public TrustAgentsExtendUnlockPreferenceController(Context context, String key) { + super(context, key); + } + + @Override + public int getAvailabilityStatus() { + return AVAILABLE; + } + + @Override + public boolean isChecked() { + return Settings.Secure.getInt(mContext.getContentResolver(), + Settings.Secure.TRUST_AGENTS_EXTEND_UNLOCK, 1) == 1; + } + + @Override + public boolean setChecked(boolean isChecked) { + Settings.Secure.putInt(mContext.getContentResolver(), + Settings.Secure.TRUST_AGENTS_EXTEND_UNLOCK, isChecked ? 1 : 0); + return true; + } +} diff --git a/src/com/android/settings/security/trustagent/TrustLostLocksScreenPreferenceController.java b/src/com/android/settings/security/trustagent/TrustLostLocksScreenPreferenceController.java new file mode 100644 index 00000000000..b5e0dd76ae2 --- /dev/null +++ b/src/com/android/settings/security/trustagent/TrustLostLocksScreenPreferenceController.java @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2018 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.security.trustagent; + +import android.content.Context; +import android.os.UserHandle; +import android.provider.Settings; + +import com.android.settings.core.TogglePreferenceController; + +public class TrustLostLocksScreenPreferenceController extends TogglePreferenceController { + + public TrustLostLocksScreenPreferenceController(Context context, String key) { + super(context, key); + } + + @Override + public int getAvailabilityStatus() { + return AVAILABLE; + } + + @Override + public boolean isChecked() { + return Settings.Secure.getInt(mContext.getContentResolver(), + Settings.Secure.LOCK_SCREEN_WHEN_TRUST_LOST, 1) == 1; + } + + @Override + public boolean setChecked(boolean isChecked) { + Settings.Secure.putInt(mContext.getContentResolver(), + Settings.Secure.LOCK_SCREEN_WHEN_TRUST_LOST, isChecked ? 1 : 0); + return true; + } +} -- GitLab From 97b0fe0ac631f599730a4dda2b51d0b4c9bbc97a Mon Sep 17 00:00:00 2001 From: Inseob Kim Date: Mon, 10 Dec 2018 07:05:20 +0000 Subject: [PATCH 15/22] Revert "Revert "Schematize vold system properties"" This reverts commit 49e81e0eeac13b1edcd4c8f51c48dafae6336d11. Reason for revert: Fixed breakage Change-Id: I414b753a218d9baf3d24530ff14df7644eb148e0 Merged-In: I5f75b15ab792329cdb9bf2dd2e4b42bccb6eb0f3 (cherry picked from commit 8346eb5ccc29f3ffe41132a06a4e7e17fb58ca19) --- src/com/android/settings/CryptKeeper.java | 11 +++++------ src/com/android/settings/MasterClear.java | 3 ++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java index 1f331d7a635..ca54b07dcd5 100644 --- a/src/com/android/settings/CryptKeeper.java +++ b/src/com/android/settings/CryptKeeper.java @@ -33,11 +33,11 @@ import android.os.Message; import android.os.PowerManager; import android.os.RemoteException; import android.os.ServiceManager; -import android.os.SystemProperties; import android.os.UserHandle; import android.os.storage.IStorageManager; import android.os.storage.StorageManager; import android.provider.Settings; +import android.sysprop.VoldProperties; import android.telecom.TelecomManager; import android.telephony.TelephonyManager; import android.text.Editable; @@ -400,7 +400,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList super.onCreate(savedInstanceState); // If we are not encrypted or encrypting, get out quickly. - final String state = SystemProperties.get("vold.decrypt"); + final String state = VoldProperties.decrypt().orElse(""); if (!isDebugView() && ("".equals(state) || DECRYPT_STATE.equals(state))) { disableCryptKeeperComponent(this); // Typically CryptKeeper is launched as the home app. We didn't @@ -468,7 +468,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList return; } - final String progress = SystemProperties.get("vold.encrypt_progress"); + final String progress = VoldProperties.encrypt_progress().orElse(""); if (!"".equals(progress) || isDebugView(FORCE_VIEW_PROGRESS)) { setContentView(R.layout.crypt_keeper_progress); encryptionProgressInit(); @@ -636,7 +636,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList } private void updateProgress() { - final String state = SystemProperties.get("vold.encrypt_progress"); + final String state = VoldProperties.encrypt_progress().orElse(""); if ("error_partially_encrypted".equals(state)) { showFactoryReset(false); @@ -657,8 +657,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList // Now try to get status as time remaining and replace as appropriate Log.v(TAG, "Encryption progress: " + progress); try { - final String timeProperty = SystemProperties.get("vold.encrypt_time_remaining"); - int time = Integer.parseInt(timeProperty); + int time = VoldProperties.encrypt_time_remaining().get(); if (time >= 0) { // Round up to multiple of 10 - this way display is less jerky time = (time + 9) / 10 * 10; diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java index a7da41692fa..182081c6335 100644 --- a/src/com/android/settings/MasterClear.java +++ b/src/com/android/settings/MasterClear.java @@ -39,6 +39,7 @@ import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; import androidx.annotation.VisibleForTesting; +import android.sysprop.VoldProperties; import android.telephony.euicc.EuiccManager; import android.text.TextUtils; import android.util.Log; @@ -404,7 +405,7 @@ public class MasterClear extends InstrumentedFragment implements OnGlobalLayoutL } private boolean isExtStorageEncrypted() { - String state = SystemProperties.get("vold.decrypt"); + String state = VoldProperties.decrypt().orElse(""); return !"".equals(state); } -- GitLab From 950f6383207f036bbb121a68ea5733d549af71b1 Mon Sep 17 00:00:00 2001 From: Kevin Chyn Date: Thu, 13 Dec 2018 13:46:22 -0800 Subject: [PATCH 16/22] Plumb remove functionality through Bug: 120981508 Test: manual Change-Id: I4c9570ee1ed397b48d4948b79bb6f72188735e97 --- .../biometrics/face/FaceSettings.java | 9 ++- ...tingsRemoveButtonPreferenceController.java | 64 ++++++++++++++++++- 2 files changed, 71 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/biometrics/face/FaceSettings.java b/src/com/android/settings/biometrics/face/FaceSettings.java index d7dc9f866fd..8eabf002dfa 100644 --- a/src/com/android/settings/biometrics/face/FaceSettings.java +++ b/src/com/android/settings/biometrics/face/FaceSettings.java @@ -59,6 +59,10 @@ public class FaceSettings extends DashboardFragment { private byte[] mToken; private FaceSettingsAttentionPreferenceController mAttentionController; + private final FaceSettingsRemoveButtonPreferenceController.Listener mRemovalListener = () -> { + getActivity().finish(); + }; + public static boolean isAvailable(Context context) { FaceManager manager = Utils.getFaceManagerOrNull(context); return manager != null && manager.isHardwareDetected(); @@ -146,10 +150,13 @@ public class FaceSettings extends DashboardFragment { protected List createPreferenceControllers(Context context) { final List controllers = buildPreferenceControllers(context, getSettingsLifecycle()); + // There's no great way of doing this right now :/ for (AbstractPreferenceController controller : controllers) { if (controller instanceof FaceSettingsAttentionPreferenceController) { mAttentionController = (FaceSettingsAttentionPreferenceController) controller; - break; + } else if (controller instanceof FaceSettingsRemoveButtonPreferenceController) { + ((FaceSettingsRemoveButtonPreferenceController) controller) + .setListener(mRemovalListener); } } diff --git a/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceController.java index 8e41eff37db..baab391d84f 100644 --- a/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceController.java +++ b/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceController.java @@ -17,8 +17,13 @@ package com.android.settings.biometrics.face; import android.content.Context; +import android.hardware.face.Face; +import android.hardware.face.FaceManager; +import android.os.UserHandle; +import android.util.Log; import android.view.View; import android.widget.Button; +import android.widget.Toast; import androidx.preference.Preference; @@ -26,18 +31,61 @@ import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settingslib.widget.LayoutPreference; +import java.util.List; + /** - * Controller for the remove button. + * Controller for the remove button. This assumes that there is only a single face enrolled. The UI + * will likely change if multiple enrollments are allowed/supported. */ public class FaceSettingsRemoveButtonPreferenceController extends BasePreferenceController implements View.OnClickListener { + private static final String TAG = "FaceSettings/Remove"; private static final String KEY = "security_settings_face_delete_faces_container"; + interface Listener { + void onRemoved(); + } + private Button mButton; + private List mFaces; + private Listener mListener; + + private final Context mContext; + private final int mUserId; + private final FaceManager mFaceManager; + private final FaceManager.RemovalCallback mRemovalCallback = new FaceManager.RemovalCallback() { + @Override + public void onRemovalError(Face face, int errMsgId, CharSequence errString) { + Log.e(TAG, "Unable to remove face: " + face.getBiometricId() + + " error: " + errMsgId + " " + errString); + Toast.makeText(mContext, errString, Toast.LENGTH_SHORT).show(); + } + + @Override + public void onRemovalSucceeded(Face face, int remaining) { + if (remaining == 0) { + mFaces = mFaceManager.getEnrolledFaces(mUserId); + if (!mFaces.isEmpty()) { + mButton.setEnabled(true); + } else { + mListener.onRemoved(); + } + } else { + Log.v(TAG, "Remaining: " + remaining); + } + } + }; public FaceSettingsRemoveButtonPreferenceController(Context context, String preferenceKey) { super(context, preferenceKey); + mContext = context; + mFaceManager = context.getSystemService(FaceManager.class); + // TODO: Use the profile-specific userId instead + mUserId = UserHandle.myUserId(); + if (mFaceManager != null) { + mFaces = mFaceManager.getEnrolledFaces(mUserId); + } } public FaceSettingsRemoveButtonPreferenceController(Context context) { @@ -66,7 +114,21 @@ public class FaceSettingsRemoveButtonPreferenceController extends BasePreference @Override public void onClick(View v) { if (v == mButton) { + mButton.setEnabled(false); + if (mFaces.isEmpty()) { + Log.e(TAG, "No faces"); + return; + } + if (mFaces.size() > 1) { + Log.e(TAG, "Multiple enrollments: " + mFaces.size()); + } + // Remove the first/only face + mFaceManager.remove(mFaces.get(0), mUserId, mRemovalCallback); } } + + public void setListener(Listener listener) { + mListener = listener; + } } -- GitLab From 046c10ac30f2f9af7d36e4a25375d761f1ef000b Mon Sep 17 00:00:00 2001 From: tmfang Date: Wed, 12 Dec 2018 19:05:38 +0800 Subject: [PATCH 17/22] Filter status is not retained in App info Selected filter is not retained after device orientation changed. In old design, we only update selected index one time when the enabled filter(filterType) equals the previous selected filter. After that, the selected index won't be changed again. But we sort the filter options every time(Collections.sort) when we add a new filter. Therefore, it makes all indexes of filters option could be changed. For example, Old filter options => All apps, Personal, Work Selected index = 1 Add "Intsalled app" option => All apps, Installed app, Personal, Work Selected filter option becomes "Installed app" but not Personal. Since we saved previous selected filter option before device orientation changes, we can check again whether or not the selected index is previous filter type when we enable any new filter. Test: manual test, robotest Fixes: 120798975 Change-Id: I35de186a6a1fae3bd863bd31a6ce3f76861dc896 --- .../manageapplications/ManageApplications.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/com/android/settings/applications/manageapplications/ManageApplications.java b/src/com/android/settings/applications/manageapplications/ManageApplications.java index c2db019d664..5669b4c7c36 100644 --- a/src/com/android/settings/applications/manageapplications/ManageApplications.java +++ b/src/com/android/settings/applications/manageapplications/ManageApplications.java @@ -817,13 +817,12 @@ public class ManageApplications extends InstrumentedFragment mManageApplications.onItemSelected(null, null, 0, 0); } if (mFilterOptions.size() > 1) { - if (filterType == mManageApplications.mFilterType) { - int index = mFilterOptions.indexOf(filter); - if (index != -1) { - mManageApplications.mFilterSpinner.setSelection(index); - mManageApplications.onItemSelected(null, null, index, 0); - mManageApplications.mFilterType = AppFilterRegistry.FILTER_APPS_ALL; - } + final AppFilterItem previousFilter = AppFilterRegistry.getInstance().get( + mManageApplications.mFilterType); + final int index = mFilterOptions.indexOf(previousFilter); + if (index != -1) { + mManageApplications.mFilterSpinner.setSelection(index); + mManageApplications.onItemSelected(null, null, index, 0); } } } -- GitLab From 3f80d1b64b111aa83ac8d1fa03a4007bd38364f4 Mon Sep 17 00:00:00 2001 From: Stanley Wang Date: Wed, 12 Dec 2018 15:24:21 +0800 Subject: [PATCH 18/22] Implement the Copyable interface to PhoneNumberPreferenceController Change-Id: I70085cffe13047ac808d1bf08a467f693b1d8737 Fixes: 118398321 Test: manual and robotests --- res/values/strings.xml | 3 +++ .../PhoneNumberPreferenceController.java | 22 +++++++++++++++++-- .../{CopyableSlice.java => Copyable.java} | 2 +- .../slices/SliceBroadcastReceiver.java | 4 ++-- .../settings/slices/SliceBuilderUtils.java | 2 +- .../PhoneNumberPreferenceControllerTest.java | 22 +++++++++++++++++++ .../testutils/FakeCopyableController.java | 4 ++-- 7 files changed, 51 insertions(+), 8 deletions(-) rename src/com/android/settings/slices/{CopyableSlice.java => Copyable.java} (96%) diff --git a/res/values/strings.xml b/res/values/strings.xml index 188ba6e78f7..23adc768536 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -10343,4 +10343,7 @@ Send feedback Would you like to give us feedback on this suggestion? + + + %1$s copied to clipboard. diff --git a/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java b/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java index 6f5f346f89c..462f6d99224 100644 --- a/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java +++ b/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java @@ -16,6 +16,10 @@ package com.android.settings.deviceinfo; +import static android.content.Context.CLIPBOARD_SERVICE; + +import android.content.ClipData; +import android.content.ClipboardManager; import android.content.Context; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; @@ -23,6 +27,7 @@ import android.telephony.TelephonyManager; import android.text.BidiFormatter; import android.text.TextDirectionHeuristics; import android.text.TextUtils; +import android.widget.Toast; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; @@ -30,12 +35,14 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; +import com.android.settings.slices.Copyable; import com.android.settingslib.DeviceInfoUtils; import java.util.ArrayList; import java.util.List; -public class PhoneNumberPreferenceController extends BasePreferenceController { +public class PhoneNumberPreferenceController extends BasePreferenceController implements + Copyable { private final static String KEY_PHONE_NUMBER = "phone_number"; @@ -46,7 +53,7 @@ public class PhoneNumberPreferenceController extends BasePreferenceController { public PhoneNumberPreferenceController(Context context, String key) { super(context, key); mTelephonyManager = mContext.getSystemService(TelephonyManager.class); - mSubscriptionManager = mContext.getSystemService(SubscriptionManager.class); + mSubscriptionManager = mContext.getSystemService(SubscriptionManager.class); } @Override @@ -91,6 +98,17 @@ public class PhoneNumberPreferenceController extends BasePreferenceController { return true; } + @Override + public void copy() { + final ClipboardManager clipboard = (ClipboardManager) mContext.getSystemService( + CLIPBOARD_SERVICE); + clipboard.setPrimaryClip(ClipData.newPlainText("text", getFirstPhoneNumber())); + + final String toast = mContext.getString(R.string.copyable_slice_toast, + mContext.getText(R.string.status_number)); + Toast.makeText(mContext, toast, Toast.LENGTH_SHORT).show(); + } + private CharSequence getFirstPhoneNumber() { final List subscriptionInfoList = mSubscriptionManager.getActiveSubscriptionInfoList(); diff --git a/src/com/android/settings/slices/CopyableSlice.java b/src/com/android/settings/slices/Copyable.java similarity index 96% rename from src/com/android/settings/slices/CopyableSlice.java rename to src/com/android/settings/slices/Copyable.java index 31fc151d6ba..12159d1c0c8 100644 --- a/src/com/android/settings/slices/CopyableSlice.java +++ b/src/com/android/settings/slices/Copyable.java @@ -19,7 +19,7 @@ package com.android.settings.slices; /** * Provide the copy ability for preference controller to copy the data to the clipboard. */ -public interface CopyableSlice { +public interface Copyable { /** * Copy the key slice information to the clipboard. * It is highly recommended to show the toast to notify users when implemented this function. diff --git a/src/com/android/settings/slices/SliceBroadcastReceiver.java b/src/com/android/settings/slices/SliceBroadcastReceiver.java index 823c7294adc..28b2f818541 100644 --- a/src/com/android/settings/slices/SliceBroadcastReceiver.java +++ b/src/com/android/settings/slices/SliceBroadcastReceiver.java @@ -185,7 +185,7 @@ public class SliceBroadcastReceiver extends BroadcastReceiver { final BasePreferenceController controller = getPreferenceController(context, key); - if (!(controller instanceof CopyableSlice)) { + if (!(controller instanceof Copyable)) { throw new IllegalArgumentException( "Copyable action passed for a non-copyable key:" + key); } @@ -198,7 +198,7 @@ public class SliceBroadcastReceiver extends BroadcastReceiver { return; } - ((CopyableSlice) controller).copy(); + ((Copyable) controller).copy(); } /** diff --git a/src/com/android/settings/slices/SliceBuilderUtils.java b/src/com/android/settings/slices/SliceBuilderUtils.java index d75eaa2e1a2..b2b8310d1c8 100644 --- a/src/com/android/settings/slices/SliceBuilderUtils.java +++ b/src/com/android/settings/slices/SliceBuilderUtils.java @@ -94,7 +94,7 @@ public class SliceBuilderUtils { return buildUnavailableSlice(context, sliceData); } - if (controller instanceof CopyableSlice) { + if (controller instanceof Copyable) { return buildCopyableSlice(context, sliceData, controller); } diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java index 8e9a48f6894..d0900972125 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java @@ -16,6 +16,8 @@ package com.android.settings.deviceinfo; +import static android.content.Context.CLIPBOARD_SERVICE; + import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.anyInt; @@ -24,6 +26,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.content.ClipboardManager; import android.content.Context; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; @@ -43,6 +46,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; +import java.util.ArrayList; +import java.util.List; + @RunWith(RobolectricTestRunner.class) public class PhoneNumberPreferenceControllerTest { @@ -146,4 +152,20 @@ public class PhoneNumberPreferenceControllerTest { public void isSliceable_shouldBeTrue() { assertThat(mController.isSliceable()).isTrue(); } + + @Test + public void copy_shouldCopyPhoneNumberToClipboard() { + final List list = new ArrayList<>(); + list.add(mSubscriptionInfo); + when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(list); + final String phoneNumber = "1111111111"; + doReturn(phoneNumber).when(mController).getFormattedPhoneNumber(mSubscriptionInfo); + + mController.copy(); + + final ClipboardManager clipboard = (ClipboardManager) mContext.getSystemService( + CLIPBOARD_SERVICE); + final CharSequence data = clipboard.getPrimaryClip().getItemAt(0).getText(); + assertThat(phoneNumber.contentEquals(data)).isTrue(); + } } diff --git a/tests/robotests/src/com/android/settings/testutils/FakeCopyableController.java b/tests/robotests/src/com/android/settings/testutils/FakeCopyableController.java index ac19dd0c778..31e955c8cdf 100644 --- a/tests/robotests/src/com/android/settings/testutils/FakeCopyableController.java +++ b/tests/robotests/src/com/android/settings/testutils/FakeCopyableController.java @@ -19,9 +19,9 @@ package com.android.settings.testutils; import android.content.Context; import com.android.settings.core.BasePreferenceController; -import com.android.settings.slices.CopyableSlice; +import com.android.settings.slices.Copyable; -public class FakeCopyableController extends BasePreferenceController implements CopyableSlice { +public class FakeCopyableController extends BasePreferenceController implements Copyable { public FakeCopyableController(Context context, String preferenceKey) { super(context, preferenceKey); -- GitLab From 8916198af73aa64218aaf005087af8a414624240 Mon Sep 17 00:00:00 2001 From: tmfang Date: Thu, 13 Dec 2018 18:25:32 +0800 Subject: [PATCH 19/22] Icon size needs to same in AppRestrictionsFragment - All app icon should be 32dp Test: visual Change-Id: I56132c04aa968e27d7152c39a5715ae262627844 Fixes: 119065428 --- res/layout/preference_app_restrictions.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/res/layout/preference_app_restrictions.xml b/res/layout/preference_app_restrictions.xml index 4bb6fe2577c..65fd06c13eb 100644 --- a/res/layout/preference_app_restrictions.xml +++ b/res/layout/preference_app_restrictions.xml @@ -39,11 +39,11 @@ android:orientation="horizontal"> -- GitLab From 64b894f81d732f4a8712b9b5df6b603397389843 Mon Sep 17 00:00:00 2001 From: cosmohsieh Date: Wed, 12 Dec 2018 10:14:54 +0800 Subject: [PATCH 20/22] Implement getConfig() method to get WifiConfiguration Make a duplicated function of WifiConfigController.getConfig(). This function could get a new WifiConfiguration from input AccessPoint or ScanResult. Should be removed if there is standard one in framework. Bug: 120827021 Test: RunSettingsRoboTests Change-Id: Ia5981e8d41f434c097b464a2bfe18e1356f7b087 --- .../wifi/NetworkRequestDialogFragment.java | 12 +- src/com/android/settings/wifi/WifiUtils.java | 143 ++++++++++++++++++ .../NetworkRequestDialogFragmentTest.java | 3 + .../android/settings/wifi/WifiUtilsTest.java | 31 +++- 4 files changed, 186 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/wifi/NetworkRequestDialogFragment.java b/src/com/android/settings/wifi/NetworkRequestDialogFragment.java index efb3f8cd3a5..c627a2e6628 100644 --- a/src/com/android/settings/wifi/NetworkRequestDialogFragment.java +++ b/src/com/android/settings/wifi/NetworkRequestDialogFragment.java @@ -129,8 +129,16 @@ public class NetworkRequestDialogFragment extends InstrumentedDialogFragment imp } if (which < accessPointList.size()) { - WifiConfiguration wifiConfig = accessPointList.get(which).getConfig(); - mUserSelectionCallback.select(wifiConfig); + final AccessPoint selectedAccessPoint = accessPointList.get(which); + WifiConfiguration wifiConfig = selectedAccessPoint.getConfig(); + if (wifiConfig == null) { + wifiConfig = WifiUtils.getWifiConfig(selectedAccessPoint, /* scanResult */ + null, /* password */ null); + } + + if (wifiConfig != null) { + mUserSelectionCallback.select(wifiConfig); + } } } diff --git a/src/com/android/settings/wifi/WifiUtils.java b/src/com/android/settings/wifi/WifiUtils.java index ff8570e7a59..7970b2a6edd 100644 --- a/src/com/android/settings/wifi/WifiUtils.java +++ b/src/com/android/settings/wifi/WifiUtils.java @@ -22,10 +22,13 @@ import android.content.ContentResolver; import android.content.Context; import android.content.pm.PackageManager; import android.net.NetworkCapabilities; +import android.net.wifi.ScanResult; import android.net.wifi.WifiConfiguration; import android.provider.Settings; import android.text.TextUtils; +import com.android.settingslib.wifi.AccessPoint; + import java.nio.charset.StandardCharsets; public class WifiUtils { @@ -110,4 +113,144 @@ public class WifiUtils { return (capabilities != null && capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL)); } + + /** + * Provides a simple way to generate a new {@link WifiConfiguration} obj from + * {@link ScanResult} or {@link AccessPoint}. Either {@code accessPoint} or {@code scanResult + * } input should be not null for retrieving information, otherwise will throw + * IllegalArgumentException. + * This method prefers to take {@link AccessPoint} input in priority. Therefore this method + * will take {@link AccessPoint} input as preferred data extraction source when you input + * both {@link AccessPoint} and {@link ScanResult}, and ignore {@link ScanResult} input. + * + * Duplicated and simplified method from {@link WifiConfigController#getConfig()}. + * TODO(b/120827021): Should be removed if the there is have a common one in shared place (e.g. + * SettingsLib). + * + * @param accessPoint Input data for retrieving WifiConfiguration. + * @param scanResult Input data for retrieving WifiConfiguration. + * @return WifiConfiguration obj based on input. + */ + public static WifiConfiguration getWifiConfig(AccessPoint accessPoint, ScanResult scanResult, + String password) { + if (accessPoint == null && scanResult == null) { + throw new IllegalArgumentException( + "At least one of AccessPoint and ScanResult input is required."); + } + + final WifiConfiguration config = new WifiConfiguration(); + final int security; + + if (accessPoint == null) { + config.SSID = AccessPoint.convertToQuotedString(scanResult.SSID); + security = getAccessPointSecurity(scanResult); + } else { + if (!accessPoint.isSaved()) { + config.SSID = AccessPoint.convertToQuotedString( + accessPoint.getSsidStr()); + } else { + config.networkId = accessPoint.getConfig().networkId; + config.hiddenSSID = accessPoint.getConfig().hiddenSSID; + } + security = accessPoint.getSecurity(); + } + + switch (security) { + case AccessPoint.SECURITY_NONE: + config.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.NONE); + break; + + case AccessPoint.SECURITY_WEP: + config.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.NONE); + config.allowedAuthAlgorithms.set(WifiConfiguration.AuthAlgorithm.OPEN); + config.allowedAuthAlgorithms.set(WifiConfiguration.AuthAlgorithm.SHARED); + if (!TextUtils.isEmpty(password)) { + int length = password.length(); + // WEP-40, WEP-104, and 256-bit WEP (WEP-232?) + if ((length == 10 || length == 26 || length == 58) + && password.matches("[0-9A-Fa-f]*")) { + config.wepKeys[0] = password; + } else { + config.wepKeys[0] = '"' + password + '"'; + } + } + break; + + case AccessPoint.SECURITY_PSK: + config.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_PSK); + if (!TextUtils.isEmpty(password)) { + if (password.matches("[0-9A-Fa-f]{64}")) { + config.preSharedKey = password; + } else { + config.preSharedKey = '"' + password + '"'; + } + } + break; + + case AccessPoint.SECURITY_EAP: + case AccessPoint.SECURITY_EAP_SUITE_B: + config.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_EAP); + config.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.IEEE8021X); + if (security == AccessPoint.SECURITY_EAP_SUITE_B) { + config.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.SUITE_B_192); + config.requirePMF = true; + config.allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.GCMP_256); + config.allowedGroupCiphers.set(WifiConfiguration.GroupCipher.GCMP_256); + config.allowedGroupMgmtCiphers.set(WifiConfiguration.GroupMgmtCipher + .BIP_GMAC_256); + config.allowedSuiteBCiphers.set(WifiConfiguration.SuiteBCipher.ECDHE_RSA); + } + + if (!TextUtils.isEmpty(password)) { + config.enterpriseConfig.setPassword(password); + } + break; + case AccessPoint.SECURITY_SAE: + config.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.SAE); + config.requirePMF = true; + if (!TextUtils.isEmpty(password)) { + config.preSharedKey = '"' + password + '"'; + } + break; + + case AccessPoint.SECURITY_OWE: + config.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.OWE); + config.requirePMF = true; + break; + + default: + break; + } + + return config; + } + + + /** + * Gets security value from ScanResult. + * + * Duplicated method from {@link AccessPoint#getSecurity(ScanResult)}. + * TODO(b/120827021): Should be removed if the there is have a common one in shared place (e.g. + * SettingsLib). + * + * @param result ScanResult + * @return Related security value based on {@link AccessPoint}. + */ + public static int getAccessPointSecurity(ScanResult result) { + if (result.capabilities.contains("WEP")) { + return AccessPoint.SECURITY_WEP; + } else if (result.capabilities.contains("SAE")) { + return AccessPoint.SECURITY_SAE; + } else if (result.capabilities.contains("PSK")) { + return AccessPoint.SECURITY_PSK; + } else if (result.capabilities.contains("EAP_SUITE_B_192")) { + return AccessPoint.SECURITY_EAP_SUITE_B; + } else if (result.capabilities.contains("EAP")) { + return AccessPoint.SECURITY_EAP; + } else if (result.capabilities.contains("OWE")) { + return AccessPoint.SECURITY_OWE; + } + + return AccessPoint.SECURITY_NONE; + } } diff --git a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java index c9cdc154356..343d170e7ed 100644 --- a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java @@ -197,9 +197,12 @@ public class NetworkRequestDialogFragmentTest { accessPointList.add(new AccessPoint(mContext, bundle)); bundle.putString(KEY_SSID, "Test AP 2"); accessPointList.add(new AccessPoint(mContext, bundle)); + bundle.putString(KEY_SSID, "Test AP 3"); AccessPoint clickedAccessPoint = new AccessPoint(mContext, bundle); + clickedAccessPoint.generateOpenNetworkConfig(); accessPointList.add(clickedAccessPoint); + bundle.putString(KEY_SSID, "Test AP 4"); accessPointList.add(new AccessPoint(mContext, bundle)); when(networkRequestDialogFragment.getAccessPointList()).thenReturn(accessPointList); diff --git a/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java b/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java index a95624b7ecc..9de095d14dd 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java @@ -22,6 +22,16 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; +import static org.mockito.Mockito.spy; + +import android.content.Context; +import android.net.wifi.WifiConfiguration; +import android.os.Bundle; + +import com.android.settingslib.wifi.AccessPoint; + +import org.robolectric.RuntimeEnvironment; + @RunWith(RobolectricTestRunner.class) public class WifiUtilsTest { @@ -44,4 +54,23 @@ public class WifiUtilsTest { assertThat(WifiUtils.isHotspotPasswordValid(longPassword)).isFalse(); assertThat(WifiUtils.isHotspotPasswordValid("")).isFalse(); } -} + + @Test + public void getWifiConfigByAccessPoint_shouldReturnCorrectConfig() { + String testSSID = "WifiUtilsTest"; + Bundle bundle = new Bundle(); + bundle.putString("key_ssid", testSSID); + Context context = spy(RuntimeEnvironment.application); + AccessPoint accessPoint = new AccessPoint(context, bundle); + + WifiConfiguration config = WifiUtils.getWifiConfig(accessPoint, null, null); + + assertThat(config).isNotNull(); + assertThat(config.SSID).isEqualTo(AccessPoint.convertToQuotedString(testSSID)); + } + + @Test(expected = IllegalArgumentException.class) + public void getWifiConfigWithNullInput_ThrowIllegalArgumentException() { + WifiConfiguration config = WifiUtils.getWifiConfig(null, null, null); + } +} \ No newline at end of file -- GitLab From 125a366dff91879baced2c16e489151c5357fc83 Mon Sep 17 00:00:00 2001 From: Matthew Fritze Date: Thu, 13 Dec 2018 16:56:21 -0800 Subject: [PATCH 21/22] Set listDivider color for Panels Default color for listDividers in dialogs (parent theme for panels) is @null, so we set the color to match the horizontal dividers. listDivider is used by slices to set the vertical divider between the primary action and toggles. Test: visual-only Bug: 117804089 Change-Id: I8f89a103c65adfbd1e079b38dc5eaaa3d3b32326 --- res/values/themes.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/res/values/themes.xml b/res/values/themes.xml index 9a05bfca127..390be584e21 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -202,10 +202,12 @@ true + -- GitLab From 2fa4b1f7b82e969b54cfba39ed3600fbe34b0276 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Fri, 14 Dec 2018 14:03:08 -0800 Subject: [PATCH 22/22] Tweak padding for conditional card layout. Overall goal is to push button to the left: - Make a linear layout that contain content, and button - Apply existing padding to the content only - Apply a smaller padding to button. Change-Id: I8f1c586c59be21ff73dd6d08675f76c8ff7addda Fixes: 120669058 Test: visual --- res/layout/homepage_condition_half_tile.xml | 54 ++++++++++++--------- res/values/styles.xml | 1 + 2 files changed, 31 insertions(+), 24 deletions(-) diff --git a/res/layout/homepage_condition_half_tile.xml b/res/layout/homepage_condition_half_tile.xml index eff167abb9f..895183f6e87 100644 --- a/res/layout/homepage_condition_half_tile.xml +++ b/res/layout/homepage_condition_half_tile.xml @@ -25,38 +25,44 @@ android:id="@+id/content" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingStart="@dimen/homepage_card_padding_start" - android:paddingEnd="@dimen/homepage_card_padding_end" android:paddingTop="@dimen/homepage_condition_half_card_padding_top" android:orientation="vertical"> - - - + android:paddingStart="@dimen/homepage_card_padding_start" + android:paddingEnd="@dimen/homepage_card_padding_end" + android:orientation="vertical"> - + + + + + - + +