From 8091d9e6d9591af206bd2674b402d02a8ce52761 Mon Sep 17 00:00:00 2001 From: Brett Chabot Date: Tue, 26 Feb 2019 14:52:33 -0800 Subject: [PATCH] Migrate frameworks/base/tests/testables and its users to androidx.test See go/jetpack-test-android-migration Test: atest TestablesTests NetworkStackTests FrameworksServicesTests SystemUITests FrameworksUiServicesTests ExtServicesUnitTests Exempt-From-Owner-Approval: already reviewed Change-Id: I083fcdaa71b503535aa2b3c257740f3ecf055373 Merged-In: Ib04d80954bd8536914d88c66b28e6632e60a6245 --- packages/ExtServices/tests/Android.mk | 4 +- .../ExtServices/tests/AndroidManifest.xml | 2 +- packages/ExtServices/tests/AndroidTest.xml | 2 +- .../services/notification/AssistantTest.java | 7 ++- packages/NetworkStack/tests/Android.bp | 2 +- .../NetworkStack/tests/AndroidManifest.xml | 2 +- packages/NetworkStack/tests/AndroidTest.xml | 2 +- .../tests/src/android/net/apf/ApfTest.java | 7 +-- .../net/dhcp/DhcpLeaseRepositoryTest.java | 9 ++-- .../src/android/net/dhcp/DhcpPacketTest.java | 7 +-- .../src/android/net/dhcp/DhcpServerTest.java | 3 +- .../net/dhcp/DhcpServingParamsTest.java | 5 +- .../src/android/net/ip/IpClientTest.java | 5 +- .../net/ip/IpReachabilityMonitorTest.java | 6 +-- .../util/ConnectivityPacketSummaryTest.java | 5 +- .../android/net/util/PacketReaderTest.java | 5 +- .../connectivity/NetworkMonitorTest.java | 6 +-- .../android/server/util/SharedLogTest.java | 5 +- packages/SystemUI/shared/tests/Android.mk | 2 +- .../shared/SysuiSharedLibTestCase.java | 3 +- .../model/HighResThumbnailLoaderTest.java | 6 +-- packages/SystemUI/tests/Android.mk | 3 +- ...VerifySysuiRequiredTestPropertiesTest.java | 14 +++--- ...eyguardClockAccessibilityDelegateTest.java | 3 +- .../KeyguardPinBasedInputViewTest.java | 3 +- .../KeyguardSecurityContainerTest.java | 13 +++-- .../systemui/BatteryMeterDrawableTest.java | 7 +-- .../com/android/systemui/DependencyTest.java | 3 +- .../android/systemui/ExpandHelperTest.java | 15 +++--- .../ForegroundServiceControllerTest.java | 5 +- .../systemui/ScreenDecorationsTest.java | 5 +- .../SliceBroadcastRelayHandlerTest.java | 3 +- .../systemui/SysuiBaseFragmentTest.java | 3 +- .../com/android/systemui/SysuiTestCase.java | 3 +- .../SysuiColorExtractorTests.java | 5 +- .../doze/AlwaysOnDisplayPolicyTest.java | 5 +- .../systemui/doze/DozeConfigurationTest.java | 5 +- .../systemui/doze/DozeMachineTest.java | 9 ++-- .../doze/DozeScreenBrightnessTest.java | 7 ++- .../DozeScreenStatePreventingAdapterTest.java | 3 +- .../systemui/doze/DozeScreenStateTest.java | 9 ++-- ...spendScreenStatePreventingAdapterTest.java | 3 +- .../systemui/doze/DozeTriggersTest.java | 5 +- .../com/android/systemui/doze/DozeUiTest.java | 11 ++--- .../systemui/doze/DozeWallpaperStateTest.java | 5 +- .../keyguard/DismissCallbackRegistryTest.java | 5 +- .../keyguard/KeyguardSliceProviderTest.java | 20 +++----- .../systemui/keyguard/LifecycleTest.java | 3 +- .../keyguard/ScreenLifecycleTest.java | 3 +- .../keyguard/WakefulnessLifecycleTest.java | 3 +- .../WorkLockActivityControllerTest.java | 11 +++-- .../keyguard/WorkLockActivityTest.java | 7 +-- .../systemui/pip/phone/PipTouchStateTest.java | 3 +- .../plugins/PluginInstanceManagerTest.java | 32 ++++++------ .../systemui/plugins/PluginManagerTest.java | 5 +- .../systemui/plugins/VersionInfoTest.java | 4 +- .../power/PowerNotificationWarningsTest.java | 7 +-- .../systemui/qs/AutoAddTrackerTest.java | 3 +- .../com/android/systemui/qs/QSDetailTest.java | 3 +- .../android/systemui/qs/QSFooterImplTest.java | 3 +- .../android/systemui/qs/QSFragmentTest.java | 24 ++++----- .../com/android/systemui/qs/QSPanelTest.java | 3 +- .../systemui/qs/SlashImageViewTest.java | 27 +++++----- .../android/systemui/qs/TileLayoutTest.java | 4 +- .../systemui/qs/TouchAnimatorTest.java | 19 ++++--- .../systemui/qs/car/CarQsFragmentTest.java | 3 +- .../qs/customize/TileAdapterTest.java | 3 +- .../qs/customize/TileQueryHelperTest.java | 6 +-- .../qs/external/TileColorPickerTest.java | 11 +++-- .../qs/external/TileLifecycleManagerTest.java | 3 +- .../qs/external/TileServiceManagerTest.java | 13 +++-- .../qs/tileimpl/QSIconViewImplTest.java | 5 +- .../systemui/qs/tileimpl/QSTileImplTest.java | 8 +-- .../android/systemui/recents/RecentsTest.java | 5 +- .../settings/CurrentUserTrackerTest.java | 3 +- .../statusbar/AppOpsListenerTest.java | 3 +- .../systemui/statusbar/CommandQueueTest.java | 3 +- .../ExpandableNotificationRowTest.java | 3 +- .../systemui/statusbar/FooterViewTest.java | 11 ++--- .../KeyguardIndicationControllerTest.java | 7 +-- .../statusbar/NonPhoneDependencyTest.java | 3 +- ...NotificationBlockingHelperManagerTest.java | 35 +++++++------ .../NotificationContentViewTest.java | 7 +-- .../NotificationCustomViewWrapperTest.java | 3 +- .../statusbar/NotificationDataTest.java | 5 +- .../NotificationEntryManagerTest.java | 4 +- .../NotificationGutsManagerTest.java | 14 +++--- .../statusbar/NotificationListenerTest.java | 8 +-- ...NotificationLockscreenUserManagerTest.java | 3 +- .../statusbar/NotificationLoggerTest.java | 3 +- .../statusbar/NotificationMenuRowTest.java | 5 +- .../NotificationRemoteInputManagerTest.java | 3 +- .../statusbar/NotificationTestHelper.java | 3 +- .../NotificationViewHierarchyManagerTest.java | 3 +- .../systemui/statusbar/ScrimViewTest.java | 3 +- .../statusbar/SmartReplyControllerTest.java | 4 +- .../statusbar/StatusBarIconListTest.java | 9 ++-- .../statusbar/StatusBarIconViewTest.java | 5 +- .../notification/AboveShelfObserverTest.java | 1 - .../MediaNotificationProcessorTest.java | 3 +- .../NotificationInflaterTest.java | 3 +- .../NotificationViewWrapperTest.java | 6 +-- .../VisualStabilityManagerTest.java | 16 +++--- .../statusbar/phone/AutoTileManagerTest.java | 8 +-- .../phone/CollapsedStatusBarFragmentTest.java | 10 ++-- .../statusbar/phone/DozeParametersTest.java | 24 +++++---- .../phone/DozeScrimControllerTest.java | 4 +- .../HeadsUpAppearanceControllerTest.java | 11 +---- .../phone/HeadsUpManagerPhoneTest.java | 25 +++++----- .../statusbar/phone/KeyguardBouncerTest.java | 3 +- .../phone/KeyguardPresentationTest.java | 5 +- .../phone/NavigationBarFragmentTest.java | 9 ++-- .../phone/NavigationBarTransitionsTest.java | 3 +- .../phone/NearestTouchFrameTest.java | 4 +- .../statusbar/phone/ScrimControllerTest.java | 3 +- .../phone/StatusBarIconControllerTest.java | 16 +++--- .../StatusBarKeyguardViewManagerTest.java | 3 +- .../statusbar/phone/StatusBarTest.java | 11 ++--- .../phone/StatusBarWindowViewTest.java | 11 ++--- .../statusbar/phone/SystemUIDialogTest.java | 5 +- .../policy/BluetoothControllerImplTest.java | 6 +-- .../statusbar/policy/CallbackHandlerTest.java | 20 +++++--- .../policy/ExtensionControllerImplTest.java | 3 +- .../statusbar/policy/IconLoggerImplTest.java | 5 +- .../statusbar/policy/KeyButtonViewTest.java | 3 +- .../policy/LocationControllerImplTest.java | 3 +- .../policy/NetworkControllerEthernetTest.java | 5 +- .../policy/NetworkControllerSignalTest.java | 12 ++--- .../RemoteInputQuickSettingsDisablerTest.java | 6 +-- .../statusbar/policy/RemoteInputViewTest.java | 3 +- .../policy/SecurityControllerTest.java | 22 ++++----- .../statusbar/policy/SmartReplyViewTest.java | 7 +-- .../policy/ZenModeControllerImplTest.java | 3 +- .../NotificationChildrenContainerTest.java | 4 +- .../NotificationRoundnessManagerTest.java | 3 +- .../NotificationStackScrollLayoutTest.java | 6 +-- .../systemui/tuner/TunablePaddingTest.java | 4 +- .../systemui/util/AsyncSensorManagerTest.java | 3 +- .../android/systemui/util/ChannelsTest.java | 8 ++- .../util/leak/GarbageMonitorTest.java | 3 +- .../systemui/util/leak/LeakDetectorTest.java | 6 +-- .../systemui/util/leak/LeakReporterTest.java | 5 +- .../util/leak/ReferenceTestUtilsTest.java | 4 +- .../util/leak/WeakIdentityHashMapTest.java | 4 +- .../KeepAwakeAnimationListenerTest.java | 3 +- .../util/wakelock/SettableWakeLockTest.java | 4 +- .../systemui/util/wakelock/WakeLockTest.java | 7 ++- .../com/android/systemui/volume/UtilTest.java | 3 +- .../VolumeDialogControllerImplTest.java | 4 +- .../systemui/volume/VolumeDialogImplTest.java | 18 +------ services/tests/servicestests/Android.bp | 4 +- .../tests/servicestests/AndroidManifest.xml | 2 +- services/tests/servicestests/AndroidTest.xml | 2 +- .../server/AlarmManagerServiceTest.java | 5 +- .../com/android/server/AppOpsUpgradeTest.java | 7 +-- .../android/server/BatteryServiceTest.java | 19 +++---- .../server/BootReceiverFixFsckFsStatTest.java | 6 +-- .../server/GestureLauncherServiceTest.java | 14 +++--- .../server/NetworkManagementInternalTest.java | 7 +-- .../NetworkPolicyManagerServiceTest.java | 11 +++-- .../server/NetworkScoreServiceTest.java | 10 ++-- .../server/NetworkScorerAppManagerTest.java | 5 +- .../server/WatchdogDiagnosticsTest.java | 8 +-- .../AccessibilityManagerTest.java | 6 ++- .../accessibility/KeyEventDispatcherTest.java | 14 +++--- .../KeyboardInterceptorTest.java | 18 +++---- .../MagnificationControllerTest.java | 5 +- .../MagnificationGestureHandlerTest.java | 6 +-- .../MotionEventInjectorTest.java | 15 +++--- .../accounts/AccountManagerServiceTest.java | 9 ++-- .../server/accounts/AccountsDbTest.java | 7 +-- .../am/ActivityLaunchParamsModifierTests.java | 29 +++++------ .../am/ActivityManagerInternalTest.java | 7 +-- .../server/am/ActivityManagerServiceTest.java | 12 +++-- .../server/am/ActivityRecordTests.java | 12 ++--- .../am/ActivityStackSupervisorTests.java | 5 +- .../android/server/am/ActivityStackTests.java | 11 ++--- .../am/ActivityStartControllerTests.java | 25 +++++----- .../am/ActivityStartInterceptorTest.java | 3 +- .../server/am/ActivityStarterTests.java | 46 ++++++++--------- .../android/server/am/ActivityTestsBase.java | 20 ++++---- .../android/server/am/AppErrorDialogTest.java | 11 +++-- .../server/am/AssistDataRequesterTest.java | 9 ++-- .../am/ClientLifecycleManagerTests.java | 5 +- .../server/am/CoreSettingsObserverTest.java | 10 ++-- .../GlobalSettingsToPropertiesMapperTest.java | 7 +-- .../am/LaunchParamsControllerTests.java | 37 +++++++------- .../server/am/LockTaskControllerTest.java | 5 +- .../android/server/am/MemoryStatUtilTest.java | 6 +-- .../PendingRemoteAnimationRegistryTest.java | 10 ++-- .../android/server/am/RecentTasksTest.java | 16 +++--- .../server/am/RecentsAnimationTest.java | 15 +++--- .../android/server/am/RunningTasksTest.java | 7 +-- .../server/am/SafeActivityOptionsTest.java | 7 +-- .../am/TaskLaunchParamsModifierTests.java | 29 +++++------ .../android/server/am/TaskRecordTests.java | 11 ++--- .../am/TaskStackChangedListenerTest.java | 19 ++++--- .../appops/AppOpsActiveWatcherTest.java | 7 +-- .../server/appops/AppOpsServiceTest.java | 7 +-- .../appwidget/AppWidgetServiceImplTest.java | 3 +- .../backup/BackupPasswordManagerTest.java | 5 +- .../server/backup/DataChangedJournalTest.java | 5 +- .../backup/ProcessedPackagesJournalTest.java | 5 +- .../android/server/backup/TrampolineTest.java | 5 +- .../restore/PerformAdbRestoreTaskTest.java | 7 +-- .../backup/utils/AppBackupUtilsTest.java | 6 +-- .../utils/BackupManagerMonitorUtilsTest.java | 7 +-- .../backup/utils/BackupObserverUtilsTest.java | 5 +- .../backup/utils/DataStreamFileCodecTest.java | 6 ++- .../FullBackupRestoreObserverUtilsTest.java | 5 +- .../backup/utils/FullBackupUtilsTest.java | 6 +-- .../backup/utils/SparseArrayUtilsTest.java | 5 +- .../backup/utils/TarBackupReaderTest.java | 11 ++--- .../DevicePolicyConstantsTest.java | 2 +- .../DevicePolicyManagerServiceTestable.java | 3 +- .../devicepolicy/DevicePolicyManagerTest.java | 2 +- .../server/devicepolicy/DpmMockContext.java | 3 +- .../OverlayPackagesProviderTest.java | 3 +- .../server/devicepolicy/OwnersTest.java | 6 +-- .../devicepolicy/SystemUpdatePolicyTest.java | 6 +-- .../TransferOwnershipMetadataManagerTest.java | 3 +- .../AmbientBrightnessStatsTrackerTest.java | 7 +-- .../BrightnessMappingStrategyTest.java | 6 +-- .../server/display/BrightnessTrackerTest.java | 7 +-- .../display/ColorDisplayServiceTest.java | 19 ++++--- .../display/PersistentDataStoreTest.java | 10 ++-- .../job/BackgroundRestrictionsTest.java | 7 +-- .../com/android/server/job/JobSetTest.java | 7 +-- .../com/android/server/job/JobStoreTest.java | 5 +- .../server/job/controllers/JobStatusTest.java | 3 +- .../LockSettingsShellCommandTest.java | 16 +++--- .../recoverablekeystore/KeySyncTaskTest.java | 9 ++-- .../recoverablekeystore/KeySyncUtilsTest.java | 4 +- .../PlatformKeyManagerTest.java | 7 +-- .../RecoverableKeyGeneratorTest.java | 7 +-- .../RecoverableKeyStoreManagerTest.java | 17 +++---- .../RecoverySnapshotListenersStorageTest.java | 7 +-- .../recoverablekeystore/SecureBoxTest.java | 12 +++-- ...TestOnlyInsecureCertificateHelperTest.java | 6 ++- .../recoverablekeystore/WrappedKeyTest.java | 5 +- .../certificate/CertUtilsTest.java | 16 +++--- .../certificate/CertXmlTest.java | 12 ++--- .../certificate/SigXmlTest.java | 4 +- .../certificate/TestData.java | 3 +- .../KeyChainSnapshotSerializerTest.java | 6 +-- .../RecoverableKeyStoreDbHelperTest.java | 25 +++++----- .../storage/RecoverableKeyStoreDbTest.java | 20 ++++---- .../storage/RecoverySessionStorageTest.java | 4 +- .../storage/RecoverySnapshotStorageTest.java | 7 +-- .../server/net/ConnOnActivityStartTest.java | 16 +++--- .../android/server/net/IpConfigStoreTest.java | 3 +- .../net/watchlist/HarmfulDigestsTests.java | 4 +- .../NetworkWatchlistServiceTests.java | 8 +-- .../net/watchlist/PrivacyUtilsTests.java | 5 +- .../net/watchlist/ReportEncoderTests.java | 13 ++--- .../net/watchlist/WatchlistConfigTests.java | 11 ++--- .../WatchlistLoggingHandlerTests.java | 18 +++---- .../net/watchlist/WatchlistSettingsTests.java | 7 +-- .../com/android/server/pm/InstallerTest.java | 5 +- .../server/pm/PackageManagerServiceTest.java | 3 +- .../pm/PackageManagerSettingsTests.java | 7 +-- .../android/server/pm/PackageParserTest.java | 27 +++++----- .../server/pm/PackageUserStateTest.java | 5 +- .../server/pm/ParallelPackageParserTest.java | 3 +- .../server/pm/ShortcutManagerTest1.java | 2 +- .../server/pm/ShortcutManagerTest10.java | 2 +- .../server/pm/ShortcutManagerTest2.java | 4 +- .../server/pm/ShortcutManagerTest8.java | 2 +- .../server/pm/ShortcutManagerTest9.java | 2 +- .../server/pm/SuspendPackagesTest.java | 7 +-- .../server/pm/UserDataPreparerTest.java | 21 ++++---- .../server/pm/UserLifecycleStressTest.java | 7 +-- .../UserManagerServiceCreateProfileTest.java | 11 +++-- .../pm/UserManagerServiceIdRecyclingTest.java | 17 ++++--- .../pm/UserManagerServiceUserInfoTest.java | 17 ++++--- .../server/pm/UserRestrictionsUtilsTest.java | 2 +- .../server/pm/backup/BackupUtilsTest.java | 12 ++--- .../android/server/pm/dex/DexLoggerTests.java | 21 ++++---- .../server/pm/dex/DexManagerTests.java | 49 +++++++++---------- .../server/pm/dex/DexoptOptionsTests.java | 12 ++--- .../server/pm/dex/DexoptUtilsTest.java | 7 +-- .../server/pm/dex/PackageDexUsageTests.java | 27 +++++----- .../policy/PhoneWindowManagerInsetsTest.java | 7 ++- .../policy/PhoneWindowManagerLayoutTest.java | 6 +-- .../server/policy/PhoneWindowManagerTest.java | 15 +++--- .../policy/PhoneWindowManagerTestBase.java | 4 +- .../BatterySaverStateMachineTest.java | 5 +- .../batterysaver/BatterySavingStatsTest.java | 5 +- .../batterysaver/CpuFrequenciesTest.java | 5 +- .../power/batterysaver/FileUpdaterTest.java | 9 ++-- .../SimpleTimeZoneDetectorStrategyTest.java | 3 +- .../timedetector/TimeDetectorServiceTest.java | 7 +-- .../TimeDetectorStrategyTest.java | 3 +- .../server/timezone/CheckTokenTest.java | 12 ++--- .../timezone/PackageStatusStorageTest.java | 28 ++++++----- .../server/timezone/PackageStatusTest.java | 8 +-- .../server/timezone/PackageTrackerTest.java | 43 ++++++++-------- .../server/timezone/PackageVersionsTest.java | 8 +-- .../usage/AppStandbyControllerTests.java | 9 ++-- .../usage/AppTimeLimitControllerTests.java | 6 +-- .../server/utils/PriorityDumpTest.java | 6 ++- .../wallpaper/WallpaperServiceTests.java | 7 +-- .../webkit/WebViewUpdateServiceTest.java | 11 ++--- .../AnimatingAppWindowTokenRegistryTest.java | 15 ++---- .../android/server/wm/AppTransitionTests.java | 8 +-- .../wm/AppWindowContainerControllerTests.java | 18 ++++--- .../server/wm/AppWindowTokenTests.java | 23 +++++---- .../wm/BoundsAnimationControllerTests.java | 28 +++++------ .../wm/ConfigurationContainerTests.java | 8 +-- .../com/android/server/wm/DimmerTests.java | 3 +- .../server/wm/DisplayContentTests.java | 14 +++--- .../server/wm/DragDropControllerTests.java | 13 +++-- .../server/wm/PinnedStackControllerTest.java | 25 +++++----- .../wm/RecentsAnimationControllerTest.java | 9 +++- .../wm/RemoteAnimationControllerTest.java | 6 +-- .../server/wm/RootWindowContainerTests.java | 12 ++--- .../server/wm/ScreenDecorWindowTests.java | 8 +-- .../server/wm/StackWindowControllerTests.java | 18 +++---- .../server/wm/SurfaceAnimationRunnerTest.java | 10 ++-- .../server/wm/SurfaceAnimatorTest.java | 9 ++-- .../server/wm/TaskPositionerTests.java | 26 +++++----- .../wm/TaskPositioningControllerTests.java | 9 ++-- .../server/wm/TaskSnapshotCacheTest.java | 6 ++- .../server/wm/TaskSnapshotControllerTest.java | 10 ++-- .../wm/TaskSnapshotPersisterLoaderTest.java | 9 ++-- .../wm/TaskSnapshotPersisterTestBase.java | 3 +- .../server/wm/TaskSnapshotSurfaceTest.java | 6 ++- .../server/wm/TaskStackContainersTests.java | 16 +++--- .../com/android/server/wm/TaskStackTests.java | 18 +++---- .../TaskWindowContainerControllerTests.java | 14 +++--- .../UnknownAppVisibilityControllerTest.java | 5 +- .../server/wm/WallpaperControllerTests.java | 5 +- .../server/wm/WindowAnimationSpecTest.java | 5 +- .../server/wm/WindowConfigurationTests.java | 25 +++++----- .../wm/WindowContainerControllerTests.java | 19 +++---- .../server/wm/WindowContainerTests.java | 30 ++++++------ .../wm/WindowContainerTraversalTests.java | 10 ++-- .../android/server/wm/WindowFrameTests.java | 22 +++++---- .../server/wm/WindowManagerServiceRule.java | 3 +- .../wm/WindowManagerServiceRuleTest.java | 5 +- .../android/server/wm/WindowStateTests.java | 28 +++++------ .../server/wm/WindowSurfacePlacerTest.java | 6 ++- .../android/server/wm/WindowTestsBase.java | 41 ++++++++-------- .../android/server/wm/WindowTokenTests.java | 19 +++---- .../android/server/wm/WindowTracingTest.java | 9 ++-- .../com/android/server/wm/ZOrderingTests.java | 8 +-- .../server/wm/utils/InsetUtilsTest.java | 6 +-- .../server/wm/utils/RotationCacheTest.java | 8 ++- .../server/wm/utils/WmDisplayCutoutTest.java | 5 +- .../test-apps/SuspendTestApp/Android.bp | 2 +- services/tests/uiservicestests/Android.bp | 2 +- .../com/android/server/UiServiceTestCase.java | 3 +- .../notification/AlertRateLimiterTest.java | 3 +- .../notification/BadgeExtractorTest.java | 14 +++--- .../notification/BuzzBeepBlinkTest.java | 3 +- .../GlobalSortKeyComparatorTest.java | 6 +-- .../server/notification/GroupHelperTest.java | 17 ++++--- .../notification/ImportanceExtractorTest.java | 35 +++++++------ .../notification/NotificationChannelTest.java | 3 +- .../NotificationComparatorTest.java | 3 +- .../NotificationListenerServiceTest.java | 4 +- .../notification/NotificationRecordTest.java | 6 +-- .../notification/NotificationStatsTest.java | 3 +- .../server/notification/NotificationTest.java | 11 ++--- .../server/notification/NotifyingAppTest.java | 3 +- .../notification/RankingHelperTest.java | 6 +-- .../notification/RateEstimatorTest.java | 14 +++--- .../notification/ScheduleCalendarTest.java | 6 +-- .../ScheduleConditionProviderTest.java | 4 +- .../server/notification/SnoozeHelperTest.java | 35 +++++++------ .../ValidateNotificationPeopleTest.java | 15 +++--- .../slice/PackageMatchingCacheTest.java | 3 +- .../server/slice/PinnedSliceStateTest.java | 3 +- .../slice/SliceClientPermissionsTest.java | 5 +- .../server/slice/SliceFullAccessListTest.java | 3 +- .../server/slice/SliceManagerServiceTest.java | 4 +- .../slice/SlicePermissionManagerTest.java | 3 +- .../slice/SliceProviderPermissionsTest.java | 3 +- tests/testables/Android.bp | 2 +- .../android/testing/AndroidTestingRunner.java | 8 +-- .../src/android/testing/BaseFragmentTest.java | 3 +- .../testing/TestableInstrumentation.java | 3 +- .../src/android/testing/TestableLooper.java | 3 +- .../src/android/testing/ViewUtils.java | 1 - tests/testables/tests/Android.mk | 2 +- tests/testables/tests/AndroidManifest.xml | 2 +- .../DexmakerShareClassLoaderRuleTest.java | 4 +- .../testing/TestableContentResolverTest.java | 5 +- .../testing/TestablePermissionsTest.java | 7 ++- .../testing/TestableResourcesTest.java | 3 +- .../testing/TestableSettingsProviderTest.java | 10 ++-- 391 files changed, 1741 insertions(+), 1645 deletions(-) diff --git a/packages/ExtServices/tests/Android.mk b/packages/ExtServices/tests/Android.mk index 0a95b858a93e0..36e573a3a93b5 100644 --- a/packages/ExtServices/tests/Android.mk +++ b/packages/ExtServices/tests/Android.mk @@ -8,9 +8,9 @@ LOCAL_CERTIFICATE := platform LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-test \ + androidx.test.rules \ mockito-target-minus-junit4 \ - espresso-core \ + androidx.test.espresso.core \ truth-prebuilt \ testables diff --git a/packages/ExtServices/tests/AndroidManifest.xml b/packages/ExtServices/tests/AndroidManifest.xml index ddf725b8cdfe2..42293b5a0b3ee 100644 --- a/packages/ExtServices/tests/AndroidManifest.xml +++ b/packages/ExtServices/tests/AndroidManifest.xml @@ -23,7 +23,7 @@ - diff --git a/packages/ExtServices/tests/AndroidTest.xml b/packages/ExtServices/tests/AndroidTest.xml index c3d32de4bfaf0..cd26ebc407c14 100644 --- a/packages/ExtServices/tests/AndroidTest.xml +++ b/packages/ExtServices/tests/AndroidTest.xml @@ -23,7 +23,7 @@