From 9f1e911759dc6fedaac9fa65afb79f6a93022bf4 Mon Sep 17 00:00:00 2001 From: Andrew Sapperstein Date: Thu, 8 Jun 2017 19:27:36 -0700 Subject: [PATCH] Refactor test runner to use static list of resource paths Previously everything lived in an inner class method of SettingsRobolectricTestRunner. That method has now been turned into a static method so that it can be called by other runners. Bug: 62460102 Test: robotests Change-Id: I6612b1f26404587301c534c8ba60e39d59d6c840 --- .../android/settings/DeviceAdminAddTest.java | 1 + .../settings/DeviceInfoSettingsTest.java | 1 + .../android/settings/DisplaySettingsTest.java | 6 +- .../settings/EncryptionAndCredentialTest.java | 1 + .../android/settings/LegalSettingsTest.java | 2 +- .../LicenseHtmlGeneratorFromXmlTest.java | 2 + .../settings/LicenseHtmlLoaderTest.java | 4 +- .../com/android/settings/MasterClearTest.java | 2 + .../android/settings/PrivacySettingsTest.java | 2 + .../settings/SecuritySettingsTest.java | 1 + .../settings/SettingsActivityTest.java | 1 + .../settings/SettingsDialogFragmentTest.java | 2 + .../settings/SettingsDumpServiceTest.java | 2 + .../settings/SettingsLicenseActivityTest.java | 12 +--- .../SettingsPreferenceFragmentTest.java | 2 + .../settings/SetupChooseLockPatternTest.java | 1 + .../settings/SetupWizardUtilsTest.java | 3 +- .../settings/SummaryPreferenceTest.java | 2 + .../android/settings/TetherServiceTest.java | 3 + .../src/com/android/settings/UtilsTest.java | 3 +- .../com/android/settings/ZonePickerTest.java | 1 + .../AccessibilitySettingsTest.java | 2 +- .../ShortcutServicePickerFragmentTest.java | 3 +- .../AccountDetailDashboardFragmentTest.java | 2 +- ...AccountHeaderPreferenceControllerTest.java | 2 +- .../AccountPreferenceControllerTest.java | 2 +- .../accounts/AccountPreferenceTest.java | 2 +- .../AccountSyncPreferenceControllerTest.java | 2 +- .../AccountTypePreferenceLoaderTest.java | 2 +- ...serWhenLockedPreferenceControllerTest.java | 2 +- .../AutoSyncDataPreferenceControllerTest.java | 3 +- ...cPersonalDataPreferenceControllerTest.java | 3 +- ...oSyncWorkDataPreferenceControllerTest.java | 4 +- ...EmergencyInfoPreferenceControllerTest.java | 2 +- ...RemoveAccountPreferenceControllerTest.java | 2 +- .../accounts/RemoveUserFragmentTest.java | 2 +- .../applications/AdvancedAppSettingsTest.java | 2 +- ...pAndNotificationDashboardFragmentTest.java | 2 +- .../applications/AppInfoWithHeaderTest.java | 2 +- ...ppPermissionsPreferenceControllerTest.java | 2 +- .../AppStateAppOpsBridgeTest.java | 2 +- .../AppStateInstallAppsBridgeTest.java | 3 +- .../AppStorageSizesControllerTest.java | 2 +- ...ithAdminGrantedPermissionsCounterTest.java | 2 +- ...WithAdminGrantedPermissionsListerTest.java | 2 +- .../ApplicationFeatureProviderImplTest.java | 2 +- .../applications/DrawOverlayDetailsTest.java | 2 +- .../EnterpriseDefaultAppsTest.java | 2 +- .../FetchPackageStorageAsyncLoaderTest.java | 2 +- .../applications/InstalledAppCounterTest.java | 2 +- .../applications/InstalledAppDetailsTest.java | 2 +- .../applications/InstalledAppListerTest.java | 4 +- .../applications/LayoutPreferenceTest.java | 2 +- .../applications/ManageApplicationsTest.java | 2 +- .../MusicViewHolderControllerTest.java | 2 +- .../applications/NotificationAppsTest.java | 3 +- .../PictureInPictureDetailsTest.java | 2 +- .../applications/PremiumSmsAccessTest.java | 2 +- .../RecentAppsPreferenceControllerTest.java | 2 +- ...cialAppAccessPreferenceControllerTest.java | 2 +- .../applications/UsageAccessDetailsTest.java | 2 +- .../applications/VrListenerSettingsTest.java | 2 +- .../WriteSettingsDetailsTest.java | 2 +- ...AssistContextPreferenceControllerTest.java | 2 +- ...stFlashScreenPreferenceControllerTest.java | 2 +- .../assist/AssistSettingObserverTest.java | 2 +- .../assist/DefaultAssistPickerTest.java | 2 +- ...DefaultAssistPreferenceControllerTest.java | 2 +- .../applications/assist/ManageAssistTest.java | 2 +- .../defaultapps/DefaultAppInfoTest.java | 2 +- .../DefaultAppPickerFragmentTest.java | 2 +- .../DefaultAppPreferenceControllerTest.java | 2 +- .../DefaultAutofillPickerTest.java | 2 +- ...faultAutofillPreferenceControllerTest.java | 2 +- .../defaultapps/DefaultBrowserPickerTest.java | 2 +- ...efaultBrowserPreferenceControllerTest.java | 2 +- .../DefaultEmergencyPickerTest.java | 2 +- .../defaultapps/DefaultHomePickerTest.java | 2 +- .../DefaultHomePreferenceControllerTest.java | 2 +- ...efaultNotificationAssistantPickerTest.java | 2 +- .../defaultapps/DefaultPhonePickerTest.java | 2 +- .../defaultapps/DefaultSmsPickerTest.java | 2 +- .../InstantAppButtonsControllerTest.java | 4 +- ...tingsActivityPreferenceControllerTest.java | 4 +- .../backup/BackupSettingsActivityTest.java | 3 +- .../backup/BackupSettingsHelperTest.java | 2 +- ...ackupSettingsPreferenceControllerTest.java | 2 +- ...BluetoothDetailsButtonsControllerTest.java | 2 +- .../BluetoothDetailsControllerEventsTest.java | 2 +- .../BluetoothDetailsHeaderControllerTest.java | 2 +- ...etoothDetailsMacAddressControllerTest.java | 2 +- ...luetoothDetailsProfilesControllerTest.java | 3 +- ...othDeviceNamePreferenceControllerTest.java | 3 +- .../BluetoothDevicePreferenceTest.java | 2 +- .../bluetooth/BluetoothEnablerTest.java | 3 +- ...hMasterSwitchPreferenceControllerTest.java | 4 +- .../bluetooth/BluetoothPairingDetailTest.java | 2 +- .../bluetooth/BluetoothPairingDialogTest.java | 2 +- ...etoothPairingPreferenceControllerTest.java | 2 +- .../BluetoothSettingsObsoleteTest.java | 2 +- .../BluetoothSettingsSummaryProviderTest.java | 6 +- .../bluetooth/BluetoothSettingsTest.java | 3 +- .../BluetoothSummaryUpdaterTest.java | 3 +- .../DeviceListPreferenceFragmentTest.java | 2 +- .../bluetooth/DeviceProfilesSettingsTest.java | 2 +- .../android/settings/bluetooth/UtilsTest.java | 2 +- .../ConditionAdapterUtilsTest.java | 2 +- .../ConnectedDeviceDashboardFragmentTest.java | 2 +- .../UsbModePreferenceControllerTest.java | 4 +- ...cAvailabilityPreferenceControllerTest.java | 3 +- .../codeinspection/CodeInspectionTest.java | 2 +- .../InstrumentedDialogFragmentTest.java | 2 +- .../MetricsFeatureProviderTest.java | 2 +- .../SharedPreferenceLoggerTest.java | 2 +- .../VisibilityLoggerMixinTest.java | 2 +- .../dashboard/DashboardAdapterTest.java | 2 +- .../DashboardFeatureProviderImplTest.java | 2 +- .../dashboard/DashboardFragmentTest.java | 2 +- .../dashboard/DashboardItemAnimatorTest.java | 2 +- .../dashboard/DashboardSummaryTest.java | 3 +- ...lePlaceholderPreferenceControllerTest.java | 2 +- .../dashboard/ProgressiveDisclosureTest.java | 3 +- .../settings/dashboard/SummaryLoaderTest.java | 2 +- .../dashboard/SupportItemAdapterTest.java | 2 +- .../conditional/ConditionAdapterTest.java | 3 +- .../dashboard/conditional/ConditionTest.java | 2 +- .../conditional/DndConditionTest.java | 2 +- .../dashboard/suggestions/EventStoreTest.java | 2 +- .../suggestions/SuggestionAdapterTest.java | 3 +- .../SuggestionDismissControllerTest.java | 2 +- .../SuggestionFeatureProviderImplTest.java | 2 +- .../suggestions/SuggestionFeaturizerTest.java | 2 +- .../suggestions/SuggestionRankerTest.java | 4 +- .../suggestions/SuggestionsChecksTest.java | 2 +- .../settings/datausage/AppDataUsageTest.java | 2 +- .../settings/datausage/AppPrefLoaderTest.java | 2 +- .../datausage/BillingCycleSettingsTest.java | 2 +- .../DataUsageInfoControllerTest.java | 2 +- .../settings/datausage/DataUsageListTest.java | 2 +- .../datausage/DataUsageSummaryTest.java | 2 +- .../datausage/UnrestrictedDataAccessTest.java | 2 +- .../AutoTimePreferenceControllerTest.java | 2 +- .../AutoTimeZonePreferenceControllerTest.java | 2 +- .../DatePreferenceControllerTest.java | 2 +- .../datetime/TimeChangeListenerMixinTest.java | 2 +- .../TimeFormatPreferenceControllerTest.java | 2 +- .../TimePreferenceControllerTest.java | 2 +- .../TimeZonePreferenceControllerTest.java | 2 +- .../settings/datetime/ZonePickerTest.java | 2 +- ...StorageManagerSwitchBarControllerTest.java | 2 +- ...ReportInPowerPreferenceControllerTest.java | 4 +- .../BugReportPreferenceControllerTest.java | 5 +- ...velopmentSettingsDisabledActivityTest.java | 2 +- .../DevelopmentSettingsEnablerTest.java | 2 +- .../development/DevelopmentSettingsTest.java | 2 +- ...ephonyMonitorPreferenceControllerTest.java | 4 +- ...fyAppsOverUsbPreferenceControllerTest.java | 4 +- ...sebandVersionPreferenceControllerTest.java | 4 +- .../BuildNumberPreferenceControllerTest.java | 2 +- .../DeviceModelPreferenceControllerTest.java | 2 +- ...ccEquipmentIdPreferenceControllerTest.java | 2 +- .../FeedbackPreferenceControllerTest.java | 2 +- ...rmwareVersionPreferenceControllerTest.java | 2 +- .../HardwareInfoDialogFragmentTest.java | 2 +- ...KernelVersionPreferenceControllerTest.java | 2 +- .../ManualPreferenceControllerTest.java | 2 +- ...PrivateVolumeOptionMenuControllerTest.java | 3 +- ...egulatoryInfoPreferenceControllerTest.java | 2 +- .../SerialNumberPreferenceControllerTest.java | 2 +- .../StorageDashboardFragmentTest.java | 2 +- .../deviceinfo/StorageItemPreferenceTest.java | 2 +- .../StorageProfileFragmentTest.java | 2 +- .../deviceinfo/StorageSettingsTest.java | 2 +- .../SystemUpdatePreferenceControllerTest.java | 2 +- .../settings/deviceinfo/UsbBackendTest.java | 2 +- .../UsbModeChooserActivityTest.java | 2 +- ...agementSwitchPreferenceControllerTest.java | 3 +- .../storage/SecondaryUserControllerTest.java | 2 +- .../StorageItemPreferenceControllerTest.java | 2 +- ...eSummaryDonutPreferenceControllerTest.java | 5 +- .../storage/UserProfileControllerTest.java | 2 +- ...splayAlwaysOnPreferenceControllerTest.java | 2 +- ...NotificationsPreferenceControllerTest.java | 2 +- ...mbientDisplayPreferenceControllerTest.java | 2 +- ...utoBrightnessPreferenceControllerTest.java | 4 +- .../AutoRotatePreferenceControllerTest.java | 2 +- ...eryPercentagePreferenceControllerTest.java | 2 +- ...ightnessLevelPreferenceControllerTest.java | 2 +- .../ColorModePreferenceControllerTest.java | 2 +- .../ThemePreferenceControllerTest.java | 2 +- .../TimeoutPreferenceControllerTest.java | 2 +- .../VrDisplayPreferencePickerTest.java | 2 +- .../dream/CurrentDreamPickerTest.java | 2 +- .../CurrentDreamPreferenceControllerTest.java | 2 +- .../settings/dream/DreamSettingsTest.java | 2 +- .../StartNowPreferenceControllerTest.java | 2 +- .../settings/dream/WhenToDreamPickerTest.java | 2 +- .../WhenToDreamPreferenceControllerTest.java | 2 +- ...minActionPreferenceControllerBaseTest.java | 4 +- ...eraPermissionPreferenceControllerTest.java | 2 +- ...onPermissionsPreferenceControllerTest.java | 2 +- ...onePermissionPreferenceControllerTest.java | 2 +- ...rmissionsPreferenceControllerBaseTest.java | 7 +- ...pnCurrentUserPreferenceControllerTest.java | 2 +- ...anagedProfilePreferenceControllerTest.java | 2 +- .../ApplicationListFragmentTest.java | 2 +- ...plicationListPreferenceControllerTest.java | 2 +- .../BugReportsPreferenceControllerTest.java | 3 +- .../CaCertsPreferenceControllerTest.java | 4 +- ...alledPackagesPreferenceControllerTest.java | 3 +- ...erprisePrivacyFeatureProviderImplTest.java | 2 +- ...rprisePrivacyPreferenceControllerTest.java | 3 +- .../EnterprisePrivacySettingsTest.java | 4 +- ...erpriseSetDefaultAppsListFragmentTest.java | 2 +- ...faultAppsListPreferenceControllerTest.java | 2 +- ...etDefaultAppsPreferenceControllerTest.java | 2 +- ...angesCategoryPreferenceControllerTest.java | 2 +- ...peCurrentUserPreferenceControllerTest.java | 4 +- ...anagedProfilePreferenceControllerTest.java | 4 +- ...swordWipePreferenceControllerBaseTest.java | 2 +- ...obalHttpProxyPreferenceControllerTest.java | 2 +- .../ImePreferenceControllerTest.java | 4 +- ...geDeviceAdminPreferenceControllerTest.java | 3 +- .../NetworkLogsPreferenceControllerTest.java | 3 +- .../SecurityLogsPreferenceControllerTest.java | 3 +- .../FingerprintEnrollFindSensorTest.java | 2 +- ...erprintLocationAnimationVideoViewTest.java | 3 +- .../AdvancedPowerUsageDetailTest.java | 2 +- .../BatteryBroadcastReceiverTest.java | 2 +- ...BatteryHeaderPreferenceControllerTest.java | 2 +- .../BatteryHistoryPreferenceTest.java | 2 +- .../settings/fuelgauge/BatteryInfoTest.java | 2 +- .../fuelgauge/BatteryMeterViewTest.java | 2 +- .../fuelgauge/BatterySaverControllerTest.java | 2 +- .../BatteryStatsHelperLoaderTest.java | 3 +- .../settings/fuelgauge/BatteryUtilsTest.java | 2 +- .../ButtonActionDialogFragmentTest.java | 2 +- .../fuelgauge/HighPowerDetailTest.java | 2 +- .../fuelgauge/PowerGaugePreferenceTest.java | 9 +-- .../fuelgauge/PowerUsageAdvancedTest.java | 2 +- .../PowerUsageAnomalyDetailsTest.java | 2 +- .../PowerUsageFeatureProviderImplTest.java | 2 +- .../fuelgauge/PowerUsageSummaryTest.java | 2 +- .../anomaly/AnomalyDetectionPolicyTest.java | 3 +- .../anomaly/AnomalyDialogFragmentTest.java | 2 +- .../fuelgauge/anomaly/AnomalyLoaderTest.java | 2 +- .../anomaly/AnomalyPreferenceTest.java | 2 +- ...nomalySummaryPreferenceControllerTest.java | 2 +- .../fuelgauge/anomaly/AnomalyTest.java | 2 +- .../fuelgauge/anomaly/AnomalyUtilsTest.java | 2 +- .../action/BackgroundCheckActionTest.java | 3 +- .../anomaly/action/ForceStopActionTest.java | 2 +- .../checker/WakeLockAnomalyDetectorTest.java | 2 +- .../WakeupAlarmAnomalyDetectorTest.java | 5 +- ...AssistGesturePreferenceControllerTest.java | 2 +- ...reSensitivityPreferenceControllerTest.java | 2 +- .../gestures/AssistGestureSettingsTest.java | 3 +- ...raLiftTriggerPreferenceControllerTest.java | 2 +- .../CameraLiftTriggerSettingsTest.java | 2 +- ...oubleTapPowerPreferenceControllerTest.java | 2 +- .../gestures/DoubleTapPowerSettingsTest.java | 2 +- ...ubleTapScreenPreferenceControllerTest.java | 2 +- .../gestures/DoubleTapScreenSettingsTest.java | 2 +- .../DoubleTwistGestureSettingsTest.java | 3 +- .../DoubleTwistPreferenceControllerTest.java | 2 +- .../GesturePreferenceControllerTest.java | 2 +- ...PIckupGesturePreferenceControllerTest.java | 2 +- .../gestures/PickupGestureSettingsTest.java | 3 +- ...oNotificationPreferenceControllerTest.java | 2 +- .../SwipeToNotificationSettingsTest.java | 3 +- ...ameControllerPreferenceControllerTest.java | 2 +- ...sicalKeyboardPreferenceControllerTest.java | 2 +- .../SpellCheckerPreferenceControllerTest.java | 2 +- ...rtualKeyboardPreferenceControllerTest.java | 2 +- .../LanguageAndInputSettingsTest.java | 2 +- ...PhoneLanguagePreferenceControllerTest.java | 2 +- .../language/TtsPreferenceControllerTest.java | 2 +- ...serDictionaryPreferenceControllerTest.java | 2 +- ...ionPermissionPreferenceControllerTest.java | 4 +- .../LocationPreferenceControllerTest.java | 2 +- ...MobileNetworkPreferenceControllerTest.java | 2 +- .../MobilePlanPreferenceControllerTest.java | 2 +- .../network/NetworkDashboardFragmentTest.java | 2 +- .../NetworkResetActionMenuControllerTest.java | 2 +- .../NetworkResetPreferenceControllerTest.java | 2 +- .../NetworkResetRestrictionCheckerTest.java | 2 +- ...kScorerPickerPreferenceControllerTest.java | 2 +- .../network/NetworkScorerPickerTest.java | 2 +- .../TetherPreferenceControllerTest.java | 2 +- .../network/VpnPreferenceControllerTest.java | 2 +- .../WifiCallingPreferenceControllerTest.java | 2 +- .../settings/nfc/PaymentSettingsTest.java | 2 +- ...umeRestrictedPreferenceControllerTest.java | 2 +- ...AlarmRingtonePreferenceControllerTest.java | 2 +- .../AlarmVolumePreferenceControllerTest.java | 2 +- .../BootSoundPreferenceControllerTest.java | 3 +- .../CastPreferenceControllerTest.java | 2 +- ...ChargingSoundPreferenceControllerTest.java | 2 +- .../DialPadTonePreferenceControllerTest.java | 2 +- ...ockAudioMediaPreferenceControllerTest.java | 2 +- .../DockingSoundPreferenceControllerTest.java | 2 +- ...encyBroadcastPreferenceControllerTest.java | 2 +- ...EmergencyTonePreferenceControllerTest.java | 2 +- .../MediaVolumePreferenceControllerTest.java | 3 +- .../NotificationAccessSettingsTest.java | 2 +- ...ationRingtonePreferenceControllerTest.java | 2 +- ...icationVolumePreferenceControllerTest.java | 2 +- ...PhoneRingtonePreferenceControllerTest.java | 2 +- .../RingVolumePreferenceControllerTest.java | 3 +- .../RingtonePreferenceControllerBaseTest.java | 2 +- ...reenLockSoundPreferenceControllerTest.java | 2 +- .../SettingPrefControllerTest.java | 4 +- .../notification/SoundSettingsTest.java | 2 +- .../TouchSoundPreferenceControllerTest.java | 3 +- ...ibrateOnTouchPreferenceControllerTest.java | 4 +- ...brateWhenRingPreferenceControllerTest.java | 2 +- ...VolumeSeekBarPreferenceControllerTest.java | 2 +- .../WorkSoundPreferenceControllerTest.java | 2 +- .../notification/ZenAccessSettingsTest.java | 2 +- .../ZenModePreferenceControllerTest.java | 2 +- .../notification/ZenModeSettingsTest.java | 4 +- .../ChooseLockGenericControllerTest.java | 2 +- .../password/ChooseLockPasswordTest.java | 4 +- .../password/ChooseLockPatternTest.java | 4 +- .../password/ConfirmCredentialTest.java | 2 +- .../settings/password/ScreenLockTypeTest.java | 2 +- .../password/SetNewPasswordActivityTest.java | 2 +- .../SetNewPasswordControllerTest.java | 2 +- .../password/SetupChooseLockPasswordTest.java | 3 +- .../print/PrintSettingsFragmentTest.java | 2 +- .../search/BaseSearchIndexProviderTest.java | 2 +- .../CursorToSearchResultConverterTest.java | 2 +- .../settings/search/DataIntegrityTest.java | 2 +- .../search/DatabaseIndexingManagerTest.java | 2 +- .../search/DatabaseIndexingUtilsTest.java | 2 +- .../search/DatabaseResultLoaderTest.java | 3 +- .../settings/search/DatabaseRowTest.java | 2 +- .../DynamicIndexableContentMonitorTest.java | 2 +- .../settings/search/HeaderDecoratorTest.java | 2 +- .../search/InlineSwitchPayloadTest.java | 2 +- .../search/InlineSwitchViewHolderTest.java | 2 +- .../search/InstalledAppResultLoaderTest.java | 2 +- .../search/IntentSearchViewHolderTest.java | 2 +- .../settings/search/ResultPayloadTest.java | 4 +- .../search/ResultPayloadUtilsTest.java | 5 +- .../settings/search/SavedQueryLoaderTest.java | 6 +- .../search/SavedQueryPayloadTest.java | 4 +- .../SavedQueryRecorderAndRemoverTest.java | 2 +- .../search/SavedQueryViewHolderTest.java | 5 +- .../search/SearchFeatureProviderImplTest.java | 2 +- .../settings/search/SearchFragmentTest.java | 2 +- .../search/SearchIndexableResourcesTest.java | 2 +- .../search/SearchResultBuilderTest.java | 2 +- .../search/SearchResultsAdapterTest.java | 2 +- .../settings/search/SiteMapManagerTest.java | 3 +- .../settings/search/XmlParserUtilTest.java | 2 +- .../security/ConfigureKeyGuardDialogTest.java | 2 +- .../LockscreenDashboardFragmentTest.java | 2 +- .../OwnerInfoPreferenceControllerTest.java | 3 +- .../SecurityFeatureProviderImplTest.java | 2 +- .../suggestions/SettingsSuggestionsTest.java | 2 +- .../NewDeviceIntroSuggestionActivityTest.java | 2 +- .../settings/support/SupportConfigTest.java | 2 +- .../support/SupportDashboardActivityTest.java | 2 +- .../SupportDisclaimerDialogFragmentTest.java | 2 +- .../settings/survey/SurveyMixinTest.java | 2 +- .../FactoryResetPreferenceControllerTest.java | 2 +- .../system/SystemDashboardFragmentTest.java | 2 +- .../SettingsRobolectricTestRunner.java | 72 ++++++++++--------- .../TrustAgentFeatureProviderImplTest.java | 2 +- .../users/UserFeatureProviderImplTest.java | 2 +- .../settings/users/UserPreferenceTest.java | 2 +- .../settings/users/UserSettingsTest.java | 2 +- ...calClassLoaderContextThemeWrapperTest.java | 2 +- .../settings/vpn2/AppDialogFragmentTest.java | 2 +- .../android/settings/vpn2/VpnUtilsTest.java | 2 +- .../WallpaperSuggestionActivityTest.java | 2 +- .../webview/WebViewAppPickerTest.java | 2 +- .../WebViewAppPreferenceControllerTest.java | 2 +- .../settings/wfd/WifiDisplaySettingsTest.java | 2 +- .../widget/ActionBarShadowControllerTest.java | 2 +- .../widget/DefaultIndicatorSeekBarTest.java | 2 +- .../widget/EntityHeaderControllerTest.java | 2 +- .../FixedLineSummaryPreferenceTest.java | 2 +- .../widget/MasterSwitchPreferenceTest.java | 2 +- .../widget/RadioButtonPickerFragmentTest.java | 2 +- .../settings/widget/RingProgressBarTest.java | 2 +- .../widget/RtlCompatibleViewPagerTest.java | 2 +- .../widget/ScrollToParentEditTextTest.java | 2 +- .../settings/widget/SummaryUpdaterTest.java | 5 +- ...lularFallbackPreferenceControllerTest.java | 2 +- .../settings/wifi/LinkablePreferenceTest.java | 2 +- ...fyOpenNetworkPreferenceControllerTest.java | 2 +- .../UseOpenWifiPreferenceControllerTest.java | 2 +- .../wifi/WifiConfigControllerTest.java | 2 +- .../settings/wifi/WifiEnablerTest.java | 2 +- .../WifiInfoPreferenceControllerTest.java | 2 +- ...iMasterSwitchPreferenceControllerTest.java | 5 +- .../settings/wifi/WifiSummaryUpdaterTest.java | 2 +- .../WifiWakeupPreferenceControllerTest.java | 2 +- .../wifi/WpsPreferenceControllerTest.java | 2 +- .../wifi/WriteWifiConfigToNfcDialogTest.java | 3 +- .../WifiDetailPreferenceControllerTest.java | 3 +- .../P2pCategoryPreferenceControllerTest.java | 2 +- ...P2pThisDevicePreferenceControllerTest.java | 2 +- .../p2p/WifiP2PPreferenceControllerTest.java | 2 +- 406 files changed, 465 insertions(+), 564 deletions(-) rename tests/robotests/src/com/android/settings/{ => testutils}/SettingsRobolectricTestRunner.java (69%) diff --git a/tests/robotests/src/com/android/settings/DeviceAdminAddTest.java b/tests/robotests/src/com/android/settings/DeviceAdminAddTest.java index 42aed2b5fd9..cd891bee95e 100644 --- a/tests/robotests/src/com/android/settings/DeviceAdminAddTest.java +++ b/tests/robotests/src/com/android/settings/DeviceAdminAddTest.java @@ -20,6 +20,7 @@ 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; diff --git a/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java b/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java index c64e5826375..51034dd3d25 100644 --- a/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java +++ b/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java @@ -28,6 +28,7 @@ import android.os.UserManager; import android.support.v7.preference.PreferenceScreen; import com.android.settings.dashboard.SummaryLoader; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.XmlTestUtils; import com.android.settings.testutils.shadow.ShadowUtils; import com.android.settingslib.DeviceInfoUtils; diff --git a/tests/robotests/src/com/android/settings/DisplaySettingsTest.java b/tests/robotests/src/com/android/settings/DisplaySettingsTest.java index 716eacf2a93..6b895d7463a 100644 --- a/tests/robotests/src/com/android/settings/DisplaySettingsTest.java +++ b/tests/robotests/src/com/android/settings/DisplaySettingsTest.java @@ -1,8 +1,9 @@ package com.android.settings; import android.content.Context; -import android.os.PowerManager; + import com.android.settings.core.PreferenceController; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.XmlTestUtils; import com.android.settings.testutils.shadow.ShadowPowerManagerWrapper; import org.junit.Test; @@ -14,9 +15,8 @@ import java.util.ArrayList; import java.util.List; 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; @RunWith(SettingsRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) diff --git a/tests/robotests/src/com/android/settings/EncryptionAndCredentialTest.java b/tests/robotests/src/com/android/settings/EncryptionAndCredentialTest.java index 9a5002e2743..bc88b1aaa46 100644 --- a/tests/robotests/src/com/android/settings/EncryptionAndCredentialTest.java +++ b/tests/robotests/src/com/android/settings/EncryptionAndCredentialTest.java @@ -17,6 +17,7 @@ package com.android.settings; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import static com.google.common.truth.Truth.assertThat; diff --git a/tests/robotests/src/com/android/settings/LegalSettingsTest.java b/tests/robotests/src/com/android/settings/LegalSettingsTest.java index 6cfe2119de8..3d50c6366aa 100644 --- a/tests/robotests/src/com/android/settings/LegalSettingsTest.java +++ b/tests/robotests/src/com/android/settings/LegalSettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings; import android.content.Context; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.XmlTestUtils; import org.junit.Test; import org.junit.runner.RunWith; @@ -26,7 +27,6 @@ import org.robolectric.annotation.Config; import java.util.List; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.spy; @RunWith(SettingsRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) diff --git a/tests/robotests/src/com/android/settings/LicenseHtmlGeneratorFromXmlTest.java b/tests/robotests/src/com/android/settings/LicenseHtmlGeneratorFromXmlTest.java index ef36e5f5f06..ea4b2726aed 100644 --- a/tests/robotests/src/com/android/settings/LicenseHtmlGeneratorFromXmlTest.java +++ b/tests/robotests/src/com/android/settings/LicenseHtmlGeneratorFromXmlTest.java @@ -18,6 +18,8 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; +import com.android.settings.testutils.SettingsRobolectricTestRunner; + import java.util.HashMap; import java.util.Map; import java.io.ByteArrayInputStream; diff --git a/tests/robotests/src/com/android/settings/LicenseHtmlLoaderTest.java b/tests/robotests/src/com/android/settings/LicenseHtmlLoaderTest.java index 96e88c23395..b16d3155532 100644 --- a/tests/robotests/src/com/android/settings/LicenseHtmlLoaderTest.java +++ b/tests/robotests/src/com/android/settings/LicenseHtmlLoaderTest.java @@ -23,13 +23,13 @@ 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.when; import android.content.Context; +import com.android.settings.testutils.SettingsRobolectricTestRunner; + import java.io.File; import java.util.ArrayList; -import java.util.List; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/MasterClearTest.java b/tests/robotests/src/com/android/settings/MasterClearTest.java index 9af2b5f1d2c..d9139466300 100644 --- a/tests/robotests/src/com/android/settings/MasterClearTest.java +++ b/tests/robotests/src/com/android/settings/MasterClearTest.java @@ -35,6 +35,8 @@ import android.widget.CheckBox; import android.widget.LinearLayout; import android.widget.ScrollView; +import com.android.settings.testutils.SettingsRobolectricTestRunner; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/PrivacySettingsTest.java b/tests/robotests/src/com/android/settings/PrivacySettingsTest.java index 4aac314d5ca..c52204dba12 100644 --- a/tests/robotests/src/com/android/settings/PrivacySettingsTest.java +++ b/tests/robotests/src/com/android/settings/PrivacySettingsTest.java @@ -30,6 +30,8 @@ import org.robolectric.annotation.Config; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import com.android.settings.testutils.SettingsRobolectricTestRunner; + @RunWith(SettingsRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class PrivacySettingsTest { diff --git a/tests/robotests/src/com/android/settings/SecuritySettingsTest.java b/tests/robotests/src/com/android/settings/SecuritySettingsTest.java index e28a59468b4..5838642b635 100644 --- a/tests/robotests/src/com/android/settings/SecuritySettingsTest.java +++ b/tests/robotests/src/com/android/settings/SecuritySettingsTest.java @@ -30,6 +30,7 @@ import com.android.internal.widget.LockPatternUtils; import com.android.settings.dashboard.SummaryLoader; import com.android.settings.notification.LockScreenNotificationPreferenceController; 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.settingslib.drawer.DashboardCategory; diff --git a/tests/robotests/src/com/android/settings/SettingsActivityTest.java b/tests/robotests/src/com/android/settings/SettingsActivityTest.java index 75080ccb364..28babc2ef74 100644 --- a/tests/robotests/src/com/android/settings/SettingsActivityTest.java +++ b/tests/robotests/src/com/android/settings/SettingsActivityTest.java @@ -39,6 +39,7 @@ import android.view.Menu; import com.android.settings.search.SearchActivity; import com.android.settings.testutils.FakeFeatureFactory; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java b/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java index 9bf168dc340..942634a0a71 100644 --- a/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java @@ -30,6 +30,8 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import com.android.settings.testutils.SettingsRobolectricTestRunner; + @RunWith(SettingsRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class SettingsDialogFragmentTest { diff --git a/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java b/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java index 043b0feb326..0d0f22c1679 100644 --- a/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java +++ b/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java @@ -34,6 +34,8 @@ import java.io.PrintWriter; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.when; +import com.android.settings.testutils.SettingsRobolectricTestRunner; + @RunWith(SettingsRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class SettingsDumpServiceTest { diff --git a/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java b/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java index 3e28a2a9d54..dd17d9c1e8e 100644 --- a/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java +++ b/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java @@ -22,33 +22,25 @@ import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.when; import static org.robolectric.Shadows.shadowOf; import android.app.Application; -import android.os.Bundle; import android.os.SystemProperties; -import android.content.Context; import android.content.Intent; -import android.content.Loader; import android.net.Uri; -import android.os.Bundle; + +import com.android.settings.testutils.SettingsRobolectricTestRunner; import java.io.File; -import java.util.ArrayList; -import java.util.List; 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.annotation.Config; -import org.robolectric.res.builder.RobolectricPackageManager; import org.robolectric.util.ActivityController; -import org.robolectric.shadows.ShadowActivity; @RunWith(SettingsRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) diff --git a/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java index b5a4bf08dea..dc4166d7eb3 100644 --- a/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java @@ -41,6 +41,8 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; +import com.android.settings.testutils.SettingsRobolectricTestRunner; + @RunWith(SettingsRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class SettingsPreferenceFragmentTest { diff --git a/tests/robotests/src/com/android/settings/SetupChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/SetupChooseLockPatternTest.java index 5238a396064..78bc7d14768 100644 --- a/tests/robotests/src/com/android/settings/SetupChooseLockPatternTest.java +++ b/tests/robotests/src/com/android/settings/SetupChooseLockPatternTest.java @@ -28,6 +28,7 @@ import android.os.UserHandle; import com.android.settings.password.ChooseLockPattern.ChooseLockPatternFragment; import com.android.settings.password.ChooseLockPattern.IntentBuilder; import com.android.settings.password.SetupChooseLockPattern; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settings.testutils.shadow.ShadowDynamicIndexableContentMonitor; import com.android.settings.testutils.shadow.ShadowEventLogWriter; diff --git a/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java b/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java index 1c83a1a4c7b..115bc8a1d4a 100644 --- a/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java +++ b/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java @@ -18,8 +18,7 @@ package com.android.settings; import android.content.Intent; -import com.android.settings.SettingsRobolectricTestRunner; -import com.android.settings.TestConfig; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.setupwizardlib.util.WizardManagerHelper; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java index 4cf7e69afd8..d7e133e84e7 100644 --- a/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java @@ -31,6 +31,8 @@ import org.robolectric.annotation.Config; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertTrue; +import com.android.settings.testutils.SettingsRobolectricTestRunner; + @RunWith(SettingsRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class SummaryPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/TetherServiceTest.java b/tests/robotests/src/com/android/settings/TetherServiceTest.java index 2d5a2fb3f5f..0275c1525f9 100644 --- a/tests/robotests/src/com/android/settings/TetherServiceTest.java +++ b/tests/robotests/src/com/android/settings/TetherServiceTest.java @@ -23,6 +23,9 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.content.Intent; import android.net.wifi.WifiManager; + +import com.android.settings.testutils.SettingsRobolectricTestRunner; + import java.util.ArrayList; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/UtilsTest.java b/tests/robotests/src/com/android/settings/UtilsTest.java index 8dfd32a4d1d..93ab4063c48 100644 --- a/tests/robotests/src/com/android/settings/UtilsTest.java +++ b/tests/robotests/src/com/android/settings/UtilsTest.java @@ -19,11 +19,12 @@ import android.os.Bundle; import android.os.storage.DiskInfo; import android.os.storage.StorageManager; import android.os.storage.VolumeInfo; -import android.text.SpannableString; import android.text.SpannableStringBuilder; import android.text.format.DateUtils; import android.text.style.TtsSpan; +import com.android.settings.testutils.SettingsRobolectricTestRunner; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/ZonePickerTest.java b/tests/robotests/src/com/android/settings/ZonePickerTest.java index 6ab0c2d2985..31606f1a41f 100644 --- a/tests/robotests/src/com/android/settings/ZonePickerTest.java +++ b/tests/robotests/src/com/android/settings/ZonePickerTest.java @@ -26,6 +26,7 @@ import android.widget.SimpleAdapter; import android.widget.TextView; import com.android.settings.datetime.ZonePicker; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowLibcoreTimeZoneNames; import com.android.settings.testutils.shadow.ShadowTimeZoneNames; diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java index 4da06c083dc..01afdf8f88d 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java @@ -3,7 +3,7 @@ package com.android.settings.accessibility; import android.content.Context; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.XmlTestUtils; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java index 9161f06e9e8..f2d1e6534ac 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java @@ -21,7 +21,7 @@ import android.content.Context; import android.os.UserManager; import android.test.mock.MockContentResolver; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.applications.PackageManagerWrapper; import com.android.settings.testutils.FakeFeatureFactory; @@ -33,7 +33,6 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import org.robolectric.Shadows; import org.robolectric.annotation.Config; import static com.google.common.truth.Truth.assertThat; diff --git a/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java index a215d13033c..81b563f93e9 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java @@ -23,7 +23,7 @@ import android.os.UserHandle; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settingslib.drawer.CategoryKey; import com.android.settingslib.drawer.Tile; diff --git a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java index 64c2e9e19b8..008c0bcc2e7 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java @@ -26,7 +26,7 @@ import android.support.v7.preference.PreferenceScreen; import android.widget.TextView; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.applications.LayoutPreference; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java index 79ea4da049d..f4f093a296d 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java @@ -33,7 +33,7 @@ import android.text.TextUtils; import com.android.settings.AccessiblePreferenceCategory; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.search.SearchIndexableRaw; import com.android.settings.testutils.shadow.ShadowAccountManager; diff --git a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceTest.java b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceTest.java index eeca90bf8db..07780432be8 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceTest.java @@ -20,7 +20,7 @@ import android.accounts.Account; import android.content.Context; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java index c159a243c7a..edb5d89bcd8 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java @@ -26,7 +26,7 @@ import android.support.v7.preference.Preference; import com.android.settings.R; import com.android.settings.SettingsActivity; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java b/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java index 29f254d9aad..fff73b7f8e9 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java @@ -28,7 +28,7 @@ import android.support.v7.preference.PreferenceGroup; import android.support.v7.preference.PreferenceManager; import android.support.v7.preference.PreferenceScreen; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.shadow.ShadowAccountManager; import com.android.settings.testutils.shadow.ShadowContentResolver; diff --git a/tests/robotests/src/com/android/settings/accounts/AddUserWhenLockedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AddUserWhenLockedPreferenceControllerTest.java index 755212d4ce4..38f698881aa 100644 --- a/tests/robotests/src/com/android/settings/accounts/AddUserWhenLockedPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AddUserWhenLockedPreferenceControllerTest.java @@ -23,7 +23,7 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; import com.android.settingslib.RestrictedSwitchPreference; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/accounts/AutoSyncDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AutoSyncDataPreferenceControllerTest.java index f7dd7a3b054..b8ad837e24d 100644 --- a/tests/robotests/src/com/android/settings/accounts/AutoSyncDataPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AutoSyncDataPreferenceControllerTest.java @@ -18,13 +18,12 @@ package com.android.settings.accounts; import android.app.Fragment; import android.content.Context; import android.content.DialogInterface; -import android.content.Intent; import android.content.pm.UserInfo; import android.os.UserManager; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; import android.support.v14.preference.SwitchPreference; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import java.util.ArrayList; diff --git a/tests/robotests/src/com/android/settings/accounts/AutoSyncPersonalDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AutoSyncPersonalDataPreferenceControllerTest.java index 6ac0eaba7fd..ab462c001c3 100644 --- a/tests/robotests/src/com/android/settings/accounts/AutoSyncPersonalDataPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AutoSyncPersonalDataPreferenceControllerTest.java @@ -21,9 +21,8 @@ import android.content.pm.UserInfo; import android.os.UserManager; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.search.SearchIndexableRaw; import java.util.ArrayList; import java.util.List; diff --git a/tests/robotests/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceControllerTest.java index cd66d5e37dc..a25aa281a01 100644 --- a/tests/robotests/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceControllerTest.java @@ -17,10 +17,8 @@ package com.android.settings.accounts; -import static android.content.pm.UserInfo.FLAG_MANAGED_PROFILE; 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.Matchers.eq; import static org.mockito.Mockito.when; @@ -30,7 +28,7 @@ import android.content.pm.UserInfo; import android.os.UserHandle; import android.os.UserManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java index 2b8233ccd05..0f7de468307 100644 --- a/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java @@ -24,7 +24,7 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.search.SearchIndexableRaw; import com.android.settings.testutils.shadow.ShadowAccountManager; diff --git a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java index 76c560c0f76..93b525398ff 100644 --- a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java @@ -41,7 +41,7 @@ import android.support.v7.preference.PreferenceScreen; import android.widget.Button; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.applications.LayoutPreference; import com.android.settings.testutils.shadow.ShadowAccountManager; diff --git a/tests/robotests/src/com/android/settings/accounts/RemoveUserFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/RemoveUserFragmentTest.java index 965b6dc8b15..cd73068e194 100644 --- a/tests/robotests/src/com/android/settings/accounts/RemoveUserFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accounts/RemoveUserFragmentTest.java @@ -16,7 +16,7 @@ package com.android.settings.accounts; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/applications/AdvancedAppSettingsTest.java b/tests/robotests/src/com/android/settings/applications/AdvancedAppSettingsTest.java index 6960575d134..968421b4728 100644 --- a/tests/robotests/src/com/android/settings/applications/AdvancedAppSettingsTest.java +++ b/tests/robotests/src/com/android/settings/applications/AdvancedAppSettingsTest.java @@ -22,7 +22,7 @@ import android.os.UserManager; import android.telephony.TelephonyManager; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.applications.defaultapps.DefaultBrowserPreferenceController; import com.android.settings.applications.defaultapps.DefaultPhonePreferenceController; diff --git a/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java index 32b447a5bc9..697d04ffa8d 100644 --- a/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java @@ -19,7 +19,7 @@ package com.android.settings.applications; import android.content.Context; import android.os.UserManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.XmlTestUtils; diff --git a/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java b/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java index 5a526e724ee..735c12f8913 100644 --- a/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java @@ -25,7 +25,7 @@ import android.support.v7.preference.PreferenceManager; import android.support.v7.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.shadow.ShadowEntityHeaderController; diff --git a/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java index 6e3cc4bbcf6..e19c52f2204 100644 --- a/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java @@ -33,7 +33,7 @@ import android.content.pm.PermissionGroupInfo; import android.content.pm.PermissionInfo; import android.support.v7.preference.Preference; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import java.util.ArrayList; import java.util.List; diff --git a/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java b/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java index f17509a72b9..df226a83be4 100644 --- a/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java @@ -25,7 +25,7 @@ import android.app.AppOpsManager; import android.content.Context; import android.os.RemoteException; import android.os.UserManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settingslib.applications.ApplicationsState.AppEntry; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java b/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java index 3076080060c..62623e58cec 100644 --- a/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java @@ -20,8 +20,7 @@ import static com.google.common.truth.Truth.assertThat; import android.app.AppOpsManager; -import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java index e302edd9f75..8145b40fcb2 100644 --- a/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java @@ -8,7 +8,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.support.v7.preference.Preference; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java index 4a7dc8fa5e5..11401a886d6 100644 --- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java @@ -26,7 +26,7 @@ import android.os.RemoteException; import android.os.UserHandle; import android.os.UserManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.enterprise.DevicePolicyManagerWrapper; diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java index 73bba044c48..c3c1bb3877c 100644 --- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java @@ -23,7 +23,7 @@ import android.os.Build; import android.os.UserHandle; import android.os.UserManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.enterprise.DevicePolicyManagerWrapper; diff --git a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java index 672c5b7c03d..2b1c2967107 100644 --- a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java @@ -28,7 +28,7 @@ import android.os.Build; import android.os.UserHandle; import android.os.UserManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.enterprise.DevicePolicyManagerWrapper; import com.android.settings.testutils.ApplicationTestUtils; diff --git a/tests/robotests/src/com/android/settings/applications/DrawOverlayDetailsTest.java b/tests/robotests/src/com/android/settings/applications/DrawOverlayDetailsTest.java index 409a600e617..6122576bb3e 100644 --- a/tests/robotests/src/com/android/settings/applications/DrawOverlayDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/DrawOverlayDetailsTest.java @@ -23,7 +23,7 @@ import static org.mockito.Mockito.verify; import android.content.Context; import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.core.TouchOverlayManager; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java b/tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java index ad05c2752b2..10caf13f24d 100644 --- a/tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java +++ b/tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java @@ -17,7 +17,7 @@ package com.android.settings.applications; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java b/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java index a69ee6c87b8..3269acb1e29 100644 --- a/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java +++ b/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java @@ -28,7 +28,7 @@ import android.content.Context; import android.content.pm.ApplicationInfo; import android.os.UserHandle; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settingslib.applications.StorageStatsSource; import com.android.settingslib.applications.StorageStatsSource.AppStorageStats; diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java index 159d693be77..56df10e73e3 100644 --- a/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java +++ b/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java @@ -38,7 +38,7 @@ import android.content.pm.UserInfo; import android.os.UserHandle; import android.os.UserManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.shadow.ShadowUserManager; diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java index e86288bdabd..a57036161ba 100644 --- a/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java @@ -40,7 +40,7 @@ import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; import com.android.settings.R; import com.android.settings.SettingsActivity; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.applications.instantapps.InstantAppButtonsController; import com.android.settings.applications.instantapps.InstantAppButtonsController.ShowDialogDelegate; diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java index 6baa8c9ec37..c4c3259bf2c 100644 --- a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java +++ b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java @@ -24,7 +24,7 @@ import android.content.pm.UserInfo; import android.os.UserHandle; import android.os.UserManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; @@ -36,7 +36,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; @@ -51,7 +50,6 @@ import static org.mockito.Matchers.argThat; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; /** diff --git a/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java b/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java index 04d4342cd32..699c0dbb3c5 100644 --- a/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java @@ -27,7 +27,7 @@ import android.view.LayoutInflater; import android.view.View; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/applications/ManageApplicationsTest.java b/tests/robotests/src/com/android/settings/applications/ManageApplicationsTest.java index 0bff4977d4f..ea1d2c35959 100644 --- a/tests/robotests/src/com/android/settings/applications/ManageApplicationsTest.java +++ b/tests/robotests/src/com/android/settings/applications/ManageApplicationsTest.java @@ -26,7 +26,7 @@ import android.widget.TextView; import com.android.settings.R; import com.android.settings.Settings; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settings.testutils.shadow.SettingsShadowResources.SettingsShadowTheme; diff --git a/tests/robotests/src/com/android/settings/applications/MusicViewHolderControllerTest.java b/tests/robotests/src/com/android/settings/applications/MusicViewHolderControllerTest.java index 7eaf02b04a4..5df5bed9ed3 100644 --- a/tests/robotests/src/com/android/settings/applications/MusicViewHolderControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/MusicViewHolderControllerTest.java @@ -30,7 +30,7 @@ import android.os.storage.VolumeInfo; import android.provider.DocumentsContract; import android.view.LayoutInflater; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settingslib.applications.StorageStatsSource; import com.android.settingslib.deviceinfo.StorageVolumeProvider; diff --git a/tests/robotests/src/com/android/settings/applications/NotificationAppsTest.java b/tests/robotests/src/com/android/settings/applications/NotificationAppsTest.java index f84e7a883a7..16355768651 100644 --- a/tests/robotests/src/com/android/settings/applications/NotificationAppsTest.java +++ b/tests/robotests/src/com/android/settings/applications/NotificationAppsTest.java @@ -23,7 +23,7 @@ import android.content.pm.UserInfo; import android.os.UserManager; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.dashboard.SummaryLoader; import com.android.settings.notification.NotificationBackend; @@ -43,7 +43,6 @@ import org.robolectric.util.ReflectionHelpers; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; -import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/applications/PictureInPictureDetailsTest.java b/tests/robotests/src/com/android/settings/applications/PictureInPictureDetailsTest.java index 3c2589dbc3a..6bac9a3ee67 100644 --- a/tests/robotests/src/com/android/settings/applications/PictureInPictureDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/PictureInPictureDetailsTest.java @@ -25,7 +25,7 @@ import static org.mockito.Mockito.verify; import android.content.Context; import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/applications/PremiumSmsAccessTest.java b/tests/robotests/src/com/android/settings/applications/PremiumSmsAccessTest.java index 6474e09f4b1..30ebcde0c2d 100644 --- a/tests/robotests/src/com/android/settings/applications/PremiumSmsAccessTest.java +++ b/tests/robotests/src/com/android/settings/applications/PremiumSmsAccessTest.java @@ -24,7 +24,7 @@ import android.content.Context; import com.android.internal.logging.nano.MetricsProto; import com.android.internal.telephony.SmsUsageMonitor; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java index 4ddea135284..bfc5cd3b0a4 100644 --- a/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java @@ -29,7 +29,7 @@ import android.support.v7.preference.PreferenceCategory; import android.support.v7.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settingslib.applications.ApplicationsState; diff --git a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java index 44ca9f75504..f17addd64bb 100644 --- a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java @@ -23,7 +23,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.support.v7.preference.Preference; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.datausage.DataSaverBackend; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java b/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java index 5b381fc90f2..229057fb0a9 100644 --- a/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java @@ -23,7 +23,7 @@ import static org.mockito.Mockito.verify; import android.content.Context; import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/applications/VrListenerSettingsTest.java b/tests/robotests/src/com/android/settings/applications/VrListenerSettingsTest.java index f1655d59ca4..d2f1bbddefb 100644 --- a/tests/robotests/src/com/android/settings/applications/VrListenerSettingsTest.java +++ b/tests/robotests/src/com/android/settings/applications/VrListenerSettingsTest.java @@ -23,7 +23,7 @@ import static org.mockito.Mockito.verify; import android.content.Context; import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/applications/WriteSettingsDetailsTest.java b/tests/robotests/src/com/android/settings/applications/WriteSettingsDetailsTest.java index 3297dbfa5ce..a995394d031 100644 --- a/tests/robotests/src/com/android/settings/applications/WriteSettingsDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/WriteSettingsDetailsTest.java @@ -23,7 +23,7 @@ import static org.mockito.Mockito.verify; import android.content.Context; import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.FakeFeatureFactory; 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 161e376d670..6c8ad9ba827 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java @@ -22,7 +22,7 @@ import android.provider.Settings; import android.support.v7.preference.PreferenceScreen; import android.support.v7.preference.TwoStatePreference; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settingslib.core.lifecycle.Lifecycle; 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 63977cdd85d..7fa11cf8418 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java @@ -23,7 +23,7 @@ import android.provider.Settings; import android.support.v7.preference.PreferenceScreen; import android.support.v7.preference.TwoStatePreference; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.shadow.ShadowSecureSettings; import com.android.settingslib.core.lifecycle.Lifecycle; 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 abc030bc6ec..f0956c7bade 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/AssistSettingObserverTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/AssistSettingObserverTest.java @@ -19,7 +19,7 @@ package com.android.settings.applications.assist; import android.net.Uri; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.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 aca11a673dc..52916f5bc95 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java @@ -21,7 +21,7 @@ import android.content.ComponentName; import android.content.Context; import android.provider.Settings; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; 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 728a8a56c67..037bd10f37a 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java @@ -28,7 +28,7 @@ import android.content.pm.ResolveInfo; import android.content.pm.ServiceInfo; import android.provider.Settings; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.applications.defaultapps.DefaultAppInfo; import com.android.settings.testutils.shadow.ShadowSecureSettings; 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 91d4b518cc9..1b4fb09a134 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/ManageAssistTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/ManageAssistTest.java @@ -18,7 +18,7 @@ package com.android.settings.applications.assist; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppInfoTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppInfoTest.java index 4501a987eac..281e70a367f 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppInfoTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppInfoTest.java @@ -25,7 +25,7 @@ import android.content.ComponentName; import android.content.pm.PackageItemInfo; import android.content.pm.PackageManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.applications.PackageManagerWrapper; 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 c138070e9db..66ec80a26c8 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java @@ -24,7 +24,7 @@ import android.support.v7.preference.PreferenceScreen; import android.util.Pair; import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.widget.RadioButtonPreference; 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 fc000c9277d..120f3ae94e0 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java @@ -26,7 +26,7 @@ import android.os.UserManager; import android.support.v7.preference.Preference; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; 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 f564755631b..655f693f46f 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java @@ -27,7 +27,7 @@ import android.content.ComponentName; import android.content.Context; import android.os.UserManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.applications.PackageManagerWrapper; import com.android.settings.testutils.FakeFeatureFactory; 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 a7912c4923a..d6f1122451f 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java @@ -25,7 +25,7 @@ import android.support.v7.preference.Preference; import android.view.autofill.AutofillManager; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.applications.AutofillManagerWrapper; import com.android.settings.applications.PackageManagerWrapper; 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 63d8c6daa69..f5dc72d5ab9 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java @@ -21,7 +21,7 @@ import android.app.Activity; import android.content.Context; import android.os.UserManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.applications.PackageManagerWrapper; 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 ee2cd1dc703..e918ee221b5 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java @@ -24,7 +24,7 @@ import android.os.UserManager; import android.support.v7.preference.Preference; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.applications.PackageManagerWrapper; 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 6ee9e8606a4..04972ae358a 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java @@ -21,7 +21,7 @@ import android.content.Context; import android.os.UserManager; import android.provider.Settings; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.applications.PackageManagerWrapper; 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 f425d2fa19e..b50063729e3 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java @@ -29,7 +29,7 @@ import android.content.pm.UserInfo; import android.os.Build; import android.os.UserManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.applications.PackageManagerWrapper; 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 21537f5e1d7..d7e5192b87c 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java @@ -22,7 +22,7 @@ import android.content.Context; import android.os.UserManager; import android.support.v7.preference.Preference; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.applications.PackageManagerWrapper; diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultNotificationAssistantPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultNotificationAssistantPickerTest.java index acf90d581f3..a60b43c9fe6 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultNotificationAssistantPickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultNotificationAssistantPickerTest.java @@ -22,7 +22,7 @@ import android.content.Context; import android.os.UserManager; import android.provider.Settings; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.applications.PackageManagerWrapper; 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 0318a9769b5..600acb4a778 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPhonePickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPhonePickerTest.java @@ -21,7 +21,7 @@ import android.app.Activity; import android.content.Context; import android.os.UserManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.applications.PackageManagerWrapper; 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 ba19d83fc4a..da0c325ed23 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultSmsPickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultSmsPickerTest.java @@ -21,7 +21,7 @@ import android.app.Activity; import android.content.Context; import android.os.UserManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.applications.PackageManagerWrapper; diff --git a/tests/robotests/src/com/android/settings/applications/instantapps/InstantAppButtonsControllerTest.java b/tests/robotests/src/com/android/settings/applications/instantapps/InstantAppButtonsControllerTest.java index 13040a2b1c6..9e190b56e49 100644 --- a/tests/robotests/src/com/android/settings/applications/instantapps/InstantAppButtonsControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/instantapps/InstantAppButtonsControllerTest.java @@ -44,10 +44,9 @@ import android.view.View; import android.widget.Button; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.applications.PackageManagerWrapper; -import com.android.settings.backup.BackupSettingsActivityTest; import com.android.settings.core.instrumentation.MetricsFeatureProvider; import com.android.settings.testutils.FakeFeatureFactory; @@ -58,7 +57,6 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; -import org.robolectric.shadows.ShadowUserManager; import org.robolectric.util.ReflectionHelpers; /** Tests for the InstantAppButtonsController. */ diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java index a58b67db114..5fc3ebcae8c 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java @@ -23,17 +23,15 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.accounts.AccountManager; import android.app.backup.BackupManager; import android.content.Context; -import android.content.Intent; import android.os.RemoteException; import android.os.UserManager; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java index ae67b04f13b..69c8a0385f2 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java @@ -32,7 +32,7 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.os.UserHandle; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.search.SearchIndexableRaw; @@ -50,7 +50,6 @@ import org.robolectric.annotation.Implements; import org.robolectric.annotation.Resetter; import org.robolectric.res.builder.RobolectricPackageManager; import org.robolectric.util.ActivityController; -import org.robolectric.shadows.ShadowActivity; import static com.google.common.truth.Truth.assertThat; diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java index 02051244ca3..9de0c6a3c2e 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java @@ -45,7 +45,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settingslib.drawer.SettingsDrawerActivity; diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java index 7157862ef1b..3ad49e7cc5e 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java @@ -16,7 +16,7 @@ package com.android.settings.backup; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java index 386601d07e5..f2dc8517b51 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java @@ -25,7 +25,7 @@ import static org.mockito.Mockito.when; import android.widget.Button; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.applications.LayoutPreference; import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java index f14a498c42f..240ece1f9d7 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java @@ -25,7 +25,7 @@ import android.content.Context; import android.support.v14.preference.PreferenceFragment; import android.support.v7.preference.PreferenceScreen; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice; import com.android.settingslib.bluetooth.CachedBluetoothDevice; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java index ec82fe8b56f..aa7481934aa 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java @@ -25,7 +25,7 @@ import static org.mockito.Mockito.when; import android.graphics.drawable.Drawable; import android.support.v7.preference.Preference; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressControllerTest.java index dbd22e111e7..24b28a19e83 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressControllerTest.java @@ -17,7 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice; import com.android.settingslib.widget.FooterPreference; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java index f9834f8a165..e888d055a78 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java @@ -30,10 +30,9 @@ import android.bluetooth.BluetoothProfile; import android.content.Context; import android.support.v14.preference.SwitchPreference; import android.support.v7.preference.PreferenceCategory; -import android.support.v7.preference.PreferenceManager; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice; import com.android.settingslib.bluetooth.A2dpProfile; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java index d6077d8facb..84bdfcf147e 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java @@ -30,13 +30,12 @@ import android.app.Fragment; import android.app.FragmentManager; import android.app.FragmentTransaction; import android.content.Context; -import android.os.StrictMode; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; import android.text.SpannableStringBuilder; import android.text.style.ForegroundColorSpan; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settingslib.bluetooth.LocalBluetoothAdapter; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java index c4c1f8a89e8..8a651a726e0 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java @@ -21,7 +21,7 @@ import android.os.UserManager; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.core.instrumentation.MetricsFeatureProvider; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java index 074bef2beed..2d64396bb8c 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java @@ -19,7 +19,7 @@ import android.content.ComponentName; import android.content.Context; import android.os.UserManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.core.instrumentation.MetricsFeatureProvider; import com.android.settings.widget.MasterSwitchController; @@ -41,7 +41,6 @@ import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; @RunWith(SettingsRobolectricTestRunner.class) diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceControllerTest.java index f0fb91ccbac..ce78165f66d 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceControllerTest.java @@ -18,15 +18,13 @@ package com.android.settings.bluetooth; import android.app.Fragment; import android.content.Context; -import android.support.v7.preference.Preference; import android.support.v7.preference.Preference.OnPreferenceChangeListener; import android.support.v7.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.SettingsActivity; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.overlay.FeatureFactory; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.widget.MasterSwitchPreference; import com.android.settingslib.bluetooth.BluetoothCallback; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java index d19666bfca7..c4772e5e8e3 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java @@ -35,7 +35,7 @@ import android.os.UserManager; import android.support.v7.preference.PreferenceGroup; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settingslib.bluetooth.BluetoothDeviceFilter; import com.android.settingslib.bluetooth.LocalBluetoothAdapter; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java index 73f6b848ac5..243f1dbea61 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java @@ -24,7 +24,7 @@ import android.widget.CheckBox; import android.widget.TextView; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java index 937b31fd2d3..4459f6197e4 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java @@ -33,7 +33,7 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; import com.android.settings.SettingsActivity; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.R; import com.android.settingslib.bluetooth.LocalBluetoothAdapter; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsObsoleteTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsObsoleteTest.java index 549eeb774a0..51c8b158d97 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsObsoleteTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsObsoleteTest.java @@ -22,7 +22,7 @@ import static org.mockito.Mockito.spy; import android.content.Context; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsSummaryProviderTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsSummaryProviderTest.java index 8272dbf5f5f..0061ee52ea1 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsSummaryProviderTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsSummaryProviderTest.java @@ -18,7 +18,7 @@ package com.android.settings.bluetooth; import android.content.Context; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.dashboard.SummaryLoader; import com.android.settingslib.bluetooth.LocalBluetoothManager; @@ -32,11 +32,7 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import java.util.ArrayList; -import java.util.List; - import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; @RunWith(SettingsRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsTest.java index 6ceca41a13d..c772560d717 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsTest.java @@ -33,7 +33,7 @@ import android.view.View; import android.widget.TextView; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settingslib.bluetooth.LocalBluetoothAdapter; @@ -42,7 +42,6 @@ import com.android.settingslib.widget.FooterPreference; 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.RuntimeEnvironment; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java index 79daa0e7c86..4f57ecc12e3 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java @@ -23,7 +23,7 @@ import android.bluetooth.BluetoothDevice; import android.content.Context; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener; import com.android.settingslib.bluetooth.CachedBluetoothDevice; @@ -46,7 +46,6 @@ import java.util.Set; 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; diff --git a/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java index d9936d9c478..c205c5023d6 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java @@ -32,7 +32,7 @@ import android.os.UserManager; import android.support.v7.preference.Preference; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.core.PreferenceController; import com.android.settingslib.bluetooth.CachedBluetoothDevice; diff --git a/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java b/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java index c61823cb8ee..a6793bb20df 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java @@ -23,7 +23,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.CheckBox; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.shadow.ShadowEventLogWriter; import com.android.settingslib.R; diff --git a/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java b/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java index 5f4b101d060..4667dacef5a 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java @@ -18,7 +18,7 @@ package com.android.settings.bluetooth; import android.content.Context; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.core.instrumentation.MetricsFeatureProvider; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/conditional/ConditionAdapterUtilsTest.java b/tests/robotests/src/com/android/settings/conditional/ConditionAdapterUtilsTest.java index bf28d973cbb..83883b2b244 100644 --- a/tests/robotests/src/com/android/settings/conditional/ConditionAdapterUtilsTest.java +++ b/tests/robotests/src/com/android/settings/conditional/ConditionAdapterUtilsTest.java @@ -19,7 +19,7 @@ import android.content.Context; import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.dashboard.DashboardAdapter; import com.android.settings.dashboard.conditional.Condition; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java index 72cbf4ec8ce..dbeecaa2b93 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java @@ -23,7 +23,7 @@ import android.provider.SearchIndexableResource; import com.android.settings.R; import com.android.settings.nfc.NfcPreferenceController; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.dashboard.SummaryLoader; import com.android.settings.testutils.XmlTestUtils; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/UsbModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/UsbModePreferenceControllerTest.java index 4b84b0f4c7a..7edde6e064b 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/UsbModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/UsbModePreferenceControllerTest.java @@ -7,7 +7,7 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.deviceinfo.UsbBackend; import com.android.settings.deviceinfo.UsbModeChooserActivity; @@ -23,8 +23,6 @@ import org.robolectric.shadows.ShadowApplication; 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.anyString; import static org.mockito.Mockito.when; @RunWith(SettingsRobolectricTestRunner.class) diff --git a/tests/robotests/src/com/android/settings/core/DynamicAvailabilityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/DynamicAvailabilityPreferenceControllerTest.java index c4635c6fa01..9bf73cea278 100644 --- a/tests/robotests/src/com/android/settings/core/DynamicAvailabilityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/core/DynamicAvailabilityPreferenceControllerTest.java @@ -20,9 +20,8 @@ import android.content.Context; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.core.PreferenceAvailabilityObserver; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; 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 4aa576f611c..23e1e2eba74 100644 --- a/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java +++ b/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java @@ -16,7 +16,7 @@ package com.android.settings.core.codeinspection; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.core.instrumentation.InstrumentableFragmentCodeInspector; import com.android.settings.search.SearchIndexProviderCodeInspector; 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 0abac1d266f..a9273065c7b 100644 --- a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentedDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentedDialogFragmentTest.java @@ -16,7 +16,7 @@ package com.android.settings.core.instrumentation; import android.os.Bundle; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Test; import org.junit.runner.RunWith; 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 eb6e392dd52..ea33c83391f 100644 --- a/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java +++ b/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java @@ -21,7 +21,7 @@ import android.content.Intent; import android.util.Pair; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.overlay.FeatureFactory; diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/SharedPreferenceLoggerTest.java b/tests/robotests/src/com/android/settings/core/instrumentation/SharedPreferenceLoggerTest.java index 216026aaf9b..ec644a6cfde 100644 --- a/tests/robotests/src/com/android/settings/core/instrumentation/SharedPreferenceLoggerTest.java +++ b/tests/robotests/src/com/android/settings/core/instrumentation/SharedPreferenceLoggerTest.java @@ -19,7 +19,7 @@ import android.content.Context; import android.content.SharedPreferences; import android.util.Pair; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/VisibilityLoggerMixinTest.java b/tests/robotests/src/com/android/settings/core/instrumentation/VisibilityLoggerMixinTest.java index 06b1d06224e..1a47a66f25e 100644 --- a/tests/robotests/src/com/android/settings/core/instrumentation/VisibilityLoggerMixinTest.java +++ b/tests/robotests/src/com/android/settings/core/instrumentation/VisibilityLoggerMixinTest.java @@ -32,7 +32,7 @@ import android.content.Intent; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.SettingsActivity; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java index 5799b2254c0..7ba38dcb8da 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java @@ -43,7 +43,7 @@ import android.widget.TextView; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.dashboard.conditional.Condition; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java index b78d05cd5d3..2791da3f6a7 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java @@ -31,7 +31,7 @@ import android.support.v7.preference.Preference; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SettingsActivity; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.shadow.ShadowUserManager; diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java index c981d2da7c6..2d329495128 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java @@ -30,7 +30,7 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceManager; import android.support.v7.preference.PreferenceScreen; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.core.PreferenceController; import com.android.settings.core.instrumentation.VisibilityLoggerMixin; diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java index 90ff25c9f0c..cda9a2269eb 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java @@ -18,7 +18,7 @@ package com.android.settings.dashboard; import android.content.Context; import android.widget.TextView; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.dashboard.SupportItemAdapter.ViewHolder; import com.android.settingslib.drawer.Tile; diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java index c2f76467448..c6446f16601 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java @@ -19,7 +19,7 @@ package com.android.settings.dashboard; import android.app.Activity; import android.support.v7.widget.LinearLayoutManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.dashboard.conditional.ConditionManager; import com.android.settings.dashboard.conditional.FocusRecyclerView; @@ -34,7 +34,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -import static org.mockito.Matchers.anyList; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java index a7b0c5420c6..c48f30ca742 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java @@ -20,7 +20,7 @@ import android.content.Context; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/dashboard/ProgressiveDisclosureTest.java b/tests/robotests/src/com/android/settings/dashboard/ProgressiveDisclosureTest.java index 55c275b3e5c..6fe60cf5124 100644 --- a/tests/robotests/src/com/android/settings/dashboard/ProgressiveDisclosureTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/ProgressiveDisclosureTest.java @@ -23,7 +23,7 @@ import android.support.v7.preference.PreferenceManager; import android.support.v7.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.FakeFeatureFactory; @@ -44,7 +44,6 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; diff --git a/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java b/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java index 547792be078..b08d62ea07e 100644 --- a/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java @@ -17,7 +17,7 @@ package com.android.settings.dashboard; import android.app.Activity; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settingslib.drawer.DashboardCategory; import com.android.settingslib.drawer.Tile; diff --git a/tests/robotests/src/com/android/settings/dashboard/SupportItemAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/SupportItemAdapterTest.java index b0dfe61cdaf..3dd52667239 100644 --- a/tests/robotests/src/com/android/settings/dashboard/SupportItemAdapterTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/SupportItemAdapterTest.java @@ -26,7 +26,7 @@ import android.widget.Spinner; import android.widget.SpinnerAdapter; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.core.instrumentation.MetricsFeatureProvider; import com.android.settings.dashboard.SupportItemAdapter.EscalationData; diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java index 141ef6e91c8..688f07861eb 100644 --- a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java @@ -21,11 +21,10 @@ import android.view.View; import android.widget.LinearLayout; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.dashboard.DashboardAdapter; import com.android.settings.dashboard.DashboardData; -import com.android.settings.dashboard.conditional.Condition; import java.util.ArrayList; import java.util.List; diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java index 4ef7263d984..d077e6fcd77 100644 --- a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java @@ -20,7 +20,7 @@ import android.content.Context; import android.content.IntentFilter; import android.graphics.drawable.Icon; import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.core.instrumentation.MetricsFeatureProvider; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/DndConditionTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/DndConditionTest.java index 3344698af79..e46ae9ef68a 100644 --- a/tests/robotests/src/com/android/settings/dashboard/conditional/DndConditionTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/conditional/DndConditionTest.java @@ -18,7 +18,7 @@ package com.android.settings.dashboard.conditional; import android.content.ComponentName; import android.content.Context; import android.content.pm.PackageManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/EventStoreTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/EventStoreTest.java index 4b9e440197a..114ee2b0cfb 100644 --- a/tests/robotests/src/com/android/settings/dashboard/suggestions/EventStoreTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/EventStoreTest.java @@ -16,7 +16,7 @@ package com.android.settings.dashboard.suggestions; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java index cf45c016755..a29ac93b690 100644 --- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java @@ -22,7 +22,7 @@ import android.view.View; import android.widget.LinearLayout; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.dashboard.DashboardAdapter; import com.android.settingslib.drawer.Tile; @@ -43,7 +43,6 @@ import static org.mockito.Mockito.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; @RunWith(SettingsRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionDismissControllerTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionDismissControllerTest.java index 92bc915a7e8..c20e5c4c36b 100644 --- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionDismissControllerTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionDismissControllerTest.java @@ -30,7 +30,7 @@ import android.support.v7.widget.RecyclerView; import android.support.v7.widget.helper.ItemTouchHelper; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settingslib.drawer.Tile; 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 8ddb393c813..d5d87b1b34f 100644 --- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java @@ -21,7 +21,7 @@ import android.content.Intent; import android.content.pm.PackageManager; import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settingslib.drawer.Tile; diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeaturizerTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeaturizerTest.java index cb4ce71c3cd..4d6a7435310 100644 --- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeaturizerTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeaturizerTest.java @@ -19,7 +19,7 @@ package com.android.settings.dashboard.suggestions; import java.util.Arrays; import java.util.Map; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionRankerTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionRankerTest.java index 056d959ff66..1f32531713f 100644 --- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionRankerTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionRankerTest.java @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settingslib.drawer.Tile; @@ -35,8 +35,6 @@ import org.robolectric.annotation.Config; import static com.google.common.truth.Truth.assertThat; -import org.robolectric.RuntimeEnvironment; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.mockito.Mockito.same; diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionsChecksTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionsChecksTest.java index accca2abc35..5f3c0f0c38b 100644 --- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionsChecksTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionsChecksTest.java @@ -31,7 +31,7 @@ import android.content.pm.PackageManager; import android.hardware.fingerprint.FingerprintManager; import com.android.settings.Settings; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settingslib.drawer.Tile; diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java index a9b4d78f680..05efa9f805c 100644 --- a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java +++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java @@ -25,7 +25,7 @@ import android.support.v7.preference.PreferenceScreen; import android.util.ArraySet; import android.view.View; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.applications.PackageManagerWrapper; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java b/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java index fd1c96bc127..ac28e1defaf 100644 --- a/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java +++ b/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java @@ -30,7 +30,7 @@ import android.graphics.drawable.Drawable; import android.support.v7.preference.Preference; import android.util.ArraySet; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java index eec4324c52e..8b635d24ead 100644 --- a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java +++ b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java @@ -20,7 +20,7 @@ import android.content.DialogInterface; import android.content.SharedPreferences; import android.os.Bundle; import android.support.v7.preference.PreferenceManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java index 003f4d34574..e60243bf846 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java @@ -2,7 +2,7 @@ package com.android.settings.datausage; import android.net.NetworkPolicy; import android.net.NetworkTemplate; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settingslib.net.DataUsageController.DataUsageInfo; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java index c5570bb113c..9ab88d3a805 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java @@ -18,7 +18,7 @@ package com.android.settings.datausage; import android.content.Context; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settingslib.NetworkPolicyEditor; diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java index 92ded0da7dc..77e0fe9ad9d 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java @@ -23,7 +23,7 @@ import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.XmlTestUtils; import com.android.settings.testutils.shadow.ShadowConnectivityManager; diff --git a/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java b/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java index 899894bea7a..f20e50c3e12 100644 --- a/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java +++ b/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java @@ -26,7 +26,7 @@ import android.content.pm.ApplicationInfo; import android.os.Process; import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settingslib.applications.ApplicationsState; diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java index d0bd67bd3e7..d28cad1d785 100644 --- a/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java @@ -19,7 +19,7 @@ package com.android.settings.datetime; import android.content.Context; import android.provider.Settings; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settingslib.RestrictedSwitchPreference; diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java index 0ac02510386..41bff933443 100644 --- a/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java @@ -21,7 +21,7 @@ import android.net.ConnectivityManager; import android.provider.Settings; import android.support.v7.preference.Preference; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java index 4b9d3ec167b..e6a6dd842e0 100644 --- a/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java @@ -20,7 +20,7 @@ import android.app.AlarmManager; import android.content.Context; import android.support.v7.preference.Preference; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java b/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java index bd85958b53d..843c753d9a6 100644 --- a/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java +++ b/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java @@ -19,7 +19,7 @@ package com.android.settings.datetime; import android.content.Context; import android.content.Intent; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; diff --git a/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java index 41c5a276232..58ecd62e712 100644 --- a/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java @@ -23,7 +23,7 @@ import android.provider.Settings; import android.support.v14.preference.SwitchPreference; import android.support.v7.preference.PreferenceScreen; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import java.util.List; diff --git a/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java index 3995f37fe68..15877e0dc3e 100644 --- a/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java @@ -19,7 +19,7 @@ package com.android.settings.datetime; import android.content.Context; import android.support.v7.preference.Preference; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java index cab6f711de0..2f96d65e26d 100644 --- a/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java @@ -19,7 +19,7 @@ package com.android.settings.datetime; import android.content.Context; import android.support.v7.preference.Preference; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/datetime/ZonePickerTest.java b/tests/robotests/src/com/android/settings/datetime/ZonePickerTest.java index a964cb35912..92807e9fcf3 100644 --- a/tests/robotests/src/com/android/settings/datetime/ZonePickerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/ZonePickerTest.java @@ -26,7 +26,7 @@ import android.os.Bundle; import android.view.LayoutInflater; import android.view.ViewGroup; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.core.instrumentation.VisibilityLoggerMixin; import com.android.settings.testutils.shadow.ShadowZoneGetter; diff --git a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java index 1bc859f2679..38c4ab21e9d 100644 --- a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java @@ -33,7 +33,7 @@ import android.provider.Settings; import android.support.v7.preference.Preference; import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.core.instrumentation.MetricsFeatureProvider; import com.android.settings.overlay.FeatureFactory; diff --git a/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java index 902fb150690..f703b263604 100644 --- a/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java @@ -25,7 +25,7 @@ import android.support.v14.preference.SwitchPreference; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; @@ -39,11 +39,9 @@ import org.robolectric.shadows.ShadowApplication; 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.anyBoolean; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; -import static org.mockito.Mockito.doCallRealMethod; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java index 35ca5f8c656..3b3b482fa41 100644 --- a/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java @@ -21,14 +21,12 @@ import android.os.UserManager; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settingslib.drawer.CategoryKey; 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.annotation.Config; @@ -38,7 +36,6 @@ import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.never; -import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDisabledActivityTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDisabledActivityTest.java index 67733aa92c8..59276465ac8 100644 --- a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDisabledActivityTest.java +++ b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDisabledActivityTest.java @@ -18,7 +18,7 @@ package com.android.settings.development; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsEnablerTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsEnablerTest.java index 87905aa8b15..c9378417f83 100644 --- a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsEnablerTest.java +++ b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsEnablerTest.java @@ -20,7 +20,7 @@ import android.content.Context; import android.content.SharedPreferences; import android.provider.Settings; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsTest.java index cc9d5ed0c07..8e4b74d21e2 100644 --- a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsTest.java +++ b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsTest.java @@ -24,7 +24,7 @@ import android.support.v7.preference.PreferenceManager; import android.support.v7.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.shadow.SettingsShadowResources; diff --git a/tests/robotests/src/com/android/settings/development/TelephonyMonitorPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/TelephonyMonitorPreferenceControllerTest.java index 9a1a3b62393..2f0f261fda8 100644 --- a/tests/robotests/src/com/android/settings/development/TelephonyMonitorPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/TelephonyMonitorPreferenceControllerTest.java @@ -22,7 +22,7 @@ import android.support.v14.preference.SwitchPreference; import android.support.v7.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.shadow.SettingsShadowSystemProperties; @@ -33,8 +33,6 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; -import org.robolectric.shadows.ShadowApplication; -import org.robolectric.shadows.ShadowToast; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java index d9c17bc49c6..45e457bd195 100644 --- a/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java @@ -23,16 +23,14 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.app.admin.DevicePolicyManager; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; -import android.os.UserManager; import android.provider.Settings.Global; import android.support.v7.preference.PreferenceScreen; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import com.android.settingslib.RestrictedSwitchPreference; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BasebandVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BasebandVersionPreferenceControllerTest.java index b54fc53b0c3..3bba438ab52 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/BasebandVersionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/BasebandVersionPreferenceControllerTest.java @@ -17,10 +17,9 @@ package com.android.settings.deviceinfo; import android.content.Context; import android.net.ConnectivityManager; -import android.os.SystemProperties; import android.support.v7.preference.Preference; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.shadow.SettingsShadowSystemProperties; @@ -31,7 +30,6 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; -import org.robolectric.shadows.ShadowSystemProperties; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java index 40190d49af0..7601f8ae191 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java @@ -27,7 +27,7 @@ import android.support.v7.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.development.DevelopmentSettings; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.search.DatabaseIndexingManager; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java index ea60e4c4469..108d34212d2 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java @@ -21,7 +21,7 @@ import android.content.Context; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java index 7b2b198b576..951d8c7310b 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java @@ -20,7 +20,7 @@ import android.content.Context; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.shadow.SettingsShadowSystemProperties; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java index 1cbd14790ce..dfc1a0c65f9 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.deviceinfo; import android.app.Fragment; import android.content.Context; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceControllerTest.java index 02d526390be..5a4d9888dff 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceControllerTest.java @@ -20,7 +20,7 @@ import android.os.UserManager; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java index 245d7d6013f..8e8da51aa73 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java @@ -21,7 +21,7 @@ import android.os.SystemProperties; import android.view.View; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/KernelVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/KernelVersionPreferenceControllerTest.java index 8d471356a1d..10e49587377 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/KernelVersionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/KernelVersionPreferenceControllerTest.java @@ -17,7 +17,7 @@ package com.android.settings.deviceinfo; import android.content.Context; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java index 11968335b90..6151ca030f7 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.deviceinfo; import android.content.Context; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java index 9ac9eb49d18..ca6a33a268b 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java @@ -28,10 +28,9 @@ import android.view.MenuInflater; import android.view.MenuItem; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.applications.PackageManagerWrapper; -import com.android.settings.testutils.FakeFeatureFactory; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java index 87e8e1bfdd9..4ea33ee7ece 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java @@ -22,7 +22,7 @@ import android.content.pm.ResolveInfo; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/SerialNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/SerialNumberPreferenceControllerTest.java index bf9c4120c79..18ef0039371 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/SerialNumberPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/SerialNumberPreferenceControllerTest.java @@ -20,7 +20,7 @@ import android.content.Context; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java index 0c9988b7473..b2d259a1846 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java @@ -25,7 +25,7 @@ import android.app.Activity; import android.os.storage.StorageManager; import android.provider.SearchIndexableResource; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settingslib.drawer.CategoryKey; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java index 6cb8f5824c0..a154c03ab4d 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java @@ -25,7 +25,7 @@ import android.view.LayoutInflater; import android.widget.ProgressBar; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java index 03f15bbec15..44e060fd5e2 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java @@ -23,7 +23,7 @@ import static org.mockito.Mockito.verify; import android.util.SparseArray; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.deviceinfo.storage.StorageAsyncLoader; import com.android.settings.deviceinfo.storage.StorageItemPreferenceController; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java index 89328e49758..5e95a616102 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java @@ -30,7 +30,7 @@ import android.os.storage.VolumeInfo; import android.text.format.Formatter; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.dashboard.SummaryLoader; import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/SystemUpdatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/SystemUpdatePreferenceControllerTest.java index 30c6dc90ba4..5c62220bbd1 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/SystemUpdatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/SystemUpdatePreferenceControllerTest.java @@ -22,7 +22,7 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/UsbBackendTest.java b/tests/robotests/src/com/android/settings/deviceinfo/UsbBackendTest.java index af05c7f9364..ce384a5d973 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/UsbBackendTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/UsbBackendTest.java @@ -26,7 +26,7 @@ import android.content.Context; import android.content.pm.PackageManager; import android.hardware.usb.UsbManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/UsbModeChooserActivityTest.java b/tests/robotests/src/com/android/settings/deviceinfo/UsbModeChooserActivityTest.java index d9c474de99d..1817bfb2902 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/UsbModeChooserActivityTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/UsbModeChooserActivityTest.java @@ -22,7 +22,7 @@ import static org.mockito.Mockito.verify; import android.widget.TextView; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; import org.junit.Test; 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 ee8e7d1ec9b..9bc1a3a521b 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java @@ -19,7 +19,6 @@ 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.anyString; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -36,7 +35,7 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.core.instrumentation.MetricsFeatureProvider; import com.android.settings.deletionhelper.ActivationWarningFragment; 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 dc1c2860777..9b4f30e6162 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java @@ -33,7 +33,7 @@ import android.support.v7.preference.PreferenceGroup; import android.support.v7.preference.PreferenceScreen; import android.util.SparseArray; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.applications.UserManagerWrapper; import com.android.settings.core.PreferenceController; 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 63b9933192b..5c186704ff6 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java @@ -44,7 +44,7 @@ import android.widget.LinearLayout; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.SubSettings; import com.android.settings.TestConfig; import com.android.settings.applications.ManageApplications; 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 0ae5232b078..d3c6a2506d7 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java @@ -27,17 +27,15 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.storage.VolumeInfo; -import android.provider.Settings; import android.support.v7.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; import android.widget.Button; import android.widget.LinearLayout; -import android.widget.TextView; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.core.instrumentation.MetricsFeatureProvider; import com.android.settings.testutils.FakeFeatureFactory; @@ -54,7 +52,6 @@ import org.robolectric.annotation.Config; import java.io.File; import static com.android.settings.TestUtils.KILOBYTE; -import static com.android.settings.TestUtils.MEGABYTE; import static com.android.settings.TestUtils.GIGABYTE; @RunWith(SettingsRobolectricTestRunner.class) 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 2199824eac6..db7c9f76371 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java @@ -34,7 +34,7 @@ import android.support.v7.preference.PreferenceScreen; import android.util.SparseArray; import com.android.settings.SettingsActivity; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.SubSettings; import com.android.settings.TestConfig; import com.android.settings.applications.UserManagerWrapper; diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java index c89e29f847a..d38ac51d6fe 100644 --- a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java @@ -27,7 +27,7 @@ import android.provider.Settings; import android.support.v14.preference.SwitchPreference; import com.android.internal.hardware.AmbientDisplayConfiguration; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.shadow.ShadowSecureSettings; diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java index 1997198a01b..77cb4c6afe3 100644 --- a/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java @@ -32,7 +32,7 @@ import android.provider.Settings; import android.support.v14.preference.SwitchPreference; import com.android.internal.hardware.AmbientDisplayConfiguration; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.core.instrumentation.MetricsFeatureProvider; import com.android.settings.testutils.shadow.ShadowSecureSettings; diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayPreferenceControllerTest.java index 3ae48319c93..2933517cc11 100644 --- a/tests/robotests/src/com/android/settings/display/AmbientDisplayPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayPreferenceControllerTest.java @@ -27,7 +27,7 @@ import android.support.v7.preference.Preference; import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.shadow.ShadowSecureSettings; diff --git a/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java index fae48731016..02f46f248fa 100644 --- a/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java @@ -19,12 +19,12 @@ package com.android.settings.display; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.search.InlinePayload; import com.android.settings.search.InlineSwitchPayload; import com.android.settings.search.ResultPayload; -import com.android.settings.search.ResultPayload.Availability; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java index 02dea50d6cc..6d9cbab317c 100644 --- a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java @@ -23,7 +23,7 @@ import android.os.UserHandle; import android.provider.Settings; import android.support.v14.preference.SwitchPreference; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.shadow.ShadowSystemSettings; diff --git a/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java index 792b853bd75..73c5374555f 100644 --- a/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java @@ -21,7 +21,7 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.provider.Settings; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java index 0b330890617..378b054fe7f 100644 --- a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java @@ -29,7 +29,7 @@ import android.provider.Settings.System; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java index f93e1a735a5..00d910eb82c 100644 --- a/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java @@ -19,7 +19,7 @@ import android.content.Context; import android.os.IBinder; import android.support.v14.preference.SwitchPreference; import android.support.v7.preference.PreferenceScreen; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.shadow.SettingsShadowSystemProperties; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java index 4e9cedee0d0..3d99f658391 100644 --- a/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java @@ -23,7 +23,7 @@ import android.content.pm.PackageManager.NameNotFoundException; import android.support.v7.preference.ListPreference; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.display.ThemePreferenceController.OverlayManager; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java index 2ebad46c67d..480e41fe84f 100644 --- a/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.display; import android.content.Context; import android.provider.Settings; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.TimeoutListPreference; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java b/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java index 56d4c47fe4f..191a8fb39cd 100644 --- a/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java +++ b/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java @@ -25,7 +25,7 @@ import android.os.UserHandle; import android.provider.Settings; import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.shadow.ShadowSecureSettings; diff --git a/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java b/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java index 24082b610bb..bd25d92064b 100644 --- a/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java +++ b/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java @@ -20,7 +20,7 @@ import android.app.Activity; import android.content.ComponentName; import android.content.Context; import android.os.UserManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settingslib.dream.DreamBackend; diff --git a/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java index c55f080ed9f..e3493a17af0 100644 --- a/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.dream; import android.content.ComponentName; import android.content.Context; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.widget.GearPreference; import com.android.settingslib.dream.DreamBackend; diff --git a/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java b/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java index 95f57b3fd74..73526e5db99 100644 --- a/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java +++ b/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java @@ -18,7 +18,7 @@ package com.android.settings.dream; import android.content.Context; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settingslib.dream.DreamBackend; import com.android.settingslib.dream.DreamBackend.WhenToDream; diff --git a/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java index 5cbd6106004..444591a6b64 100644 --- a/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java @@ -21,7 +21,7 @@ import android.support.v7.preference.PreferenceScreen; import android.view.View.OnClickListener; import android.widget.Button; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.applications.LayoutPreference; import com.android.settingslib.dream.DreamBackend; diff --git a/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java b/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java index 2571e1ba96c..bafc2d40c74 100644 --- a/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java +++ b/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java @@ -19,7 +19,7 @@ package com.android.settings.dream; import android.app.Activity; import android.content.Context; import android.os.UserManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settingslib.dream.DreamBackend; diff --git a/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java index 0eded7bc591..2acf82b34cf 100644 --- a/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.dream; import android.content.Context; import android.support.v7.preference.Preference; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settingslib.dream.DreamBackend; import com.android.settingslib.dream.DreamBackend.WhenToDream; diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java index b5d6b7ac69b..111e503def9 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java @@ -16,9 +16,7 @@ package com.android.settings.enterprise; -import android.content.Context; - -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceControllerTest.java index 0281ce5dc8f..491fcdba99d 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.enterprise; import android.Manifest; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceControllerTest.java index d556296479c..01a13d29394 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.enterprise; import android.Manifest; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceControllerTest.java index e2a45ecd03b..fed16317219 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.enterprise; import android.Manifest; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBaseTest.java index 4da1cd28b0c..a209a46256e 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBaseTest.java @@ -16,12 +16,7 @@ package com.android.settings.enterprise; -import android.Manifest; -import android.content.Intent; -import android.support.v7.preference.Preference; -import android.text.TextUtils; - -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java index 51c8a7b381d..045acf2ebd0 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java @@ -20,7 +20,7 @@ import android.content.Context; import com.android.settings.R; import android.support.v7.preference.Preference; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.core.PreferenceAvailabilityObserver; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java index 456271136d8..b321652168b 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java @@ -19,7 +19,7 @@ package com.android.settings.enterprise; import android.content.Context; import android.support.v7.preference.Preference; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.core.PreferenceAvailabilityObserver; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java b/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java index 1936f807eb1..83ea3996120 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java @@ -23,7 +23,7 @@ import android.support.v7.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.applications.ApplicationFeatureProvider; import com.android.settings.applications.UserAppInfo; diff --git a/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java index 56a6c62f605..0d22d2e64a2 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java @@ -23,7 +23,7 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; import com.android.settings.SettingsPreferenceFragment; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.applications.ApplicationFeatureProvider; import com.android.settings.applications.UserAppInfo; diff --git a/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java index b9c838bdbe5..0b97353f7d7 100644 --- a/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java @@ -16,9 +16,8 @@ package com.android.settings.enterprise; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.testutils.FakeFeatureFactory; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTest.java index 2c0e320ada3..00b3573db5a 100644 --- a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTest.java @@ -17,11 +17,11 @@ package com.android.settings.enterprise; import android.content.Context; -import android.content.res.Resources; + import com.android.settings.R; import android.support.v7.preference.Preference; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.core.PreferenceAvailabilityObserver; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java index cf54bb0c5d2..cc6335fea57 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java @@ -19,9 +19,8 @@ package com.android.settings.enterprise; import android.content.Context; import android.support.v7.preference.Preference; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.applications.ApplicationFeatureProvider; import com.android.settings.core.PreferenceAvailabilityObserver; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java index 5e46216b84c..d506a8eca2f 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java @@ -29,7 +29,7 @@ import android.provider.Settings; import android.text.SpannableStringBuilder; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.applications.PackageManagerWrapper; import com.android.settings.vpn2.ConnectivityManagerWrapper; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java index 101a45ae60c..7077ad52a2a 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java @@ -17,11 +17,10 @@ package com.android.settings.enterprise; import android.content.Context; -import android.content.res.Resources; import android.support.v7.preference.Preference; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.core.PreferenceAvailabilityObserver; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java index 16fa5ba72c2..42639d62a30 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java @@ -16,14 +16,12 @@ package com.android.settings.enterprise; -import android.app.Application; import android.content.Context; -import android.content.res.Resources; import android.content.res.XmlResourceParser; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.core.DynamicAvailabilityPreferenceController; import com.android.settings.core.PreferenceController; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java index e5c877fd907..54a825eb1d7 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java @@ -21,7 +21,7 @@ import android.support.v7.preference.PreferenceManager; import android.support.v7.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.core.PreferenceController; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java index 6a1a7f76db5..c38f56a46b7 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java @@ -28,7 +28,7 @@ import android.support.v7.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.applications.EnterpriseDefaultApps; import com.android.settings.applications.UserAppInfo; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java index 793ae3c7926..bb21bf7c561 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java @@ -33,7 +33,7 @@ import android.os.UserManager; import android.support.v7.preference.Preference; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.applications.EnterpriseDefaultApps; import com.android.settings.applications.UserAppInfo; diff --git a/tests/robotests/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceControllerTest.java index 1c92ea538c4..f77aef84b0e 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceControllerTest.java @@ -19,7 +19,7 @@ package com.android.settings.enterprise; import android.content.Context; import android.support.v7.preference.Preference; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.core.DynamicAvailabilityPreferenceController; import com.android.settings.core.PreferenceAvailabilityObserver; diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceControllerTest.java index b2f4fa72992..db9182bcf81 100644 --- a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceControllerTest.java @@ -16,9 +16,7 @@ package com.android.settings.enterprise; -import android.content.Context; - -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceControllerTest.java index 99c68f88883..329c52694b1 100644 --- a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceControllerTest.java @@ -16,9 +16,7 @@ package com.android.settings.enterprise; -import android.content.Context; - -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBaseTest.java index 74c3de5b52b..5d1b28a3142 100644 --- a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBaseTest.java @@ -16,7 +16,7 @@ package com.android.settings.enterprise; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java index 016d9707cb0..d5ce1024bee 100644 --- a/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java @@ -19,7 +19,7 @@ package com.android.settings.enterprise; import android.content.Context; import android.support.v7.preference.Preference; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.core.PreferenceAvailabilityObserver; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java index 3304b442d68..22d2a7d50a0 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java @@ -17,11 +17,11 @@ package com.android.settings.enterprise; import android.content.Context; -import android.content.res.Resources; + import com.android.settings.R; import android.support.v7.preference.Preference; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.core.PreferenceAvailabilityObserver; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java index d3f5e97bc54..2df05c211c1 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java @@ -17,11 +17,10 @@ package com.android.settings.enterprise; import android.content.Context; -import android.content.res.Resources; import android.support.v7.preference.Preference; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java index 33360cc04a7..43b793d86d3 100644 --- a/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java @@ -16,9 +16,8 @@ package com.android.settings.enterprise; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.testutils.FakeFeatureFactory; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java index 1205b0bb4c3..11e219a3efc 100644 --- a/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java @@ -16,9 +16,8 @@ package com.android.settings.enterprise; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.testutils.FakeFeatureFactory; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java index 7df3083df1d..84dfbfda95c 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java +++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java @@ -30,7 +30,7 @@ import android.os.CancellationSignal; import android.widget.Button; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settings.password.IFingerprintManager; diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoViewTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoViewTest.java index e8dc2b5d130..7b7e440ef69 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoViewTest.java +++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoViewTest.java @@ -22,12 +22,11 @@ import android.graphics.SurfaceTexture; import android.net.Uri; import android.view.TextureView.SurfaceTextureListener; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java index 42bf4203f06..d837c40da95 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java @@ -43,7 +43,7 @@ import android.support.v7.widget.RecyclerView; import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; import com.android.settings.SettingsActivity; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.applications.LayoutPreference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java index 799dab99e4e..c3b660c031d 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java @@ -19,7 +19,7 @@ import android.content.Context; import android.content.Intent; import android.os.BatteryManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.Utils; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java index 3f721b244d4..18c09b0cbd3 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java @@ -27,7 +27,7 @@ import android.support.v7.widget.RecyclerView; import android.widget.TextView; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.applications.LayoutPreference; import com.android.settings.testutils.shadow.SettingsShadowResources; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java index 76ec5ba0ac8..dd3feff818d 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java @@ -28,7 +28,7 @@ import android.view.View; import android.widget.TextView; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.graph.UsageView; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java index 5f70f1bc0ca..c1b6174e61b 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java @@ -23,7 +23,7 @@ import android.os.BatteryManager; import android.os.BatteryStats; import android.os.SystemClock; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java index cb37a6e23a6..e3a94d24a42 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java @@ -20,7 +20,7 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.graphics.ColorFilter; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settings.testutils.shadow.SettingsShadowResources.SettingsShadowTheme; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java index 2341a6465ab..84204e645be 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java @@ -17,7 +17,7 @@ package com.android.settings.fuelgauge; import android.content.Context; import android.os.PowerManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.widget.MasterSwitchPreference; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryStatsHelperLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryStatsHelperLoaderTest.java index d19a4b272cf..f04b3b89859 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryStatsHelperLoaderTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryStatsHelperLoaderTest.java @@ -15,7 +15,6 @@ */ package com.android.settings.fuelgauge; -import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; import android.content.Context; @@ -24,7 +23,7 @@ import android.os.Bundle; import android.os.UserManager; import com.android.internal.os.BatteryStatsHelper; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java index eaa0bcaa96a..053cc98731c 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java @@ -22,7 +22,7 @@ import android.text.format.DateUtils; import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/ButtonActionDialogFragmentTest.java b/tests/robotests/src/com/android/settings/fuelgauge/ButtonActionDialogFragmentTest.java index d750382bb51..dec445d911e 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/ButtonActionDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/ButtonActionDialogFragmentTest.java @@ -29,7 +29,7 @@ import android.content.Context; import android.content.DialogInterface; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.shadow.ShadowEventLogWriter; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java index a60bc65080b..d87020e5d11 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java @@ -19,7 +19,7 @@ package com.android.settings.fuelgauge; import android.content.Context; import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java index 72fa51158ae..806acf37737 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java @@ -17,15 +17,11 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; import android.content.Context; import android.graphics.drawable.Drawable; import android.graphics.drawable.VectorDrawable; -import android.os.PowerManager; import android.support.v7.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; @@ -33,15 +29,12 @@ import android.widget.LinearLayout; import android.widget.TextView; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.widget.MasterSwitchPreference; -import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java index 26cf7e00054..8831a6c4791 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java @@ -36,7 +36,7 @@ import com.android.internal.os.BatterySipper; import com.android.internal.os.BatterySipper.DrainType; import com.android.internal.os.BatteryStatsHelper; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.Utils; import com.android.settings.fuelgauge.PowerUsageAdvanced.PowerUsageData; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetailsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetailsTest.java index 48f4e66ad91..7845870dbd8 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetailsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetailsTest.java @@ -35,7 +35,7 @@ import android.support.v7.preference.PreferenceGroup; import android.support.v7.preference.PreferenceManager; import com.android.settings.SettingsActivity; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.fuelgauge.anomaly.Anomaly; import com.android.settings.fuelgauge.anomaly.AnomalyPreference; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java index 8e9febe3eab..afda69f04b8 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java @@ -20,7 +20,7 @@ import android.content.Context; import android.content.pm.PackageManager; import android.os.Process; import com.android.internal.os.BatterySipper; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java index d110ef0ea0c..a3747e2496c 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java @@ -40,7 +40,7 @@ import com.android.internal.os.BatteryStatsHelper; import com.android.internal.os.BatteryStatsImpl; import com.android.settings.R; import com.android.settings.SettingsActivity; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.Utils; import com.android.settings.applications.LayoutPreference; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java index c872961fe06..d5bd53b0a1c 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java @@ -28,7 +28,7 @@ import android.provider.Settings; import android.text.format.DateUtils; import android.util.KeyValueListParser; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; @@ -36,7 +36,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import org.robolectric.util.ReflectionHelpers; @RunWith(SettingsRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragmentTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragmentTest.java index 2fb8ba5d4ce..8f3d2dbadac 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragmentTest.java @@ -25,7 +25,7 @@ import android.content.Context; import android.content.DialogInterface; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyLoaderTest.java index 6f4b1bc61e3..8119168f8e5 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyLoaderTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyLoaderTest.java @@ -30,7 +30,7 @@ import android.content.pm.PackageManager; import android.os.UserManager; import com.android.internal.os.BatteryStatsHelper; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.fuelgauge.anomaly.checker.WakeLockAnomalyDetector; import com.android.settings.fuelgauge.anomaly.checker.WakeupAlarmAnomalyDetector; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyPreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyPreferenceTest.java index 3b890bcb0b5..c0157aee50f 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyPreferenceTest.java @@ -20,7 +20,7 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java index 3f338ea598a..2aa24174f9d 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java @@ -32,7 +32,7 @@ import android.support.v14.preference.PreferenceFragment; import android.support.v7.preference.Preference; import com.android.settings.SettingsActivity; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyTest.java index b57c7eb8a0e..55b8308a964 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyTest.java @@ -18,7 +18,7 @@ package com.android.settings.fuelgauge.anomaly; import static com.google.common.truth.Truth.assertThat; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyUtilsTest.java index c246eee186b..15bca7e1712 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyUtilsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyUtilsTest.java @@ -18,7 +18,7 @@ package com.android.settings.fuelgauge.anomaly; import static com.google.common.truth.Truth.assertThat; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.fuelgauge.anomaly.action.BackgroundCheckAction; import com.android.settings.fuelgauge.anomaly.action.ForceStopAction; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckActionTest.java index 83d2e987c58..99f7c337e60 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckActionTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckActionTest.java @@ -19,11 +19,10 @@ package com.android.settings.fuelgauge.anomaly.action; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; -import android.app.ActivityManager; import android.app.AppOpsManager; import android.content.Context; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.fuelgauge.anomaly.Anomaly; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/ForceStopActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/ForceStopActionTest.java index 87c946a742f..7bb6a0493a8 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/ForceStopActionTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/ForceStopActionTest.java @@ -22,7 +22,7 @@ import static org.mockito.Mockito.verify; import android.app.ActivityManager; import android.content.Context; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.fuelgauge.anomaly.Anomaly; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetectorTest.java index cab612ed8ed..64e38401c8c 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetectorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetectorTest.java @@ -34,7 +34,7 @@ import android.util.ArrayMap; import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.fuelgauge.BatteryUtils; import com.android.settings.fuelgauge.anomaly.Anomaly; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetectorTest.java index 39725963ae0..e6cdc4e3c03 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetectorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetectorTest.java @@ -21,22 +21,19 @@ import static com.google.common.truth.Truth.assertThat; 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.anyString; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import android.content.Context; import android.content.pm.ApplicationInfo; -import android.content.pm.PackageManager; import android.os.BatteryStats; import android.text.format.DateUtils; import android.util.ArrayMap; import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.fuelgauge.BatteryUtils; import com.android.settings.fuelgauge.anomaly.Anomaly; diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGesturePreferenceControllerTest.java index 9bf84383262..e7ac835a970 100644 --- a/tests/robotests/src/com/android/settings/gestures/AssistGesturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/AssistGesturePreferenceControllerTest.java @@ -19,7 +19,7 @@ package com.android.settings.gestures; import android.content.Context; import android.provider.Settings; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGestureSensitivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGestureSensitivityPreferenceControllerTest.java index c4b33546e31..349ca4fa080 100644 --- a/tests/robotests/src/com/android/settings/gestures/AssistGestureSensitivityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/AssistGestureSensitivityPreferenceControllerTest.java @@ -19,7 +19,7 @@ package com.android.settings.gestures; import android.content.Context; import android.provider.Settings; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java index 4efc822d7de..ba0a90a20cb 100644 --- a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java +++ b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java @@ -20,7 +20,7 @@ import android.content.Context; import android.provider.SearchIndexableResource; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.core.PreferenceController; @@ -35,7 +35,6 @@ import org.robolectric.shadows.ShadowApplication; import java.util.List; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.when; @RunWith(SettingsRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) diff --git a/tests/robotests/src/com/android/settings/gestures/CameraLiftTriggerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/CameraLiftTriggerPreferenceControllerTest.java index 8cd92a44153..94cac965b93 100644 --- a/tests/robotests/src/com/android/settings/gestures/CameraLiftTriggerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/CameraLiftTriggerPreferenceControllerTest.java @@ -20,7 +20,7 @@ import android.content.Context; import android.provider.Settings; import android.support.v7.preference.PreferenceScreen; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/gestures/CameraLiftTriggerSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/CameraLiftTriggerSettingsTest.java index 681fa3a0502..befdfa66145 100644 --- a/tests/robotests/src/com/android/settings/gestures/CameraLiftTriggerSettingsTest.java +++ b/tests/robotests/src/com/android/settings/gestures/CameraLiftTriggerSettingsTest.java @@ -18,7 +18,7 @@ package com.android.settings.gestures; import android.provider.SearchIndexableResource; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java index 3e0df89cd00..cc30a746137 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java @@ -20,7 +20,7 @@ import android.content.Context; import android.provider.Settings; import android.support.v7.preference.PreferenceScreen; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java index f8c33677ee7..b9635a745e7 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java @@ -18,7 +18,7 @@ package com.android.settings.gestures; import android.provider.SearchIndexableResource; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java index 9958bce2102..539c7dbfc4a 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java @@ -19,7 +19,7 @@ package com.android.settings.gestures; import android.content.Context; import com.android.internal.hardware.AmbientDisplayConfiguration; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenSettingsTest.java index 433ba464538..3d56d7141ce 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenSettingsTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenSettingsTest.java @@ -18,7 +18,7 @@ package com.android.settings.gestures; import android.provider.SearchIndexableResource; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTwistGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTwistGestureSettingsTest.java index 35c48ec096d..236896a2a5a 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTwistGestureSettingsTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTwistGestureSettingsTest.java @@ -18,7 +18,7 @@ package com.android.settings.gestures; import android.provider.SearchIndexableResource; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; @@ -30,7 +30,6 @@ import org.robolectric.shadows.ShadowApplication; import java.util.List; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.when; @RunWith(SettingsRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java index 7caf3fc7b4d..a06395a0775 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java @@ -22,7 +22,7 @@ import android.hardware.SensorManager; import android.os.UserManager; import android.provider.Settings; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.shadow.ShadowSecureSettings; diff --git a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java index 74de5d00885..8b4ef61a910 100644 --- a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java @@ -21,7 +21,7 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; import android.support.v7.preference.TwoStatePreference; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.widget.VideoPreference; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java index d21a8c741eb..d81163de370 100644 --- a/tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java @@ -19,7 +19,7 @@ package com.android.settings.gestures; import android.content.Context; import com.android.internal.hardware.AmbientDisplayConfiguration; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/gestures/PickupGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/PickupGestureSettingsTest.java index 921a1bec680..2c4a1c4e26c 100644 --- a/tests/robotests/src/com/android/settings/gestures/PickupGestureSettingsTest.java +++ b/tests/robotests/src/com/android/settings/gestures/PickupGestureSettingsTest.java @@ -18,7 +18,7 @@ package com.android.settings.gestures; import android.provider.SearchIndexableResource; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; @@ -30,7 +30,6 @@ import org.robolectric.shadows.ShadowApplication; import java.util.List; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.when; @RunWith(SettingsRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java index 8a83e2705e2..ac551de5958 100644 --- a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java @@ -19,7 +19,7 @@ package com.android.settings.gestures; import android.content.Context; import android.provider.Settings; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java index 78dc27acb80..e2ed14debc2 100644 --- a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java +++ b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java @@ -20,7 +20,7 @@ import android.content.Context; import android.provider.SearchIndexableResource; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.core.PreferenceController; @@ -35,7 +35,6 @@ import org.robolectric.shadows.ShadowApplication; import java.util.List; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.when; @RunWith(SettingsRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) diff --git a/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java index c1bd0e0c5c0..7d803f4df1c 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java @@ -20,7 +20,7 @@ import android.content.Context; import android.hardware.input.InputManager; import android.view.InputDevice; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java index 5fa2c0d66b3..8f9b2c5bdb0 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java @@ -27,7 +27,7 @@ import android.support.v7.preference.Preference; import android.view.InputDevice; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.shadow.ShadowInputDevice; diff --git a/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java index 8ca7d64cdd8..4457cc0339d 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java @@ -22,7 +22,7 @@ import android.view.textservice.SpellCheckerInfo; import android.view.textservice.TextServicesManager; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java index 13324458e14..fe2b0df3865 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java @@ -34,7 +34,7 @@ import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodManager; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java index 598917df095..b3af6b83b40 100644 --- a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java +++ b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java @@ -31,7 +31,7 @@ import android.view.textservice.TextServicesManager; import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.core.PreferenceController; import com.android.settings.dashboard.SummaryLoader; diff --git a/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java index e7367bb8392..4050dd13da7 100644 --- a/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java @@ -19,7 +19,7 @@ package com.android.settings.language; import android.content.Context; import android.support.v7.preference.Preference; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java index 4908b49e78d..e4b3cf27836 100644 --- a/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java @@ -22,7 +22,7 @@ import android.speech.tts.TtsEngines; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java index d2032ed4400..3fc99d2d834 100644 --- a/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java @@ -20,7 +20,7 @@ import android.content.Context; import android.speech.tts.TtsEngines; import android.support.v7.preference.Preference; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.UserDictionarySettings; import com.android.settings.inputmethod.UserDictionaryList; diff --git a/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java index c7f76df3c9f..602bbd12890 100644 --- a/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java @@ -1,12 +1,11 @@ package com.android.settings.location; import android.content.Context; -import android.os.UserManager; import android.provider.Settings; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; @@ -16,7 +15,6 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; -import org.robolectric.shadows.ShadowApplication; import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.any; diff --git a/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java index d6b133bab65..ea2a18b163d 100644 --- a/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java @@ -32,7 +32,7 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java index 70872eeb4d5..e115dad3004 100644 --- a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java @@ -24,7 +24,7 @@ import android.support.v7.preference.PreferenceScreen; import android.telephony.PhoneStateListener; import android.telephony.TelephonyManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java index 5827c8b45ad..a84179da941 100644 --- a/tests/robotests/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java @@ -19,7 +19,7 @@ package com.android.settings.network; import android.content.Context; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java index 358f12f2e39..7471632be11 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java @@ -20,7 +20,7 @@ import android.provider.SearchIndexableResource; import android.view.Menu; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.dashboard.SummaryLoader; import com.android.settings.testutils.XmlTestUtils; diff --git a/tests/robotests/src/com/android/settings/network/NetworkResetActionMenuControllerTest.java b/tests/robotests/src/com/android/settings/network/NetworkResetActionMenuControllerTest.java index ee6ef69afd3..0b2be3a2ad4 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkResetActionMenuControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkResetActionMenuControllerTest.java @@ -27,7 +27,7 @@ import android.content.Context; import android.view.Menu; import android.view.MenuItem; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java index eeb41319f6e..4d8c6267bb5 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java @@ -19,7 +19,7 @@ package com.android.settings.network; import android.content.Context; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java b/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java index b1c88d595a8..792bdd3ca9e 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java @@ -25,7 +25,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java index 57dd8e607a9..0b1586e2c9b 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java @@ -28,7 +28,7 @@ import android.net.NetworkScorerAppData; import android.support.v7.preference.Preference; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java index aba1f77a8ba..9885bdf684f 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java @@ -30,7 +30,7 @@ import android.net.NetworkScorerAppData; import android.support.v7.preference.PreferenceManager; import android.support.v7.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.widget.RadioButtonPreference; import com.google.android.collect.Lists; diff --git a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java index cecc910b24c..4ae8c2c703f 100644 --- a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java @@ -30,7 +30,7 @@ import android.provider.Settings; import android.support.v7.preference.Preference; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java index 27baa1b7d00..b7c48485c15 100644 --- a/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java @@ -25,7 +25,7 @@ import android.os.IBinder; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/network/WifiCallingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/WifiCallingPreferenceControllerTest.java index c31ab40a62e..172508d626b 100644 --- a/tests/robotests/src/com/android/settings/network/WifiCallingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/WifiCallingPreferenceControllerTest.java @@ -22,7 +22,7 @@ import android.telephony.CarrierConfigManager; import android.telephony.TelephonyManager; import com.android.ims.ImsManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java index b54125ebdbc..a82daf3c094 100644 --- a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java +++ b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java @@ -20,7 +20,7 @@ package com.android.settings.nfc; import android.content.Context; import android.content.pm.PackageManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java index 994582c77c5..d33d7345494 100644 --- a/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java @@ -20,7 +20,7 @@ import android.content.Context; import android.os.UserManager; import android.support.v7.preference.Preference; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.accounts.AccountRestrictionHelper; import com.android.settingslib.RestrictedPreference; diff --git a/tests/robotests/src/com/android/settings/notification/AlarmRingtonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AlarmRingtonePreferenceControllerTest.java index 4ac91793459..f4bd5229b8c 100644 --- a/tests/robotests/src/com/android/settings/notification/AlarmRingtonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/AlarmRingtonePreferenceControllerTest.java @@ -19,7 +19,7 @@ package com.android.settings.notification; import android.content.Context; import android.media.RingtoneManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java index a08ec17e000..7b0b0333041 100644 --- a/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java @@ -19,7 +19,7 @@ package com.android.settings.notification; import android.content.Context; import android.media.AudioManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java index c547c6338da..58ba46bf177 100644 --- a/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java @@ -21,7 +21,7 @@ import android.os.SystemProperties; import android.support.v14.preference.SwitchPreference; import android.support.v7.preference.PreferenceScreen; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.shadow.SettingsShadowSystemProperties; @@ -32,7 +32,6 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; -import org.robolectric.shadows.ShadowApplication; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/notification/CastPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/CastPreferenceControllerTest.java index fc9867e1fae..ed9cc983eec 100644 --- a/tests/robotests/src/com/android/settings/notification/CastPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/CastPreferenceControllerTest.java @@ -19,7 +19,7 @@ package com.android.settings.notification; import android.content.Context; import android.telephony.TelephonyManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java index 4cdf7c7c3d9..2b2d024ee80 100644 --- a/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java @@ -23,7 +23,7 @@ import android.support.v14.preference.SwitchPreference; import android.support.v7.preference.PreferenceScreen; import android.provider.Settings.Global; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java index e9410e6fa71..4ec67e6ad8c 100644 --- a/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java @@ -24,7 +24,7 @@ import android.support.v7.preference.PreferenceScreen; import android.provider.Settings.System; import android.telephony.TelephonyManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java index bc6eb3a8ad6..58e5636c1d1 100644 --- a/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java @@ -23,7 +23,7 @@ import android.support.v7.preference.DropDownPreference; import android.support.v7.preference.PreferenceScreen; import android.provider.Settings.Global; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java index 3350fb90a75..d6a277f1b4a 100644 --- a/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java @@ -23,7 +23,7 @@ import android.support.v14.preference.SwitchPreference; import android.support.v7.preference.PreferenceScreen; import android.provider.Settings.Global; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java index 392bd2c4e5d..24f4b6cc887 100644 --- a/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java @@ -20,7 +20,7 @@ import android.content.Context; import android.content.pm.PackageManager; import android.os.UserManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.accounts.AccountRestrictionHelper; import com.android.settingslib.RestrictedPreference; diff --git a/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java index 0124566f3bb..c3e887f319d 100644 --- a/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java @@ -24,7 +24,7 @@ import android.support.v7.preference.PreferenceScreen; import android.provider.Settings.Global; import android.telephony.TelephonyManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java index 9944379ec03..ca7fc444565 100644 --- a/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java @@ -19,7 +19,7 @@ package com.android.settings.notification; import android.content.Context; import android.media.AudioManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; @@ -30,7 +30,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.when; @RunWith(SettingsRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) diff --git a/tests/robotests/src/com/android/settings/notification/NotificationAccessSettingsTest.java b/tests/robotests/src/com/android/settings/notification/NotificationAccessSettingsTest.java index 756f1d0bd38..d3f66b9a204 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationAccessSettingsTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationAccessSettingsTest.java @@ -23,7 +23,7 @@ import static org.mockito.Mockito.verify; import android.content.Context; import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/notification/NotificationRingtonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationRingtonePreferenceControllerTest.java index 841367fa3b2..940a948ea5c 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationRingtonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationRingtonePreferenceControllerTest.java @@ -19,7 +19,7 @@ package com.android.settings.notification; import android.content.Context; import android.media.RingtoneManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java index e6d8a41e755..f919e7bc313 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java @@ -21,7 +21,7 @@ import android.media.AudioManager; import android.os.Vibrator; import android.telephony.TelephonyManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java index 85e74b06e1a..57ab4d35e4d 100644 --- a/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java @@ -20,7 +20,7 @@ import android.content.Context; import android.media.RingtoneManager; import android.telephony.TelephonyManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java index 4780e5c0a28..1a6d3d78662 100644 --- a/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java @@ -19,12 +19,11 @@ package com.android.settings.notification; import android.app.NotificationManager; import android.content.ComponentName; import android.content.Context; -import android.content.Intent; import android.media.AudioManager; import android.os.Vibrator; import android.telephony.TelephonyManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java index d680c38cc8f..e72ef53e972 100644 --- a/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java @@ -20,7 +20,7 @@ import android.content.Context; import android.support.v7.preference.Preference; import android.media.RingtoneManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java index 8963a5dfc91..f94f8bfe4b9 100644 --- a/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java @@ -23,7 +23,7 @@ import android.support.v14.preference.SwitchPreference; import android.support.v7.preference.PreferenceScreen; import android.provider.Settings.System; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java b/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java index 8bcb5b2a0e7..307536dd073 100644 --- a/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java @@ -23,7 +23,7 @@ import android.provider.Settings.Global; import android.support.v7.preference.PreferenceScreen; import com.android.settings.SettingsPreferenceFragment; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -40,7 +40,7 @@ import org.robolectric.shadows.ShadowApplication; import static com.android.settings.notification.SettingPref.TYPE_GLOBAL; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Answers.RETURNS_DEEP_STUBS; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java b/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java index 547117b37a9..59b70785e26 100644 --- a/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java +++ b/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java @@ -21,7 +21,7 @@ import android.content.Context; import android.media.AudioManager; import android.os.UserManager; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.XmlTestUtils; import com.android.settings.testutils.shadow.ShadowAudioHelper; diff --git a/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java index f530f662a1f..eaf9bb5e963 100644 --- a/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java @@ -24,7 +24,7 @@ import android.support.v14.preference.SwitchPreference; import android.support.v7.preference.PreferenceScreen; import android.provider.Settings.System; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; @@ -32,7 +32,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.Robolectric; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; diff --git a/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java index 440b69e9e1a..b0ab54bdc77 100644 --- a/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java @@ -24,7 +24,7 @@ import android.support.v14.preference.SwitchPreference; import android.support.v7.preference.PreferenceScreen; import android.provider.Settings.System; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; @@ -36,7 +36,7 @@ import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Answers.RETURNS_DEEP_STUBS; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java index 3bc1ffa2bdd..054309c2b9b 100644 --- a/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java @@ -23,7 +23,7 @@ import android.support.v7.preference.PreferenceScreen; import android.support.v7.preference.TwoStatePreference; import android.telephony.TelephonyManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java index 657739f08d5..a1d9205db1c 100644 --- a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java @@ -27,7 +27,7 @@ import android.content.Context; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java index 44aaf04e3ab..0c826ed1fbc 100644 --- a/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java @@ -38,7 +38,7 @@ import android.telephony.TelephonyManager; import com.android.settings.DefaultRingtonePreference; import com.android.settings.R; import com.android.settings.RingtonePreference; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/notification/ZenAccessSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ZenAccessSettingsTest.java index 854edcda61e..591378f2560 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenAccessSettingsTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenAccessSettingsTest.java @@ -19,7 +19,7 @@ package com.android.settings.notification; import android.content.Context; import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java index 685390e9164..1d71a8a5f0a 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java @@ -22,7 +22,7 @@ import android.content.Context; import android.support.v7.preference.Preference; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java index 7a3742d3266..8ac482b8341 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java @@ -19,7 +19,7 @@ package com.android.settings.notification; import android.content.Context; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; @@ -29,8 +29,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.spy; @RunWith(SettingsRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java index 198273b4104..28b0264a347 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java @@ -29,7 +29,7 @@ import android.app.admin.DevicePolicyManager; import android.content.ComponentName; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.shadow.SettingsShadowResources; diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java index b077c9a3d28..74eeaf1e5ca 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java @@ -24,11 +24,9 @@ import android.app.admin.DevicePolicyManager; import android.content.Intent; import com.android.internal.widget.LockPatternUtils; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.password.ChooseLockPassword; import com.android.settings.password.ChooseLockPassword.IntentBuilder; -import com.android.settings.password.ChooseLockSettingsHelper; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java index 49ca7177269..fa09884818d 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java @@ -22,11 +22,9 @@ import static org.robolectric.RuntimeEnvironment.application; import android.content.Intent; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.password.ChooseLockPattern; import com.android.settings.password.ChooseLockPattern.IntentBuilder; -import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settings.testutils.shadow.ShadowDynamicIndexableContentMonitor; import com.android.settings.testutils.shadow.ShadowEventLogWriter; diff --git a/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java b/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java index 6072d425d80..d76968e8640 100644 --- a/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java +++ b/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java @@ -18,7 +18,7 @@ package com.android.settings.password; import static com.google.common.truth.Truth.assertThat; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.password.ConfirmDeviceCredentialBaseFragment.LastTryDialog; diff --git a/tests/robotests/src/com/android/settings/password/ScreenLockTypeTest.java b/tests/robotests/src/com/android/settings/password/ScreenLockTypeTest.java index 96bce00f06a..8beefa8c194 100644 --- a/tests/robotests/src/com/android/settings/password/ScreenLockTypeTest.java +++ b/tests/robotests/src/com/android/settings/password/ScreenLockTypeTest.java @@ -20,7 +20,7 @@ import static com.google.common.truth.Truth.assertThat; import android.app.admin.DevicePolicyManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java b/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java index 44f1fef6f90..cb863a0863a 100644 --- a/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java +++ b/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java @@ -25,7 +25,7 @@ import android.content.Intent; import android.os.Bundle; import android.provider.Settings; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.After; diff --git a/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java b/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java index bb7f5c1c88e..96775addb8c 100644 --- a/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java +++ b/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java @@ -41,7 +41,7 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.os.Bundle; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java index 2436906d2ce..f7526db6c60 100644 --- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java +++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java @@ -21,13 +21,12 @@ import static com.google.common.truth.Truth.assertThat; import static org.robolectric.RuntimeEnvironment.application; import static org.robolectric.Shadows.shadowOf; -import android.app.Fragment; import android.content.Intent; import android.os.Bundle; import android.widget.Button; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment; import com.android.settings.password.ChooseLockPassword.IntentBuilder; diff --git a/tests/robotests/src/com/android/settings/print/PrintSettingsFragmentTest.java b/tests/robotests/src/com/android/settings/print/PrintSettingsFragmentTest.java index 57219d45e19..cf34f452d14 100644 --- a/tests/robotests/src/com/android/settings/print/PrintSettingsFragmentTest.java +++ b/tests/robotests/src/com/android/settings/print/PrintSettingsFragmentTest.java @@ -28,9 +28,9 @@ import android.print.PrintManager; import android.printservice.PrintServiceInfo; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.dashboard.SummaryLoader; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java b/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java index ddbda231041..ff39deb6f42 100644 --- a/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java +++ b/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java @@ -21,7 +21,7 @@ import android.content.Context; import android.provider.SearchIndexableResource; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.core.PreferenceController; diff --git a/tests/robotests/src/com/android/settings/search/CursorToSearchResultConverterTest.java b/tests/robotests/src/com/android/settings/search/CursorToSearchResultConverterTest.java index eb25141f378..7fb4f44d76d 100644 --- a/tests/robotests/src/com/android/settings/search/CursorToSearchResultConverterTest.java +++ b/tests/robotests/src/com/android/settings/search/CursorToSearchResultConverterTest.java @@ -26,7 +26,7 @@ import android.graphics.drawable.Drawable; import com.android.settings.DisplaySettings; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.dashboard.SiteMapManager; import com.android.settings.gestures.SwipeToNotificationSettings; diff --git a/tests/robotests/src/com/android/settings/search/DataIntegrityTest.java b/tests/robotests/src/com/android/settings/search/DataIntegrityTest.java index cb2b678378a..ba2b63656c0 100644 --- a/tests/robotests/src/com/android/settings/search/DataIntegrityTest.java +++ b/tests/robotests/src/com/android/settings/search/DataIntegrityTest.java @@ -6,7 +6,7 @@ import android.util.ArraySet; import com.android.settings.DateTimeSettings; import com.android.settings.R; import com.android.settings.SecuritySettings; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.core.codeinspection.CodeInspector; import com.android.settings.datausage.DataUsageSummary; diff --git a/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java b/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java index 87171aeba65..8c31e6e86c4 100644 --- a/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java +++ b/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java @@ -35,7 +35,7 @@ import android.provider.SearchIndexableResource; import android.util.ArrayMap; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.DatabaseTestUtils; import com.android.settings.testutils.shadow.ShadowDatabaseIndexingUtils; diff --git a/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java b/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java index a4fa3736338..d44ecff35a0 100644 --- a/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java +++ b/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java @@ -23,7 +23,7 @@ import android.content.Context; import android.util.ArrayMap; import com.android.internal.hardware.AmbientDisplayConfiguration; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.core.PreferenceController; import com.android.settings.deviceinfo.SystemUpdatePreferenceController; diff --git a/tests/robotests/src/com/android/settings/search/DatabaseResultLoaderTest.java b/tests/robotests/src/com/android/settings/search/DatabaseResultLoaderTest.java index 5118cffed29..ad89bfea39d 100644 --- a/tests/robotests/src/com/android/settings/search/DatabaseResultLoaderTest.java +++ b/tests/robotests/src/com/android/settings/search/DatabaseResultLoaderTest.java @@ -22,7 +22,7 @@ import android.content.Context; import android.content.Intent; import android.database.sqlite.SQLiteDatabase; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.dashboard.SiteMapManager; import com.android.settings.testutils.DatabaseTestUtils; @@ -40,7 +40,6 @@ import org.robolectric.annotation.Config; import java.util.Arrays; import java.util.HashSet; -import java.util.List; import java.util.Set; import static com.google.common.truth.Truth.assertThat; diff --git a/tests/robotests/src/com/android/settings/search/DatabaseRowTest.java b/tests/robotests/src/com/android/settings/search/DatabaseRowTest.java index 18f03166f3d..60afff5c9b4 100644 --- a/tests/robotests/src/com/android/settings/search/DatabaseRowTest.java +++ b/tests/robotests/src/com/android/settings/search/DatabaseRowTest.java @@ -21,7 +21,7 @@ import android.content.ComponentName; import android.content.Intent; import android.content.Context; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.search.DatabaseIndexingManager.DatabaseRow; import com.android.settings.search.DatabaseIndexingManager.DatabaseRow.Builder; diff --git a/tests/robotests/src/com/android/settings/search/DynamicIndexableContentMonitorTest.java b/tests/robotests/src/com/android/settings/search/DynamicIndexableContentMonitorTest.java index 753a512a57a..64a658eccca 100644 --- a/tests/robotests/src/com/android/settings/search/DynamicIndexableContentMonitorTest.java +++ b/tests/robotests/src/com/android/settings/search/DynamicIndexableContentMonitorTest.java @@ -40,7 +40,7 @@ import android.provider.UserDictionary; import android.view.inputmethod.InputMethodInfo; import com.android.internal.content.PackageMonitor; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.accessibility.AccessibilitySettings; import com.android.settings.inputmethod.AvailableVirtualKeyboardFragment; diff --git a/tests/robotests/src/com/android/settings/search/HeaderDecoratorTest.java b/tests/robotests/src/com/android/settings/search/HeaderDecoratorTest.java index 4fe454a2499..61536b71d46 100644 --- a/tests/robotests/src/com/android/settings/search/HeaderDecoratorTest.java +++ b/tests/robotests/src/com/android/settings/search/HeaderDecoratorTest.java @@ -21,7 +21,7 @@ import android.support.v7.widget.RecyclerView; import android.view.View; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java b/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java index 3615a6794a7..c4d798b627b 100644 --- a/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java +++ b/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java @@ -23,7 +23,7 @@ import android.os.Parcel; import android.provider.Settings; import android.content.Context; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.search.ResultPayload.Availability; import com.android.settings.search.ResultPayload.SettingsSource; diff --git a/tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java b/tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java index 537aac45feb..093909bf730 100644 --- a/tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java +++ b/tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java @@ -22,7 +22,7 @@ import android.graphics.drawable.Drawable; import android.view.LayoutInflater; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/search/InstalledAppResultLoaderTest.java b/tests/robotests/src/com/android/settings/search/InstalledAppResultLoaderTest.java index 6c9b7e13ca9..645b9868967 100644 --- a/tests/robotests/src/com/android/settings/search/InstalledAppResultLoaderTest.java +++ b/tests/robotests/src/com/android/settings/search/InstalledAppResultLoaderTest.java @@ -25,7 +25,7 @@ import android.content.pm.UserInfo; import android.os.UserManager; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.applications.PackageManagerWrapper; import com.android.settings.dashboard.SiteMapManager; diff --git a/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java b/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java index c46afbc5db7..574e4f7f0c2 100644 --- a/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java +++ b/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java @@ -25,7 +25,7 @@ import android.view.LayoutInflater; import android.view.View; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.search.SearchResult.Builder; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/search/ResultPayloadTest.java b/tests/robotests/src/com/android/settings/search/ResultPayloadTest.java index d18bac384ff..0bb43c5b1c2 100644 --- a/tests/robotests/src/com/android/settings/search/ResultPayloadTest.java +++ b/tests/robotests/src/com/android/settings/search/ResultPayloadTest.java @@ -19,9 +19,9 @@ package com.android.settings.search; import android.content.Intent; import android.os.Parcel; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.search.ResultPayload; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java b/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java index f3785da1219..50bdb842725 100644 --- a/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java +++ b/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java @@ -18,10 +18,9 @@ package com.android.settings.search; import android.content.Intent; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.search.ResultPayload; -import com.android.settings.search.ResultPayloadUtils; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/search/SavedQueryLoaderTest.java b/tests/robotests/src/com/android/settings/search/SavedQueryLoaderTest.java index 943fa7e7e08..780a8a5dbc9 100644 --- a/tests/robotests/src/com/android/settings/search/SavedQueryLoaderTest.java +++ b/tests/robotests/src/com/android/settings/search/SavedQueryLoaderTest.java @@ -22,12 +22,8 @@ import android.content.ContentValues; import android.content.Context; import android.database.sqlite.SQLiteDatabase; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.search.IndexDatabaseHelper; -import com.android.settings.search.ResultPayload; -import com.android.settings.search.SavedQueryLoader; -import com.android.settings.search.SearchResult; import com.android.settings.testutils.DatabaseTestUtils; import org.junit.After; diff --git a/tests/robotests/src/com/android/settings/search/SavedQueryPayloadTest.java b/tests/robotests/src/com/android/settings/search/SavedQueryPayloadTest.java index 3f0936b9dea..7421d1a1e24 100644 --- a/tests/robotests/src/com/android/settings/search/SavedQueryPayloadTest.java +++ b/tests/robotests/src/com/android/settings/search/SavedQueryPayloadTest.java @@ -18,11 +18,9 @@ package com.android.settings.search; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.search.ResultPayload; -import com.android.settings.search.SavedQueryPayload; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.annotation.Config; diff --git a/tests/robotests/src/com/android/settings/search/SavedQueryRecorderAndRemoverTest.java b/tests/robotests/src/com/android/settings/search/SavedQueryRecorderAndRemoverTest.java index e60d21a1d62..6d49555496f 100644 --- a/tests/robotests/src/com/android/settings/search/SavedQueryRecorderAndRemoverTest.java +++ b/tests/robotests/src/com/android/settings/search/SavedQueryRecorderAndRemoverTest.java @@ -20,7 +20,7 @@ package com.android.settings.search; import android.content.Context; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.DatabaseTestUtils; diff --git a/tests/robotests/src/com/android/settings/search/SavedQueryViewHolderTest.java b/tests/robotests/src/com/android/settings/search/SavedQueryViewHolderTest.java index 967864dca0f..691fcf7fae9 100644 --- a/tests/robotests/src/com/android/settings/search/SavedQueryViewHolderTest.java +++ b/tests/robotests/src/com/android/settings/search/SavedQueryViewHolderTest.java @@ -26,12 +26,9 @@ import android.view.LayoutInflater; import android.view.View; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.search.SavedQueryViewHolder; -import com.android.settings.search.SearchFragment; -import com.android.settings.search.SearchResult; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java index 782ec582e96..6cf1cf4a161 100644 --- a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java @@ -20,7 +20,7 @@ package com.android.settings.search; import android.app.Activity; import android.view.Menu; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.dashboard.SiteMapManager; diff --git a/tests/robotests/src/com/android/settings/search/SearchFragmentTest.java b/tests/robotests/src/com/android/settings/search/SearchFragmentTest.java index 2d6414bab3e..e53c01d40e3 100644 --- a/tests/robotests/src/com/android/settings/search/SearchFragmentTest.java +++ b/tests/robotests/src/com/android/settings/search/SearchFragmentTest.java @@ -28,7 +28,7 @@ import android.view.View; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SettingsActivity; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.DatabaseTestUtils; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java b/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java index 89afcaaaafc..1ddff90f70c 100644 --- a/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java +++ b/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java @@ -29,7 +29,7 @@ import android.provider.SearchIndexableResource; import android.text.TextUtils; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.wifi.WifiSettings; diff --git a/tests/robotests/src/com/android/settings/search/SearchResultBuilderTest.java b/tests/robotests/src/com/android/settings/search/SearchResultBuilderTest.java index cb4bc415fd5..e601087d4b2 100644 --- a/tests/robotests/src/com/android/settings/search/SearchResultBuilderTest.java +++ b/tests/robotests/src/com/android/settings/search/SearchResultBuilderTest.java @@ -22,7 +22,7 @@ import android.content.Intent; import android.graphics.drawable.Drawable; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.search.SearchResult.Builder; diff --git a/tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java b/tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java index aaacaf8e0f9..032052684ee 100644 --- a/tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java +++ b/tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java @@ -26,7 +26,7 @@ import android.view.ViewGroup; import android.widget.FrameLayout; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.search.SearchResult.Builder; import com.android.settings.search.ranking.SearchResultsRankerCallback; diff --git a/tests/robotests/src/com/android/settings/search/SiteMapManagerTest.java b/tests/robotests/src/com/android/settings/search/SiteMapManagerTest.java index b0a5b003283..b441b66dc41 100644 --- a/tests/robotests/src/com/android/settings/search/SiteMapManagerTest.java +++ b/tests/robotests/src/com/android/settings/search/SiteMapManagerTest.java @@ -23,10 +23,9 @@ import android.database.sqlite.SQLiteDatabase; import android.os.Bundle; import com.android.settings.SettingsActivity; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.dashboard.SiteMapManager; -import com.android.settings.search.IndexDatabaseHelper; import com.android.settings.search.IndexDatabaseHelper.SiteMapColumns; import com.android.settings.system.SystemDashboardFragment; import com.android.settings.testutils.DatabaseTestUtils; diff --git a/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java b/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java index db5d2b9608a..5d2a9776feb 100644 --- a/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java +++ b/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java @@ -22,7 +22,7 @@ import android.content.Context; import android.util.AttributeSet; import android.util.Xml; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java b/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java index 8a80fe58033..1a37decf67b 100644 --- a/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java +++ b/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java @@ -19,7 +19,7 @@ package com.android.settings.security; import android.content.DialogInterface; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.shadow.ShadowEventLogWriter; diff --git a/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java index c6a0e53be64..b6487f1c9c9 100644 --- a/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java @@ -16,7 +16,7 @@ package com.android.settings.security; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.XmlTestUtils; diff --git a/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java index d81768a12ef..8406d9089b1 100644 --- a/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java @@ -23,8 +23,7 @@ import android.support.v14.preference.PreferenceFragment; import com.android.internal.widget.LockPatternUtils; import com.android.settings.OwnerInfoSettings; -import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import com.android.settingslib.RestrictedPreference; diff --git a/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java index 9cc33a36d65..8c5e8e59756 100644 --- a/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java @@ -27,7 +27,7 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; import android.util.Pair; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.R; import com.android.settings.TestConfig; import com.android.settingslib.drawer.DashboardCategory; diff --git a/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java b/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java index c0e9106548b..574894ea168 100644 --- a/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java +++ b/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java @@ -20,7 +20,7 @@ import android.annotation.StringRes; import android.content.Context; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.java index 311c297d032..dc0f5fd49e0 100644 --- a/tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.java +++ b/tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.java @@ -22,7 +22,7 @@ import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.ResolveInfo; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/support/SupportConfigTest.java b/tests/robotests/src/com/android/settings/support/SupportConfigTest.java index 7c1d5870975..28b0a9df1d0 100644 --- a/tests/robotests/src/com/android/settings/support/SupportConfigTest.java +++ b/tests/robotests/src/com/android/settings/support/SupportConfigTest.java @@ -17,7 +17,7 @@ package com.android.settings.support; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java b/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java index d90d8d6e938..0cea23e55fb 100644 --- a/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java +++ b/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java @@ -21,7 +21,7 @@ import android.content.Context; import android.content.Intent; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.search.SearchIndexableRaw; diff --git a/tests/robotests/src/com/android/settings/support/SupportDisclaimerDialogFragmentTest.java b/tests/robotests/src/com/android/settings/support/SupportDisclaimerDialogFragmentTest.java index 8f0484daf43..8cc05e07a91 100644 --- a/tests/robotests/src/com/android/settings/support/SupportDisclaimerDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/support/SupportDisclaimerDialogFragmentTest.java @@ -12,7 +12,7 @@ import android.text.style.URLSpan; import android.widget.CheckBox; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.core.instrumentation.MetricsFeatureProvider; import com.android.settings.overlay.SupportFeatureProvider; diff --git a/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java b/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java index 73fe09e126c..116b63ca58f 100644 --- a/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java +++ b/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java @@ -14,7 +14,7 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.IntentFilter; import android.support.v4.content.LocalBroadcastManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.overlay.SurveyFeatureProvider; diff --git a/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java index bf0005c1cb0..b9c34f3f343 100644 --- a/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java @@ -24,7 +24,7 @@ import android.content.Context; import android.os.UserManager; import android.provider.Settings; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.shadow.ShadowSecureSettings; import com.android.settings.testutils.shadow.ShadowUtils; diff --git a/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java index 483dee7bc50..19f8ee27dda 100644 --- a/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java @@ -19,7 +19,7 @@ package com.android.settings.system; import android.content.Context; import android.os.UserManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.XmlTestUtils; import com.android.settings.testutils.shadow.ShadowUserManager; diff --git a/tests/robotests/src/com/android/settings/SettingsRobolectricTestRunner.java b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java similarity index 69% rename from tests/robotests/src/com/android/settings/SettingsRobolectricTestRunner.java rename to tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java index 80b95d8e557..91bfff28c7b 100644 --- a/tests/robotests/src/com/android/settings/SettingsRobolectricTestRunner.java +++ b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.settings; +package com.android.settings.testutils; import android.app.Fragment; import android.content.Intent; @@ -32,6 +32,8 @@ import java.util.List; import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT; import static org.robolectric.Robolectric.getShadowsAdapter; +import com.android.settings.SettingsActivity; + /** * 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. @@ -65,38 +67,7 @@ public class SettingsRobolectricTestRunner extends RobolectricTestRunner { @Override public List getIncludedResourcePaths() { List paths = super.getIncludedResourcePaths(); - paths.add(new ResourcePath( - getPackageName(), - Fs.fileFromPath("./packages/apps/Settings/res"), - null)); - paths.add(new ResourcePath( - getPackageName(), - Fs.fileFromPath("./frameworks/base/packages/SettingsLib/res"), - null)); - paths.add(new ResourcePath( - getPackageName(), - Fs.fileFromPath("./frameworks/base/core/res/res"), - null)); - paths.add(new ResourcePath( - getPackageName(), - Fs.fileFromPath("./frameworks/opt/setupwizard/library/main/res"), - null)); - paths.add(new ResourcePath( - getPackageName(), - Fs.fileFromPath("./frameworks/opt/setupwizard/library/gingerbread/res"), - null)); - paths.add(new ResourcePath( - getPackageName(), - Fs.fileFromPath("./frameworks/opt/setupwizard/library/recyclerview/res"), - null)); - paths.add(new ResourcePath( - getPackageName(), - Fs.fileFromPath("./frameworks/support/v7/appcompat/res"), - null)); - paths.add(new ResourcePath( - getPackageName(), - Fs.fileFromPath("./frameworks/support/v7/cardview/res"), - null)); + SettingsRobolectricTestRunner.getIncludedResourcePaths(getPackageName(), paths); return paths; } }; @@ -106,6 +77,41 @@ public class SettingsRobolectricTestRunner extends RobolectricTestRunner { return manifest; } + public static void getIncludedResourcePaths(String packageName, List paths) { + paths.add(new ResourcePath( + packageName, + Fs.fileFromPath("./packages/apps/Settings/res"), + null)); + paths.add(new ResourcePath( + packageName, + Fs.fileFromPath("./frameworks/base/packages/SettingsLib/res"), + null)); + paths.add(new ResourcePath( + packageName, + Fs.fileFromPath("./frameworks/base/core/res/res"), + null)); + paths.add(new ResourcePath( + packageName, + Fs.fileFromPath("./frameworks/opt/setupwizard/library/main/res"), + null)); + paths.add(new ResourcePath( + packageName, + Fs.fileFromPath("./frameworks/opt/setupwizard/library/gingerbread/res"), + null)); + paths.add(new ResourcePath( + packageName, + Fs.fileFromPath("./frameworks/opt/setupwizard/library/recyclerview/res"), + null)); + paths.add(new ResourcePath( + packageName, + Fs.fileFromPath("./frameworks/support/v7/appcompat/res"), + null)); + paths.add(new ResourcePath( + packageName, + Fs.fileFromPath("./frameworks/support/v7/cardview/res"), + null)); + } + // A simple utility class to start a Settings fragment with an intent. The code here is almost // the same as FragmentTestUtil.startFragment except that it starts an activity with an intent. public static void startSettingsFragment( diff --git a/tests/robotests/src/com/android/settings/trustagent/TrustAgentFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/trustagent/TrustAgentFeatureProviderImplTest.java index 87f5ecd0680..b1812539794 100644 --- a/tests/robotests/src/com/android/settings/trustagent/TrustAgentFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/trustagent/TrustAgentFeatureProviderImplTest.java @@ -20,7 +20,7 @@ import android.content.pm.ResolveInfo; import android.content.pm.ServiceInfo; import android.content.pm.PackageManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java index c794cdd36a2..e1bc1577845 100644 --- a/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java @@ -20,7 +20,7 @@ import android.content.Context; import android.os.UserHandle; import android.os.UserManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java b/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java index 031cd77eeae..5b31a82f228 100644 --- a/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java @@ -24,7 +24,7 @@ import android.content.Context; import android.os.UserHandle; import android.view.View; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settingslib.RestrictedPreferenceHelper; diff --git a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java index ed95175eeff..a5783647ca6 100644 --- a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java +++ b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java @@ -21,7 +21,7 @@ import android.content.pm.UserInfo; import android.os.UserManager; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.dashboard.SummaryLoader; diff --git a/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java b/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java index eb5be8f1da9..690c2924ea6 100644 --- a/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java +++ b/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java @@ -18,7 +18,7 @@ package com.android.settings.utils; import android.content.Context; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java b/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java index 088bfae028c..4b4f3fba202 100644 --- a/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java @@ -22,7 +22,7 @@ import static org.mockito.Mockito.verify; import android.app.Fragment; import android.content.pm.PackageInfo; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java b/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java index 582f9fbc405..29267274505 100644 --- a/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java +++ b/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java @@ -16,7 +16,7 @@ package com.android.settings.vpn2; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java index 494492ed56b..dd93938debd 100644 --- a/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java +++ b/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java @@ -20,7 +20,7 @@ import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.SubSettings; import com.android.settings.TestConfig; diff --git a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java index 56397f0f632..e5354456edb 100644 --- a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java +++ b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java @@ -26,7 +26,7 @@ import android.content.pm.PackageManager; import android.content.pm.UserInfo; import android.os.UserManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.applications.PackageManagerWrapper; import com.android.settings.applications.defaultapps.DefaultAppInfo; diff --git a/tests/robotests/src/com/android/settings/webview/WebViewAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/webview/WebViewAppPreferenceControllerTest.java index d32f48645c9..5ce21e80ba9 100644 --- a/tests/robotests/src/com/android/settings/webview/WebViewAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/webview/WebViewAppPreferenceControllerTest.java @@ -20,7 +20,7 @@ import static org.mockito.Mockito.mock; import android.content.Context; import android.support.v7.preference.Preference; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java b/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java index de097fcb344..df45ad58e61 100644 --- a/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java +++ b/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java @@ -23,7 +23,7 @@ import android.media.MediaRouter; import android.net.wifi.p2p.WifiP2pManager; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.dashboard.SummaryLoader; diff --git a/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java b/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java index b8f78206c0b..2fbf03e841b 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 android.app.ActionBar; import android.app.Activity; import android.support.v7.widget.RecyclerView; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; diff --git a/tests/robotests/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java b/tests/robotests/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java index cf4be56745e..7fcf3289c53 100644 --- a/tests/robotests/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java +++ b/tests/robotests/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java @@ -16,7 +16,7 @@ package com.android.settings.widget; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.After; diff --git a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java index c29068f6676..49d5e7dfb19 100644 --- a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java @@ -33,7 +33,7 @@ import android.view.View; import android.widget.TextView; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.applications.LayoutPreference; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java index e1dc7f0cb13..0d9a77bef58 100644 --- a/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java @@ -22,7 +22,7 @@ import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java index 21dc0384463..1c449cc8183 100644 --- a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java @@ -25,7 +25,7 @@ import android.widget.LinearLayout; import android.widget.Switch; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; diff --git a/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java b/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java index b0889b46806..e314ef36270 100644 --- a/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java +++ b/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java @@ -21,7 +21,7 @@ import android.content.Context; import android.os.UserManager; import android.support.v7.preference.PreferenceScreen; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.applications.defaultapps.DefaultAppInfo; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/widget/RingProgressBarTest.java b/tests/robotests/src/com/android/settings/widget/RingProgressBarTest.java index 1a7161cb591..a1a2f2452c5 100644 --- a/tests/robotests/src/com/android/settings/widget/RingProgressBarTest.java +++ b/tests/robotests/src/com/android/settings/widget/RingProgressBarTest.java @@ -19,7 +19,7 @@ package com.android.settings.widget; import android.content.Context; import android.view.View.MeasureSpec; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java b/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java index da7b09223c1..ea27d051f74 100644 --- a/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java +++ b/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java @@ -21,7 +21,7 @@ import android.support.v4.view.PagerAdapter; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.shadow.ShadowTextUtils; import java.util.Locale; diff --git a/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java b/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java index e30421ec3d3..57550156142 100644 --- a/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java +++ b/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java @@ -30,7 +30,7 @@ import static org.robolectric.Shadows.shadowOf; import android.graphics.Rect; import android.widget.FrameLayout; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java b/tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java index e57d25a91e8..2f42550b6e4 100644 --- a/tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java @@ -18,14 +18,12 @@ package com.android.settings.widget; import android.content.Context; -import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; 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.RuntimeEnvironment; @@ -34,7 +32,6 @@ import org.robolectric.annotation.Config; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; @RunWith(SettingsRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) diff --git a/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java index bf564a547db..415cd92bf6f 100644 --- a/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java @@ -19,7 +19,7 @@ package com.android.settings.wifi; import android.content.Context; import android.net.wifi.WifiManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java b/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java index 96cb217515f..9321827864f 100644 --- a/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java @@ -27,7 +27,7 @@ import android.widget.TextView; import com.android.settings.LinkifyUtils; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java index a3a3e551bb1..b83a3e3f628 100644 --- a/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java @@ -28,7 +28,7 @@ import android.provider.Settings; import android.support.v14.preference.SwitchPreference; import android.support.v7.preference.Preference; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java index 27e6f856d11..60d38b697cf 100644 --- a/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java @@ -37,7 +37,7 @@ import android.support.v14.preference.SwitchPreference; import android.support.v7.preference.Preference; import com.android.settings.network.NetworkScoreManagerWrapper; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java index 020d5c6c701..b45ea1edaed 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java @@ -23,7 +23,7 @@ import android.widget.Spinner; import android.widget.TextView; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.shadow.ShadowConnectivityManager; import com.android.settingslib.wifi.AccessPoint; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java index 56464708a14..c7647ba2bee 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java @@ -20,7 +20,7 @@ import android.content.Context; import android.net.ConnectivityManager; import android.net.wifi.WifiManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.core.instrumentation.MetricsFeatureProvider; import com.android.settings.widget.SwitchWidgetController; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java index 47e3b4cf20e..16508161888 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java @@ -23,7 +23,7 @@ import android.net.wifi.WifiManager; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java index 694fe0eae31..307cccbfd0b 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java @@ -20,12 +20,10 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.IntentFilter; import android.net.wifi.WifiManager; -import android.support.v7.preference.Preference; import android.support.v7.preference.Preference.OnPreferenceChangeListener; import android.support.v7.preference.PreferenceScreen; -import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.core.instrumentation.MetricsFeatureProvider; import com.android.settings.testutils.FakeFeatureFactory; @@ -43,7 +41,6 @@ import org.robolectric.annotation.Config; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Matchers.any; import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java index 967da089fa2..4507e548d1c 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java @@ -23,7 +23,7 @@ import android.content.IntentFilter; import android.net.wifi.WifiManager; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener; import com.android.settingslib.wifi.WifiStatusTracker; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java index 067a4ab4eae..6fb0abd67e2 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java @@ -30,7 +30,7 @@ import android.support.v14.preference.SwitchPreference; import android.support.v7.preference.Preference; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/wifi/WpsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WpsPreferenceControllerTest.java index 8953c092961..94cc46b946f 100644 --- a/tests/robotests/src/com/android/settings/wifi/WpsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WpsPreferenceControllerTest.java @@ -31,7 +31,7 @@ import android.net.wifi.WifiManager; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java b/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java index 000f2fae9de..41b71ada45c 100644 --- a/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java @@ -22,10 +22,9 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.content.Context; -import android.net.wifi.WifiManager; import android.view.inputmethod.InputMethodManager; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.shadow.ShadowNfcAdapter; 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 0839d8b7f77..d4c64022f7c 100644 --- a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java @@ -55,7 +55,7 @@ import android.widget.Button; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.applications.LayoutPreference; import com.android.settings.core.instrumentation.MetricsFeatureProvider; @@ -77,7 +77,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.net.Inet4Address; -import java.net.Inet6Address; import java.net.InetAddress; import java.net.UnknownHostException; import java.util.Arrays; 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 9dbd406ed88..dd2ef5259f2 100644 --- a/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java @@ -20,7 +20,7 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceCategory; import android.support.v7.preference.PreferenceScreen; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; 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 07aa7227a28..62fd01f8775 100644 --- a/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java @@ -21,7 +21,7 @@ import android.net.wifi.p2p.WifiP2pDevice; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.junit.Before; 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 ede407ebb81..8946a5e1077 100644 --- a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java @@ -30,7 +30,7 @@ import android.net.wifi.WifiManager; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settingslib.core.lifecycle.Lifecycle;