From df9438949282930a0cea0a288dd695e06d9ab975 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Wed, 11 Oct 2017 12:22:56 -0700 Subject: [PATCH] Move SettingsRobolectricTestRunner to testutils. Change-Id: Ia0017983b844cabafc10478adf4839f5755f514c Merged-In: I6612b1f26404587301c534c8ba60e39d59d6c840 Fixes: 67688380 Test: robotests --- .../com/android/settings/ConfirmCredentialTest.java | 2 +- .../src/com/android/settings/DeviceAdminAddTest.java | 1 + .../com/android/settings/DeviceInfoSettingsTest.java | 1 + .../src/com/android/settings/DisplaySettingsTest.java | 1 + .../android/settings/EncryptionAndCredentialTest.java | 1 + .../src/com/android/settings/LegalSettingsTest.java | 1 + .../settings/LicenseHtmlGeneratorFromXmlTest.java | 2 ++ .../com/android/settings/LicenseHtmlLoaderTest.java | 3 ++- .../src/com/android/settings/MasterClearTest.java | 3 +++ .../src/com/android/settings/PrivacySettingsTest.java | 2 ++ .../src/com/android/settings/SecuritySettingsTest.java | 1 + .../src/com/android/settings/SettingsActivityTest.java | 2 ++ .../android/settings/SettingsDialogFragmentTest.java | 2 ++ .../com/android/settings/SettingsDumpServiceTest.java | 2 ++ .../android/settings/SettingsLicenseActivityTest.java | 9 ++------- .../settings/SettingsPreferenceFragmentTest.java | 2 ++ .../android/settings/SetupChooseLockPatternTest.java | 1 + .../src/com/android/settings/SetupWizardUtilsTest.java | 3 +-- .../com/android/settings/SummaryPreferenceTest.java | 2 ++ .../src/com/android/settings/TetherServiceTest.java | 3 +++ .../robotests/src/com/android/settings/UtilsTest.java | 3 ++- .../src/com/android/settings/ZonePickerTest.java | 1 + .../accessibility/AccessibilitySettingsTest.java | 2 +- .../ShortcutServicePickerFragmentTest.java | 2 +- .../accounts/AccountDetailDashboardFragmentTest.java | 2 +- .../accounts/AccountPreferenceControllerTest.java | 2 +- .../settings/accounts/AccountPreferenceTest.java | 2 +- .../accounts/AccountSyncPreferenceControllerTest.java | 2 +- .../accounts/AccountTypePreferenceLoaderTest.java | 2 +- .../AddUserWhenLockedPreferenceControllerTest.java | 2 +- .../accounts/AutoSyncDataPreferenceControllerTest.java | 3 +-- .../AutoSyncPersonalDataPreferenceControllerTest.java | 3 +-- .../AutoSyncWorkDataPreferenceControllerTest.java | 3 +-- .../EmergencyInfoPreferenceControllerTest.java | 2 +- .../RemoveAccountPreferenceControllerTest.java | 5 +---- .../settings/accounts/RemoveUserFragmentTest.java | 2 +- .../settings/applications/AdvancedAppSettingsTest.java | 2 +- .../AppAndNotificationDashboardFragmentTest.java | 2 +- .../settings/applications/AppHeaderControllerTest.java | 2 +- .../settings/applications/AppInfoWithHeaderTest.java | 2 +- .../applications/AppStateAppOpsBridgeTest.java | 2 +- .../applications/AppStateInstallAppsBridgeTest.java | 3 +-- .../applications/AppStorageSizesControllerTest.java | 2 +- .../AppWithAdminGrantedPermissionsCounterTest.java | 2 +- .../AppWithAdminGrantedPermissionsListerTest.java | 2 +- .../ApplicationFeatureProviderImplTest.java | 2 +- .../settings/applications/DrawOverlayDetailsTest.java | 2 +- .../applications/EnterpriseDefaultAppsTest.java | 2 +- .../FetchPackageStorageAsyncLoaderTest.java | 2 +- .../settings/applications/InstalledAppCounterTest.java | 4 +--- .../settings/applications/InstalledAppDetailsTest.java | 2 +- .../settings/applications/InstalledAppListerTest.java | 2 +- .../settings/applications/LayoutPreferenceTest.java | 2 +- .../settings/applications/ManageApplicationsTest.java | 2 +- .../applications/MusicViewHolderControllerTest.java | 2 +- .../applications/PictureInPictureDetailsTest.java | 3 +-- .../settings/applications/PremiumSmsAccessTest.java | 2 +- .../SpecialAppAccessPreferenceControllerTest.java | 2 +- .../settings/applications/UsageAccessDetailsTest.java | 2 +- .../settings/applications/VrListenerSettingsTest.java | 2 +- .../applications/WriteSettingsDetailsTest.java | 2 +- .../assist/AssistContextPreferenceControllerTest.java | 2 +- .../AssistFlashScreenPreferenceControllerTest.java | 2 +- .../applications/assist/AssistSettingObserverTest.java | 2 +- .../applications/assist/DefaultAssistPickerTest.java | 2 +- .../assist/DefaultAssistPreferenceControllerTest.java | 2 +- .../settings/applications/assist/ManageAssistTest.java | 2 +- .../applications/defaultapps/DefaultAppInfoTest.java | 2 +- .../defaultapps/DefaultAppPickerFragmentTest.java | 2 +- .../DefaultAppPreferenceControllerTest.java | 2 +- .../defaultapps/DefaultAutofillPickerTest.java | 2 +- .../DefaultAutofillPreferenceControllerTest.java | 2 +- .../defaultapps/DefaultBrowserPickerTest.java | 2 +- .../DefaultBrowserPreferenceControllerTest.java | 2 +- .../defaultapps/DefaultEmergencyPickerTest.java | 2 +- .../defaultapps/DefaultHomePickerTest.java | 2 +- .../DefaultHomePreferenceControllerTest.java | 2 +- .../DefaultNotificationAssistantPickerTest.java | 2 +- .../defaultapps/DefaultPhonePickerTest.java | 2 +- .../applications/defaultapps/DefaultSmsPickerTest.java | 2 +- .../instantapps/InstantAppButtonsControllerTest.java | 3 +-- ...BackupSettingsActivityPreferenceControllerTest.java | 4 +--- .../settings/backup/BackupSettingsActivityTest.java | 2 +- .../settings/backup/BackupSettingsHelperTest.java | 2 +- .../backup/BackupSettingsPreferenceControllerTest.java | 2 +- .../bluetooth/BluetoothDevicePreferenceTest.java | 2 +- .../settings/bluetooth/BluetoothEnablerTest.java | 2 +- .../BluetoothMasterSwitchPreferenceControllerTest.java | 4 +--- .../settings/bluetooth/BluetoothPairingDialogTest.java | 2 +- .../BluetoothSettingsSummaryProviderTest.java | 5 +---- .../settings/bluetooth/BluetoothSettingsTest.java | 2 +- .../bluetooth/BluetoothSummaryUpdaterTest.java | 2 +- .../settings/bluetooth/DeviceProfilesSettingsTest.java | 2 +- .../src/com/android/settings/bluetooth/UtilsTest.java | 2 +- .../conditional/ConditionAdapterUtilsTest.java | 2 +- .../ConnectedDeviceDashboardFragmentTest.java | 3 +-- .../UsbModePreferenceControllerTest.java | 2 +- .../DynamicAvailabilityPreferenceControllerTest.java | 3 +-- .../core/codeinspection/CodeInspectionTest.java | 2 +- .../InstrumentedDialogFragmentTest.java | 2 +- .../instrumentation/MetricsFeatureProviderTest.java | 2 +- .../instrumentation/SharedPreferenceLoggerTest.java | 2 +- .../instrumentation/VisibilityLoggerMixinTest.java | 2 +- .../android/settings/core/lifecycle/LifecycleTest.java | 2 +- .../settings/dashboard/DashboardAdapterTest.java | 2 +- .../dashboard/DashboardFeatureProviderImplTest.java | 2 +- .../settings/dashboard/DashboardFragmentTest.java | 2 +- .../settings/dashboard/DashboardItemAnimatorTest.java | 2 +- .../settings/dashboard/DashboardSummaryTest.java | 2 +- ...shboardTilePlaceholderPreferenceControllerTest.java | 2 +- .../settings/dashboard/ProgressiveDisclosureTest.java | 2 +- .../android/settings/dashboard/SummaryLoaderTest.java | 2 +- .../settings/dashboard/SupportItemAdapterTest.java | 2 +- .../settings/dashboard/conditional/ConditionTest.java | 2 +- .../dashboard/conditional/DndConditionTest.java | 2 +- .../settings/dashboard/suggestions/EventStoreTest.java | 2 +- .../suggestions/SuggestionDismissControllerTest.java | 2 +- .../suggestions/SuggestionFeatureProviderImplTest.java | 2 +- .../suggestions/SuggestionFeaturizerTest.java | 2 +- .../dashboard/suggestions/SuggestionRankerTest.java | 4 +--- .../dashboard/suggestions/SuggestionsChecksTest.java | 2 +- .../android/settings/datausage/AppPrefLoaderTest.java | 2 +- .../settings/datausage/BillingCycleSettingsTest.java | 2 +- .../datausage/DataUsageInfoControllerTest.java | 2 +- .../android/settings/datausage/DataUsageListTest.java | 2 +- .../settings/datausage/DataUsageSummaryTest.java | 2 +- .../settings/datausage/UnrestrictedDataAccessTest.java | 2 +- .../datetime/AutoTimePreferenceControllerTest.java | 2 +- .../datetime/AutoTimeZonePreferenceControllerTest.java | 2 +- .../datetime/DatePreferenceControllerTest.java | 2 +- .../settings/datetime/TimeChangeListenerMixinTest.java | 2 +- .../datetime/TimeFormatPreferenceControllerTest.java | 2 +- .../datetime/TimePreferenceControllerTest.java | 2 +- .../datetime/TimeZonePreferenceControllerTest.java | 2 +- .../com/android/settings/datetime/ZonePickerTest.java | 2 +- ...AutomaticStorageManagerSwitchBarControllerTest.java | 2 +- .../BugReportInPowerPreferenceControllerTest.java | 2 +- .../development/BugReportPreferenceControllerTest.java | 3 +-- .../development/DevelopmentSettingsEnablerTest.java | 2 +- .../settings/development/DevelopmentSettingsTest.java | 2 +- .../TelephonyMonitorPreferenceControllerTest.java | 2 +- .../VerifyAppsOverUsbPreferenceControllerTest.java | 4 +--- .../BasebandVersionPreferenceControllerTest.java | 3 +-- .../BuildNumberPreferenceControllerTest.java | 2 +- .../DeviceModelPreferenceControllerTest.java | 2 +- .../FccEquipmentIdPreferenceControllerTest.java | 2 +- .../deviceinfo/FeedbackPreferenceControllerTest.java | 2 +- .../FirmwareVersionPreferenceControllerTest.java | 2 +- .../deviceinfo/HardwareInfoDialogFragmentTest.java | 2 +- .../KernelVersionPreferenceControllerTest.java | 2 +- .../deviceinfo/ManualPreferenceControllerTest.java | 2 +- .../PrivateVolumeOptionMenuControllerTest.java | 3 +-- .../RegulatoryInfoPreferenceControllerTest.java | 2 +- .../SerialNumberPreferenceControllerTest.java | 2 +- .../deviceinfo/StorageDashboardFragmentTest.java | 2 +- .../settings/deviceinfo/StorageItemPreferenceTest.java | 2 +- .../deviceinfo/StorageProfileFragmentTest.java | 2 +- .../settings/deviceinfo/StorageSettingsTest.java | 2 +- .../SystemUpdatePreferenceControllerTest.java | 2 +- .../android/settings/deviceinfo/UsbBackendTest.java | 2 +- .../deviceinfo/UsbModeChooserActivityTest.java | 2 +- ...torageManagementSwitchPreferenceControllerTest.java | 2 +- .../storage/SecondaryUserControllerTest.java | 2 +- .../storage/StorageItemPreferenceControllerTest.java | 2 +- .../StorageSummaryDonutPreferenceControllerTest.java | 5 +---- .../deviceinfo/storage/UserProfileControllerTest.java | 2 +- .../AutoBrightnessPreferenceControllerTest.java | 3 +-- .../BatteryPercentagePreferenceControllerTest.java | 2 +- .../display/ThemePreferenceControllerTest.java | 4 ++-- .../display/TimeoutPreferenceControllerTest.java | 2 +- .../display/VrDisplayPreferencePickerTest.java | 2 +- .../AdminActionPreferenceControllerBaseTest.java | 4 +--- ...rantedCameraPermissionPreferenceControllerTest.java | 2 +- ...tedLocationPermissionsPreferenceControllerTest.java | 2 +- ...edMicrophonePermissionPreferenceControllerTest.java | 2 +- ...GrantedPermissionsPreferenceControllerBaseTest.java | 7 +------ ...AlwaysOnVpnCurrentUserPreferenceControllerTest.java | 2 +- ...aysOnVpnManagedProfilePreferenceControllerTest.java | 2 +- .../enterprise/ApplicationListFragmentTest.java | 2 +- .../ApplicationListPreferenceControllerTest.java | 2 +- .../enterprise/BugReportsPreferenceControllerTest.java | 3 +-- .../enterprise/CaCertsPreferenceControllerTest.java | 4 ++-- ...priseInstalledPackagesPreferenceControllerTest.java | 3 +-- .../EnterprisePrivacyFeatureProviderImplTest.java | 2 +- .../EnterprisePrivacyPreferenceControllerTest.java | 3 +-- .../enterprise/EnterprisePrivacySettingsTest.java | 4 +--- .../EnterpriseSetDefaultAppsListFragmentTest.java | 2 +- ...riseSetDefaultAppsListPreferenceControllerTest.java | 2 +- ...terpriseSetDefaultAppsPreferenceControllerTest.java | 2 +- ...xposureChangesCategoryPreferenceControllerTest.java | 2 +- ...asswordWipeCurrentUserPreferenceControllerTest.java | 4 +--- ...wordWipeManagedProfilePreferenceControllerTest.java | 4 +--- ...FailedPasswordWipePreferenceControllerBaseTest.java | 2 +- .../GlobalHttpProxyPreferenceControllerTest.java | 2 +- .../enterprise/ImePreferenceControllerTest.java | 4 ++-- .../ManageDeviceAdminPreferenceControllerTest.java | 3 +-- .../NetworkLogsPreferenceControllerTest.java | 3 +-- .../SecurityLogsPreferenceControllerTest.java | 3 +-- .../fingerprint/FingerprintEnrollFindSensorTest.java | 2 +- .../FingerprintLocationAnimationVideoViewTest.java | 2 +- .../fuelgauge/AdvancedPowerUsageDetailTest.java | 4 +--- .../fuelgauge/BatteryBroadcastReceiverTest.java | 2 +- .../BatteryHeaderPreferenceControllerTest.java | 3 +-- .../fuelgauge/BatteryHistoryPreferenceTest.java | 4 +--- .../settings/fuelgauge/BatteryMeterViewTest.java | 2 +- .../settings/fuelgauge/BatterySaverControllerTest.java | 2 +- .../fuelgauge/BatteryStatsHelperLoaderTest.java | 2 +- .../android/settings/fuelgauge/BatteryUtilsTest.java | 2 +- .../fuelgauge/ButtonActionDialogFragmentTest.java | 2 +- .../settings/fuelgauge/HighPowerDetailTest.java | 2 +- .../settings/fuelgauge/PowerUsageAdvancedTest.java | 2 +- .../fuelgauge/PowerUsageFeatureProviderImplTest.java | 2 +- .../settings/fuelgauge/PowerUsageSummaryTest.java | 3 +-- .../AssistGesturePreferenceControllerTest.java | 7 +------ ...sistGestureSensitivityPreferenceControllerTest.java | 10 +--------- .../settings/gestures/AssistGestureSettingsTest.java | 2 +- .../DoubleTapPowerPreferenceControllerTest.java | 4 +--- .../settings/gestures/DoubleTapPowerSettingsTest.java | 2 +- .../DoubleTapScreenPreferenceControllerTest.java | 4 +--- .../settings/gestures/DoubleTapScreenSettingsTest.java | 2 +- .../gestures/DoubleTwistGestureSettingsTest.java | 2 +- .../gestures/DoubleTwistPreferenceControllerTest.java | 2 +- .../gestures/GesturePreferenceControllerTest.java | 2 +- .../PIckupGesturePreferenceControllerTest.java | 4 +--- .../settings/gestures/PickupGestureSettingsTest.java | 2 +- .../SwipeToNotificationPreferenceControllerTest.java | 4 +--- .../gestures/SwipeToNotificationSettingsTest.java | 2 +- .../GameControllerPreferenceControllerTest.java | 2 +- .../PhysicalKeyboardPreferenceControllerTest.java | 2 +- .../SpellCheckerPreferenceControllerTest.java | 2 +- .../VirtualKeyboardPreferenceControllerTest.java | 2 +- .../language/LanguageAndInputSettingsTest.java | 3 +-- .../PhoneLanguagePreferenceControllerTest.java | 2 +- .../settings/language/TtsPreferenceControllerTest.java | 2 +- .../UserDictionaryPreferenceControllerTest.java | 2 +- .../AppLocationPermissionPreferenceControllerTest.java | 3 +-- .../location/LocationPreferenceControllerTest.java | 2 +- .../network/MobileNetworkPreferenceControllerTest.java | 2 +- .../network/MobilePlanPreferenceControllerTest.java | 2 +- .../settings/network/NetworkDashboardFragmentTest.java | 3 +-- .../network/NetworkResetActionMenuControllerTest.java | 2 +- .../network/NetworkResetPreferenceControllerTest.java | 2 +- .../network/NetworkResetRestrictionCheckerTest.java | 2 +- .../NetworkScorerPickerPreferenceControllerTest.java | 2 +- .../settings/network/NetworkScorerPickerTest.java | 2 +- .../network/TetherPreferenceControllerTest.java | 2 +- .../settings/network/VpnPreferenceControllerTest.java | 2 +- .../network/WifiCallingPreferenceControllerTest.java | 2 +- .../com/android/settings/nfc/PaymentSettingsTest.java | 4 ++-- ...AdjustVolumeRestrictedPreferenceControllerTest.java | 2 +- .../AlarmRingtonePreferenceControllerTest.java | 2 +- .../AlarmVolumePreferenceControllerTest.java | 2 +- .../BootSoundPreferenceControllerTest.java | 2 +- .../notification/CastPreferenceControllerTest.java | 2 +- .../ChargingSoundPreferenceControllerTest.java | 2 +- .../DialPadTonePreferenceControllerTest.java | 2 +- .../DockAudioMediaPreferenceControllerTest.java | 2 +- .../DockingSoundPreferenceControllerTest.java | 2 +- .../EmergencyBroadcastPreferenceControllerTest.java | 2 +- .../EmergencyTonePreferenceControllerTest.java | 2 +- .../MediaVolumePreferenceControllerTest.java | 2 +- .../notification/NotificationAccessSettingsTest.java | 2 +- .../settings/notification/NotificationBackendTest.java | 9 +-------- .../NotificationRingtonePreferenceControllerTest.java | 2 +- .../NotificationVolumePreferenceControllerTest.java | 2 +- .../PhoneRingtonePreferenceControllerTest.java | 2 +- .../RingVolumePreferenceControllerTest.java | 3 +-- .../RingtonePreferenceControllerBaseTest.java | 2 +- .../ScreenLockSoundPreferenceControllerTest.java | 2 +- .../notification/SettingPrefControllerTest.java | 2 +- .../settings/notification/SoundSettingsTest.java | 2 +- .../TouchSoundPreferenceControllerTest.java | 3 +-- .../VibrateOnTouchPreferenceControllerTest.java | 2 +- .../VibrateWhenRingPreferenceControllerTest.java | 2 +- .../VolumeSeekBarPreferenceControllerTest.java | 3 +-- .../WorkSoundPreferenceControllerTest.java | 2 +- .../settings/notification/ZenAccessSettingsTest.java | 2 +- .../notification/ZenModePreferenceControllerTest.java | 2 +- .../settings/notification/ZenModeSettingsTest.java | 2 +- .../settings/password/SetNewPasswordActivityTest.java | 2 +- .../password/SetNewPasswordControllerTest.java | 2 +- .../settings/print/PrintSettingsFragmentTest.java | 4 ++-- .../settings/search/BaseSearchIndexProviderTest.java | 2 +- .../com/android/settings/search/DataIntegrityTest.java | 2 +- .../settings/search/DatabaseIndexingUtilsTest.java | 7 +------ .../com/android/settings/search/DatabaseRowTest.java | 2 +- .../search/DynamicIndexableContentMonitorTest.java | 2 +- .../settings/search/InlineSwitchPayloadTest.java | 2 +- .../settings/search/InlineSwitchViewHolderTest.java | 2 +- .../com/android/settings/search/IntentPayloadTest.java | 2 +- .../settings/search/IntentSearchViewHolderTest.java | 2 +- .../settings/search/ResultPayloadUtilsTest.java | 6 ++---- .../settings/search/SearchFeatureProviderImplTest.java | 2 +- .../settings/search/SearchIndexableResourcesTest.java | 2 +- .../settings/search/SearchResultBuilderTest.java | 2 +- .../settings/search/SearchResultsAdapterTest.java | 2 +- .../com/android/settings/search/XmlParserUtilTest.java | 2 +- .../search2/CursorToSearchResultConverterTest.java | 2 +- .../settings/search2/DatabaseIndexingManagerTest.java | 2 +- .../settings/search2/DatabaseResultLoaderTest.java | 2 +- .../settings/search2/InstalledAppResultLoaderTest.java | 2 +- .../android/settings/search2/SavedQueryLoaderTest.java | 2 +- .../settings/search2/SavedQueryPayloadTest.java | 2 +- .../search2/SavedQueryRecorderAndRemoverTest.java | 2 +- .../settings/search2/SavedQueryViewHolderTest.java | 2 +- .../android/settings/search2/SearchFragmentTest.java | 2 +- .../android/settings/search2/SiteMapManagerTest.java | 2 +- .../security/LockscreenDashboardFragmentTest.java | 2 +- .../security/OwnerInfoPreferenceControllerTest.java | 3 +-- .../security/SecurityFeatureProviderImplTest.java | 2 +- .../settings/suggestions/SettingsSuggestionsTest.java | 2 +- .../android/settings/support/SupportConfigTest.java | 2 +- .../support/SupportDisclaimerDialogFragmentTest.java | 2 +- .../com/android/settings/survey/SurveyMixinTest.java | 2 +- .../system/FactoryResetPreferenceControllerTest.java | 2 +- .../settings/system/SystemDashboardFragmentTest.java | 2 +- .../{ => testutils}/SettingsRobolectricTestRunner.java | 10 ++++++---- .../trustagent/TrustAgentFeatureProviderImplTest.java | 2 +- .../settings/users/UserFeatureProviderImplTest.java | 2 +- .../com/android/settings/users/UserPreferenceTest.java | 2 +- .../com/android/settings/users/UserSettingsTest.java | 2 +- .../utils/LocalClassLoaderContextThemeWrapperTest.java | 2 +- .../android/settings/vpn2/AppDialogFragmentTest.java | 2 +- .../src/com/android/settings/vpn2/VpnUtilsTest.java | 2 +- .../wallpaper/WallpaperSuggestionActivityTest.java | 2 +- .../android/settings/webview/WebViewAppPickerTest.java | 2 +- .../webview/WebViewAppPreferenceControllerTest.java | 2 +- .../android/settings/wfd/WifiDisplaySettingsTest.java | 2 +- .../settings/widget/DefaultIndicatorSeekBarTest.java | 2 +- .../settings/widget/FooterPreferenceMixinTest.java | 2 +- .../android/settings/widget/FooterPreferenceTest.java | 2 +- .../settings/widget/MasterSwitchPreferenceTest.java | 2 +- .../settings/widget/RadioButtonPickerFragmentTest.java | 2 +- .../android/settings/widget/RingProgressBarTest.java | 2 +- .../settings/widget/RtlCompatibleViewPagerTest.java | 2 +- .../android/settings/widget/SummaryUpdaterTest.java | 3 +-- .../wifi/CellularFallbackPreferenceControllerTest.java | 2 +- .../android/settings/wifi/LinkablePreferenceTest.java | 2 +- .../NotifyOpenNetworkPreferenceControllerTest.java | 2 +- .../wifi/UseOpenWifiPreferenceControllerTest.java | 2 +- .../settings/wifi/WifiConfigControllerTest.java | 2 +- .../src/com/android/settings/wifi/WifiEnablerTest.java | 2 +- .../wifi/WifiInfoPreferenceControllerTest.java | 2 +- .../wifi/WifiMasterSwitchPreferenceControllerTest.java | 4 +--- .../android/settings/wifi/WifiSummaryUpdaterTest.java | 2 +- .../wifi/WifiWakeupPreferenceControllerTest.java | 2 +- .../settings/wifi/WpsPreferenceControllerTest.java | 2 +- .../settings/wifi/WriteWifiConfigToNfcDialogTest.java | 3 +-- .../details/WifiDetailPreferenceControllerTest.java | 3 +-- .../wifi/p2p/WifiP2PPreferenceControllerTest.java | 2 +- 350 files changed, 375 insertions(+), 452 deletions(-) rename tests/robotests/src/com/android/settings/{ => testutils}/SettingsRobolectricTestRunner.java (98%) diff --git a/tests/robotests/src/com/android/settings/ConfirmCredentialTest.java b/tests/robotests/src/com/android/settings/ConfirmCredentialTest.java index f771a1ffec4..3bcaf1a68b0 100644 --- a/tests/robotests/src/com/android/settings/ConfirmCredentialTest.java +++ b/tests/robotests/src/com/android/settings/ConfirmCredentialTest.java @@ -21,9 +21,9 @@ import static com.google.common.truth.Truth.assertThat; import android.R; import android.app.Activity; -import android.app.Fragment; import android.app.FragmentManager; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; import org.junit.Test; 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 f0c87cf1cd5..8c1d7d493fb 100644 --- a/tests/robotests/src/com/android/settings/DisplaySettingsTest.java +++ b/tests/robotests/src/com/android/settings/DisplaySettingsTest.java @@ -2,6 +2,7 @@ package com.android.settings; import android.content.Context; import com.android.settings.core.PreferenceController; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.XmlTestUtils; import org.junit.Test; import org.junit.runner.RunWith; 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..34cb2e7bdad 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; 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..3f58f92291e 100644 --- a/tests/robotests/src/com/android/settings/LicenseHtmlLoaderTest.java +++ b/tests/robotests/src/com/android/settings/LicenseHtmlLoaderTest.java @@ -27,9 +27,10 @@ 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 721d0e06d19..9951a3b65d7 100644 --- a/tests/robotests/src/com/android/settings/MasterClearTest.java +++ b/tests/robotests/src/com/android/settings/MasterClearTest.java @@ -21,6 +21,9 @@ import static org.mockito.Mockito.when; 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 65e97083957..3c1178b55dd 100644 --- a/tests/robotests/src/com/android/settings/SettingsActivityTest.java +++ b/tests/robotests/src/com/android/settings/SettingsActivityTest.java @@ -27,6 +27,8 @@ import android.graphics.Bitmap; import android.os.Bundle; import android.view.Menu; import com.android.settings.testutils.FakeFeatureFactory; +import com.android.settings.testutils.SettingsRobolectricTestRunner; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; 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..fbf8c3beec8 100644 --- a/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java +++ b/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java @@ -26,17 +26,13 @@ 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; @@ -46,7 +42,6 @@ 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; diff --git a/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java index cd48da3c914..4b5cd750e0a 100644 --- a/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java @@ -36,6 +36,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 4b78ee73c8a..c925e5d9ef1 100644 --- a/tests/robotests/src/com/android/settings/SetupChooseLockPatternTest.java +++ b/tests/robotests/src/com/android/settings/SetupChooseLockPatternTest.java @@ -26,6 +26,7 @@ import android.content.pm.PackageManager; import android.os.UserHandle; import com.android.settings.ChooseLockPattern.ChooseLockPatternFragment; +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..c5ba9c477c2 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; diff --git a/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java index 90728e82c1b..2d450185f49 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java @@ -24,7 +24,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.settings.testutils.shadow.ShadowAccountManager; import com.android.settings.testutils.shadow.ShadowContentResolver; diff --git a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java index f1ad1425a4b..0647489ef8f 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java @@ -31,7 +31,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..dc258e297d3 100644 --- a/tests/robotests/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceControllerTest.java @@ -17,7 +17,6 @@ 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; @@ -30,7 +29,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 10bb283696a..fe4766a16c9 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 033465b2b90..5ac911f72d7 100644 --- a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java @@ -30,13 +30,10 @@ import android.support.v7.preference.PreferenceScreen; import android.support.v14.preference.PreferenceFragment; import android.widget.Button; -import com.android.settings.AccessiblePreferenceCategory; 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.search.SearchIndexableRaw; -import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.shadow.ShadowAccountManager; import com.android.settings.testutils.shadow.ShadowContentResolver; 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 0c3c1600577..0352153ed99 100644 --- a/tests/robotests/src/com/android/settings/applications/AdvancedAppSettingsTest.java +++ b/tests/robotests/src/com/android/settings/applications/AdvancedAppSettingsTest.java @@ -19,7 +19,7 @@ package com.android.settings.applications; 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.applications.defaultapps.DefaultBrowserPreferenceController; 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/AppHeaderControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java index 8b9b4b46c32..26e462970a6 100644 --- a/tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java @@ -41,7 +41,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 org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java b/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java index 68c153cb6e4..e8b4f450fb4 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.settingslib.applications.AppUtils; 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 ef6351abfb2..5bf46482af2 100644 --- a/tests/robotests/src/com/android/settings/applications/DrawOverlayDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/DrawOverlayDetailsTest.java @@ -19,7 +19,7 @@ package com.android.settings.applications; 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 36116c00790..18a39204a24 100644 --- a/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java +++ b/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java @@ -27,7 +27,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 37fa9d70bb1..1391b2f99a8 100644 --- a/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java +++ b/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java @@ -22,11 +22,10 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.content.pm.UserInfo; -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.testutils.shadow.ShadowUserManager; @@ -41,7 +40,6 @@ import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.Arrays; -import java.util.List; import java.util.Set; import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java index 2fbad13d68e..f47be60affe 100644 --- a/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java @@ -38,7 +38,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.fuelgauge.BatteryUtils; diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java index 76421c25f88..2c5fef5944f 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; 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 871b5a0316a..c8badc3978c 100644 --- a/tests/robotests/src/com/android/settings/applications/ManageApplicationsTest.java +++ b/tests/robotests/src/com/android/settings/applications/ManageApplicationsTest.java @@ -23,7 +23,7 @@ import android.os.Looper; 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.core.lifecycle.Lifecycle; import com.android.settings.testutils.shadow.ShadowDynamicIndexableContentMonitor; diff --git a/tests/robotests/src/com/android/settings/applications/MusicViewHolderControllerTest.java b/tests/robotests/src/com/android/settings/applications/MusicViewHolderControllerTest.java index 779e0b647cd..40c354eb609 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.deviceinfo.StorageVolumeProvider; import com.android.settingslib.applications.StorageStatsSource; diff --git a/tests/robotests/src/com/android/settings/applications/PictureInPictureDetailsTest.java b/tests/robotests/src/com/android/settings/applications/PictureInPictureDetailsTest.java index 96a10f1bc8a..ab00a6068c4 100644 --- a/tests/robotests/src/com/android/settings/applications/PictureInPictureDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/PictureInPictureDetailsTest.java @@ -19,7 +19,7 @@ package com.android.settings.applications; 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; @@ -30,7 +30,6 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; -import org.robolectric.util.ReflectionHelpers; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Matchers.any; diff --git a/tests/robotests/src/com/android/settings/applications/PremiumSmsAccessTest.java b/tests/robotests/src/com/android/settings/applications/PremiumSmsAccessTest.java index d9c88ff9a64..87150ac7c86 100644 --- a/tests/robotests/src/com/android/settings/applications/PremiumSmsAccessTest.java +++ b/tests/robotests/src/com/android/settings/applications/PremiumSmsAccessTest.java @@ -20,7 +20,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/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 fba02c3d67d..8c62e23bd78 100644 --- a/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java @@ -20,7 +20,7 @@ import android.content.Context; import android.os.RemoteException; 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 3abe3f4aaad..a5919b6a37d 100644 --- a/tests/robotests/src/com/android/settings/applications/VrListenerSettingsTest.java +++ b/tests/robotests/src/com/android/settings/applications/VrListenerSettingsTest.java @@ -19,7 +19,7 @@ package com.android.settings.applications; 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 a6321180e03..08b322f755f 100644 --- a/tests/robotests/src/com/android/settings/applications/WriteSettingsDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/WriteSettingsDetailsTest.java @@ -19,7 +19,7 @@ package com.android.settings.applications; 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 da8473f1e33..b788d1e5f06 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.settings.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 0b2378c4dac..fcb24d43af8 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.core.lifecycle.Lifecycle; import com.android.settings.testutils.shadow.ShadowSecureSettings; 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 2d9ae9be6c9..fcb02b70798 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java @@ -27,7 +27,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.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 6d6e2f81cd6..cae41f0e37b 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java @@ -21,7 +21,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..585118d24fd 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; 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..9c47f3bd5ac 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; 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/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..d2df35a1a56 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; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceControllerTest.java index 177130e714b..a1b5f2b9eb1 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceControllerTest.java @@ -17,12 +17,10 @@ package com.android.settings.bluetooth; 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.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.widget.MasterSwitchPreference; import com.android.settingslib.bluetooth.BluetoothCallback; 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/BluetoothSettingsSummaryProviderTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsSummaryProviderTest.java index 8272dbf5f5f..10ae8f86ad0 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,9 +32,6 @@ 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; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsTest.java index 9e90fdf37a0..9c746185559 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsTest.java @@ -16,7 +16,7 @@ package com.android.settings.bluetooth; -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/bluetooth/BluetoothSummaryUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java index 79daa0e7c86..ad2bc3da85b 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; 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 dde291d9489..1d907914dfd 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 e79284564a6..65763ec0630 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java @@ -19,9 +19,8 @@ import android.content.Context; import android.content.pm.PackageManager; import android.provider.SearchIndexableResource; -import com.android.settings.bluetooth.BluetoothMasterSwitchPreferenceController; 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.testutils.XmlTestUtils; import com.android.settingslib.drawer.CategoryKey; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/UsbModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/UsbModePreferenceControllerTest.java index 4b84b0f4c7a..d1af70c460f 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; diff --git a/tests/robotests/src/com/android/settings/core/DynamicAvailabilityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/DynamicAvailabilityPreferenceControllerTest.java index 399c753b8ce..9f182a912ee 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.settings.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 763d6e35120..f89b381e973 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 8a555a8dc81..81b244df8a8 100644 --- a/tests/robotests/src/com/android/settings/core/instrumentation/VisibilityLoggerMixinTest.java +++ b/tests/robotests/src/com/android/settings/core/instrumentation/VisibilityLoggerMixinTest.java @@ -21,7 +21,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/core/lifecycle/LifecycleTest.java b/tests/robotests/src/com/android/settings/core/lifecycle/LifecycleTest.java index d863143b952..12dc9bb0305 100644 --- a/tests/robotests/src/com/android/settings/core/lifecycle/LifecycleTest.java +++ b/tests/robotests/src/com/android/settings/core/lifecycle/LifecycleTest.java @@ -20,7 +20,7 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.core.lifecycle.events.OnAttach; import com.android.settings.core.lifecycle.events.OnCreateOptionsMenu; diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java index d7daa03a1fa..ab154517851 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java @@ -23,7 +23,7 @@ import android.view.View; import android.widget.FrameLayout; 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.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 e7587d58ce7..b8cc17f3133 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java @@ -30,7 +30,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 e35fa331e76..9421d5c5c1d 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java @@ -21,7 +21,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 a8e294c1585..957a2754068 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; 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 a3b9bf8a0c8..2d57d64ca33 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; 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/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/SuggestionDismissControllerTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionDismissControllerTest.java index 4a41ede188c..a9ba357e6a6 100644 --- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionDismissControllerTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionDismissControllerTest.java @@ -21,7 +21,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.SuggestionParser; 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 3efe15a86d4..c083b876682 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.SuggestionParser; 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/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 d674c770db1..f9d2acf2b73 100644 --- a/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java +++ b/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java @@ -19,7 +19,7 @@ import com.android.internal.logging.nano.MetricsProto; import android.content.Context; import android.content.pm.ApplicationInfo; import android.os.Process; -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 8a8c066af08..aac1e80bbfc 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.settings.core.lifecycle.LifecycleObserver; import com.android.settings.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 4acac705b2a..554cda648ae 100644 --- a/tests/robotests/src/com/android/settings/datetime/ZonePickerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/ZonePickerTest.java @@ -21,7 +21,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 be04eecefc8..c5ba42d59ff 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..8ca79026d88 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; diff --git a/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java index 35ca5f8c656..94302099b8d 100644 --- a/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java @@ -21,9 +21,8 @@ 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; 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 485a5394e29..e2527ce95a2 100644 --- a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsTest.java +++ b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsTest.java @@ -22,7 +22,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.testutils.FakeFeatureFactory; import com.android.settingslib.drawer.CategoryKey; diff --git a/tests/robotests/src/com/android/settings/development/TelephonyMonitorPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/TelephonyMonitorPreferenceControllerTest.java index 9a1a3b62393..e9c762a3bda 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; 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..8d00361e319 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; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java index 4475d189151..c8f40364889 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.core.lifecycle.Lifecycle; import com.android.settings.search2.DatabaseIndexingManager; 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 732ba2260e4..669f4c2070b 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.settings.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 3ea80166fbd..b0f464cf2dd 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 17abab1a5c0..fe8fa9c167a 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java @@ -24,7 +24,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 8529c5dbd38..e7a70eff5cb 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/UsbBackendTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/UsbBackendTest.java @@ -21,7 +21,7 @@ import android.content.IntentFilter; 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..04078bc2b80 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java @@ -36,7 +36,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 3ad37838a8e..5139bb35208 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java @@ -43,7 +43,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 6492f677ada..cea71bd618e 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; @@ -53,7 +51,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/AutoBrightnessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java index 6d8696f1541..ed2b5c1b338 100644 --- a/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java @@ -18,9 +18,8 @@ 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.gestures.DoubleTapPowerPreferenceController; import com.android.settings.search2.InlineSwitchPayload; import com.android.settings.search2.ResultPayload; import org.junit.Before; 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/ThemePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java index 2c0f4a7c2fe..7a7f40088dd 100644 --- a/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java @@ -21,8 +21,8 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; 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; 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/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 5eb59e76943..ab4ef4bb886 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java @@ -25,7 +25,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 646774d8363..44bf4141ecc 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java +++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java @@ -31,7 +31,7 @@ import android.widget.Button; import com.android.settings.ChooseLockSettingsHelper; 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.IFingerprintManager; import com.android.settings.testutils.shadow.SettingsShadowResources; diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoViewTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoViewTest.java index e8dc2b5d130..3e46e7b73c1 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoViewTest.java +++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoViewTest.java @@ -22,7 +22,7 @@ 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; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java index f4ed43ee060..799e296b28d 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java @@ -44,7 +44,7 @@ import android.view.View; 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.AppHeaderController; import com.android.settings.applications.LayoutPreference; @@ -64,8 +64,6 @@ import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; import org.robolectric.util.ReflectionHelpers; @RunWith(SettingsRobolectricTestRunner.class) 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 04bb2cf3be4..a8708e034c1 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java @@ -27,12 +27,11 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.content.Intent; import android.os.BatteryManager; -import android.support.v7.preference.Preference; 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.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 221408dbea9..5e208a15c1c 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java @@ -16,14 +16,13 @@ package com.android.settings.fuelgauge; import android.content.Context; -import android.os.PowerManager; import android.support.v7.preference.PreferenceViewHolder; import android.view.LayoutInflater; 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.settingslib.BatteryInfo; import com.android.settingslib.graph.UsageView; @@ -35,7 +34,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import org.robolectric.util.ReflectionHelpers; import static org.mockito.AdditionalMatchers.not; import static org.mockito.Matchers.anyInt; 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 96563814e94..afa965a4757 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.core.lifecycle.Lifecycle; import com.android.settings.widget.MasterSwitchPreference; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryStatsHelperLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryStatsHelperLoaderTest.java index d19a4b272cf..048ad3f08e8 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryStatsHelperLoaderTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryStatsHelperLoaderTest.java @@ -24,7 +24,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 4ff1b7e3a9f..c8e7ec209dc 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/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/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 06104566c1a..d60cd0da7ff 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java @@ -15,7 +15,6 @@ */ package com.android.settings.fuelgauge; -import android.app.Activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; @@ -34,7 +33,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/gestures/AssistGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGesturePreferenceControllerTest.java index e83e237090e..7189f50a9d5 100644 --- a/tests/robotests/src/com/android/settings/gestures/AssistGesturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/AssistGesturePreferenceControllerTest.java @@ -19,12 +19,10 @@ 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; -import com.android.settings.search2.InlineSwitchPayload; -import com.android.settings.search2.ResultPayload; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -34,9 +32,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; -import java.util.ArrayList; -import java.util.List; - import static android.provider.Settings.Secure.ASSIST_GESTURE_ENABLED; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Matchers.anyInt; diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGestureSensitivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGestureSensitivityPreferenceControllerTest.java index 229ef496884..7d75f32feb4 100644 --- a/tests/robotests/src/com/android/settings/gestures/AssistGestureSensitivityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/AssistGestureSensitivityPreferenceControllerTest.java @@ -19,27 +19,19 @@ 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; -import com.android.settings.search2.InlineSwitchPayload; -import com.android.settings.search2.ResultPayload; 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; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; -import java.util.ArrayList; -import java.util.List; - -import static android.provider.Settings.Secure.ASSIST_GESTURE_ENABLED; -import static android.provider.Settings.Secure.ASSIST_GESTURE_SENSITIVITY; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.mock; diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java index 4efc822d7de..85307a40ad5 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; diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java index d7961e3a8e9..cc30a746137 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java @@ -20,11 +20,9 @@ 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.search2.InlineSwitchPayload; -import com.android.settings.search2.ResultPayload; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; 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 442d11dffe6..539c7dbfc4a 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java @@ -19,11 +19,9 @@ 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 com.android.settings.search2.InlineSwitchPayload; -import com.android.settings.search2.ResultPayload; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; 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..ad3daddab91 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; 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 3dc6892b6ed..27db35040ec 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.core.lifecycle.Lifecycle; import com.android.settings.widget.VideoPreference; diff --git a/tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java index 46c0f657423..d81163de370 100644 --- a/tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java @@ -19,11 +19,9 @@ 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 com.android.settings.search2.InlineSwitchPayload; -import com.android.settings.search2.ResultPayload; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/gestures/PickupGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/PickupGestureSettingsTest.java index 921a1bec680..3ca23d41e44 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; diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java index cf26cb2b848..ac551de5958 100644 --- a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java @@ -19,11 +19,9 @@ 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.search2.InlineSwitchPayload; -import com.android.settings.search2.ResultPayload; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java index 78dc27acb80..6373620a6bc 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; 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 6f5b6b0daa5..7d9c9ac16c7 100644 --- a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java +++ b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java @@ -40,13 +40,12 @@ 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.core.lifecycle.Lifecycle; import com.android.settings.core.lifecycle.LifecycleObserver; import com.android.settings.dashboard.SummaryLoader; -import com.android.settings.fuelgauge.PowerUsageSummary; import com.android.settings.testutils.XmlTestUtils; import com.android.settings.testutils.shadow.ShadowSecureSettings; 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..495e33aa1c5 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; diff --git a/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java index 2e001695dfb..b69f731c063 100644 --- a/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java @@ -21,7 +21,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/network/MobileNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java index 1ae40aa1294..0c46ed914cd 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.settings.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 d1c32078838..aa321bdc9d2 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java @@ -19,9 +19,8 @@ import android.content.Context; import android.provider.SearchIndexableResource; import android.view.Menu; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment; import com.android.settings.testutils.XmlTestUtils; import com.android.settingslib.drawer.CategoryKey; 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 2a0b873a726..ed424275ded 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.settings.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 7e898fbe9db..119ad26133c 100644 --- a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java +++ b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java @@ -20,8 +20,8 @@ package com.android.settings.nfc; import android.content.Context; import android.content.pm.PackageManager; -import android.content.pm.PackageParser; -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/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..bf3ba866556 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; 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..31dc68341e9 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; diff --git a/tests/robotests/src/com/android/settings/notification/NotificationAccessSettingsTest.java b/tests/robotests/src/com/android/settings/notification/NotificationAccessSettingsTest.java index b0aa856c864..8b15a0ed22b 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationAccessSettingsTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationAccessSettingsTest.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/NotificationBackendTest.java b/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java index d380900da5e..f0eb139fea1 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java @@ -16,18 +16,11 @@ package com.android.settings.notification; -import android.app.NotificationManager; -import android.app.NotificationManager.Policy; -import android.content.Context; -import android.support.v7.preference.Preference; - -import com.android.settings.R; import com.android.settings.notification.NotificationBackend.AppRow; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import org.robolectric.annotation.Config; -import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; 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 25581b93a2a..1eb935fe142 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.settings.core.lifecycle.Lifecycle; 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..04e430b6ae4 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; 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 581ed472a0b..bc5ddc2cb11 100644 --- a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java @@ -17,11 +17,10 @@ package com.android.settings.notification; import android.content.Context; -import android.preference.SeekBarVolumizer; 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 520e1f07add..38abfa42917 100644 --- a/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java @@ -28,7 +28,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..dd5c590df8f 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; diff --git a/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java b/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java index 573f5d86951..5cbf3a991ff 100644 --- a/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java +++ b/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java @@ -22,7 +22,7 @@ import android.os.Bundle; import android.provider.Settings; import com.android.settings.ChooseLockGeneric; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.SetupChooseLockGeneric; import com.android.settings.TestConfig; diff --git a/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java b/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java index ab01360910e..c52ad33333c 100644 --- a/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java +++ b/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java @@ -22,7 +22,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/print/PrintSettingsFragmentTest.java b/tests/robotests/src/com/android/settings/print/PrintSettingsFragmentTest.java index 0e2a2f6e1bc..f7830f0072f 100644 --- a/tests/robotests/src/com/android/settings/print/PrintSettingsFragmentTest.java +++ b/tests/robotests/src/com/android/settings/print/PrintSettingsFragmentTest.java @@ -26,9 +26,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; @@ -69,7 +69,7 @@ public class PrintSettingsFragmentTest { when(printServices.size()).thenReturn(2); // 2 services when(mPrintManager.getPrintServices(PrintManager.ENABLED_SERVICES)) - .thenReturn(printServices); + .thenReturn(printServices); mSummaryProvider.setListening(true); diff --git a/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java b/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java index 42c53018a21..a204d9dbd13 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/DataIntegrityTest.java b/tests/robotests/src/com/android/settings/search/DataIntegrityTest.java index 6ffd704d9e2..31373cd4678 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/DatabaseIndexingUtilsTest.java b/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java index f4370fc97ca..7269c6b6dc4 100644 --- a/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java +++ b/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java @@ -21,15 +21,10 @@ 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.display.AutoBrightnessPreferenceController; -import com.android.settings.gestures.DoubleTapPowerPreferenceController; -import com.android.settings.gestures.DoubleTapScreenPreferenceController; -import com.android.settings.gestures.DoubleTwistPreferenceController; -import com.android.settings.gestures.PickupGesturePreferenceController; -import com.android.settings.gestures.SwipeToNotificationPreferenceController; import com.android.settings.search2.DatabaseIndexingUtils; import com.android.settings.search2.IntentPayload; diff --git a/tests/robotests/src/com/android/settings/search/DatabaseRowTest.java b/tests/robotests/src/com/android/settings/search/DatabaseRowTest.java index 34626bd9f12..7c2e2f365e4 100644 --- a/tests/robotests/src/com/android/settings/search/DatabaseRowTest.java +++ b/tests/robotests/src/com/android/settings/search/DatabaseRowTest.java @@ -18,7 +18,7 @@ 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.search2.DatabaseIndexingManager.DatabaseRow; import com.android.settings.search2.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 79c0d632517..f4a2528113d 100644 --- a/tests/robotests/src/com/android/settings/search/DynamicIndexableContentMonitorTest.java +++ b/tests/robotests/src/com/android/settings/search/DynamicIndexableContentMonitorTest.java @@ -54,7 +54,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/InlineSwitchPayloadTest.java b/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java index 701679cca5c..74a19945d0f 100644 --- a/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java +++ b/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java @@ -21,7 +21,7 @@ import android.os.Parcel; import android.util.ArrayMap; import android.content.Context; -import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.search2.InlineSwitchPayload; import com.android.settings.search2.ResultPayload; diff --git a/tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java b/tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java index ba9feb34604..b8e461880cd 100644 --- a/tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java +++ b/tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java @@ -24,7 +24,7 @@ import android.view.LayoutInflater; 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.search2.InlineSwitchPayload; import com.android.settings.search2.InlineSwitchViewHolder; diff --git a/tests/robotests/src/com/android/settings/search/IntentPayloadTest.java b/tests/robotests/src/com/android/settings/search/IntentPayloadTest.java index 6f42622e676..515b76a7f60 100644 --- a/tests/robotests/src/com/android/settings/search/IntentPayloadTest.java +++ b/tests/robotests/src/com/android/settings/search/IntentPayloadTest.java @@ -19,7 +19,7 @@ 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.search2.IntentPayload; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java b/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java index 63eec1028ee..cacc042dd38 100644 --- a/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java +++ b/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java @@ -39,7 +39,7 @@ import android.view.View; 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.search2.AppSearchResult; import com.android.settings.search2.IntentPayload; diff --git a/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java b/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java index 3875d869af6..71b294112c4 100644 --- a/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java +++ b/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java @@ -18,8 +18,8 @@ package com.android.settings.search; import android.content.Intent; -import android.os.BadParcelableException; -import com.android.settings.SettingsRobolectricTestRunner; + +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.search2.IntentPayload; import com.android.settings.search2.ResultPayloadUtils; @@ -28,8 +28,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.annotation.Config; -import java.io.StreamCorruptedException; - import static com.google.common.truth.Truth.assertThat; import static junit.framework.Assert.fail; diff --git a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java index e7331964a50..d7113fa0509 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; import com.android.settings.search2.SearchFeatureProviderImpl; 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 f83b59583f0..3b6e10a7fbc 100644 --- a/tests/robotests/src/com/android/settings/search/SearchResultBuilderTest.java +++ b/tests/robotests/src/com/android/settings/search/SearchResultBuilderTest.java @@ -21,7 +21,7 @@ import android.content.Context; 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.search2.IntentPayload; import com.android.settings.search2.ResultPayload; diff --git a/tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java b/tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java index 645dfe5fdb0..ace29fbd6aa 100644 --- a/tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java +++ b/tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java @@ -25,7 +25,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.search2.AppSearchResult; import com.android.settings.search2.DatabaseResultLoader; diff --git a/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java b/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java index e35eb10cbb6..63ff328984f 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/search2/CursorToSearchResultConverterTest.java b/tests/robotests/src/com/android/settings/search2/CursorToSearchResultConverterTest.java index ab55605b106..4098f1b6d44 100644 --- a/tests/robotests/src/com/android/settings/search2/CursorToSearchResultConverterTest.java +++ b/tests/robotests/src/com/android/settings/search2/CursorToSearchResultConverterTest.java @@ -26,7 +26,7 @@ import android.util.ArrayMap; 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.SubSettings; import com.android.settings.TestConfig; import com.android.settings.dashboard.SiteMapManager; diff --git a/tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java b/tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java index 6844be589b3..f2adb190db2 100644 --- a/tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java +++ b/tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java @@ -34,7 +34,7 @@ import android.os.Build; 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.search.IndexDatabaseHelper; import com.android.settings.search.IndexingCallback; diff --git a/tests/robotests/src/com/android/settings/search2/DatabaseResultLoaderTest.java b/tests/robotests/src/com/android/settings/search2/DatabaseResultLoaderTest.java index 862db32add1..bd4d39c75b1 100644 --- a/tests/robotests/src/com/android/settings/search2/DatabaseResultLoaderTest.java +++ b/tests/robotests/src/com/android/settings/search2/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.search.IndexDatabaseHelper; diff --git a/tests/robotests/src/com/android/settings/search2/InstalledAppResultLoaderTest.java b/tests/robotests/src/com/android/settings/search2/InstalledAppResultLoaderTest.java index e808946799e..c4921ccf9cd 100644 --- a/tests/robotests/src/com/android/settings/search2/InstalledAppResultLoaderTest.java +++ b/tests/robotests/src/com/android/settings/search2/InstalledAppResultLoaderTest.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.applications.PackageManagerWrapper; import com.android.settings.dashboard.SiteMapManager; diff --git a/tests/robotests/src/com/android/settings/search2/SavedQueryLoaderTest.java b/tests/robotests/src/com/android/settings/search2/SavedQueryLoaderTest.java index 5209ed98082..adf43e43da9 100644 --- a/tests/robotests/src/com/android/settings/search2/SavedQueryLoaderTest.java +++ b/tests/robotests/src/com/android/settings/search2/SavedQueryLoaderTest.java @@ -21,7 +21,7 @@ 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.testutils.DatabaseTestUtils; diff --git a/tests/robotests/src/com/android/settings/search2/SavedQueryPayloadTest.java b/tests/robotests/src/com/android/settings/search2/SavedQueryPayloadTest.java index daa6d5ecc08..b173d429451 100644 --- a/tests/robotests/src/com/android/settings/search2/SavedQueryPayloadTest.java +++ b/tests/robotests/src/com/android/settings/search2/SavedQueryPayloadTest.java @@ -17,7 +17,7 @@ package com.android.settings.search2; -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/search2/SavedQueryRecorderAndRemoverTest.java b/tests/robotests/src/com/android/settings/search2/SavedQueryRecorderAndRemoverTest.java index ae782790bc1..7f0ffe72ebf 100644 --- a/tests/robotests/src/com/android/settings/search2/SavedQueryRecorderAndRemoverTest.java +++ b/tests/robotests/src/com/android/settings/search2/SavedQueryRecorderAndRemoverTest.java @@ -19,7 +19,7 @@ package com.android.settings.search2; 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/search2/SavedQueryViewHolderTest.java b/tests/robotests/src/com/android/settings/search2/SavedQueryViewHolderTest.java index 57776093083..1546ff370c6 100644 --- a/tests/robotests/src/com/android/settings/search2/SavedQueryViewHolderTest.java +++ b/tests/robotests/src/com/android/settings/search2/SavedQueryViewHolderTest.java @@ -21,7 +21,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/search2/SearchFragmentTest.java b/tests/robotests/src/com/android/settings/search2/SearchFragmentTest.java index 2e91ec66f8e..d01d677ac6c 100644 --- a/tests/robotests/src/com/android/settings/search2/SearchFragmentTest.java +++ b/tests/robotests/src/com/android/settings/search2/SearchFragmentTest.java @@ -24,7 +24,7 @@ import android.view.View; 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.search.IndexingCallback; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/search2/SiteMapManagerTest.java b/tests/robotests/src/com/android/settings/search2/SiteMapManagerTest.java index b8ac8feb0e0..7de739fd8d3 100644 --- a/tests/robotests/src/com/android/settings/search2/SiteMapManagerTest.java +++ b/tests/robotests/src/com/android/settings/search2/SiteMapManagerTest.java @@ -22,7 +22,7 @@ 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; 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 ad035bd2b32..3246667911a 100644 --- a/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java +++ b/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java @@ -22,7 +22,7 @@ import static com.google.common.truth.Truth.assertThat; 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 java.util.ArrayList; import java.util.List; 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/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 98% rename from tests/robotests/src/com/android/settings/SettingsRobolectricTestRunner.java rename to tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java index a991e7af829..d22f2903725 100644 --- a/tests/robotests/src/com/android/settings/SettingsRobolectricTestRunner.java +++ b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java @@ -13,11 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.settings; +package com.android.settings.testutils; + +import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT; +import static org.robolectric.Robolectric.getShadowsAdapter; import android.app.Fragment; import android.content.Intent; +import com.android.settings.SettingsActivity; + import org.junit.runners.model.InitializationError; import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; @@ -29,9 +34,6 @@ import org.robolectric.util.ReflectionHelpers; import java.util.List; -import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT; -import static org.robolectric.Robolectric.getShadowsAdapter; - /** * 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. 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 655f35428bc..cd40dbc98e0 100644 --- a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java +++ b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java @@ -40,7 +40,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/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/FooterPreferenceMixinTest.java b/tests/robotests/src/com/android/settings/widget/FooterPreferenceMixinTest.java index 21ebb253ad2..058f16ceeee 100644 --- a/tests/robotests/src/com/android/settings/widget/FooterPreferenceMixinTest.java +++ b/tests/robotests/src/com/android/settings/widget/FooterPreferenceMixinTest.java @@ -20,7 +20,7 @@ import android.support.v14.preference.PreferenceFragment; 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.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/widget/FooterPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/FooterPreferenceTest.java index 885ac689cd3..b944fe018d0 100644 --- a/tests/robotests/src/com/android/settings/widget/FooterPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/FooterPreferenceTest.java @@ -23,7 +23,7 @@ import android.view.LayoutInflater; 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/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 e6d00b38ee3..98e5d607f79 100644 --- a/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java +++ b/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java @@ -27,7 +27,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.applications.defaultapps.DefaultAppPickerFragment; 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/SummaryUpdaterTest.java b/tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java index e57d25a91e8..c750573b04a 100644 --- a/tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java @@ -18,8 +18,7 @@ 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; 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 75b304e5721..eb6b8b71170 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.settings.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 5b550061362..6bd0d2980c5 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.settings.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 2e577810114..e7027b09d57 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 40c480ff2e3..4ce4038c911 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.settings.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..6148fd29ff1 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; 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 61981c45fae..84942bfc294 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.core.lifecycle.Lifecycle; import com.android.settings.testutils.shadow.SettingsShadowResources; diff --git a/tests/robotests/src/com/android/settings/wifi/WpsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WpsPreferenceControllerTest.java index ac0861efe2a..e6a7b8c5283 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.settings.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 5c1b103ba08..b731054e8b4 100644 --- a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java @@ -54,7 +54,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; @@ -76,7 +76,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/WifiP2PPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java index 06caadf87e5..ae4c2467191 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.settings.core.lifecycle.Lifecycle;