From f7fed3c20b67de91de1b4db32a6ae9b7897a5746 Mon Sep 17 00:00:00 2001 From: Jordan Demeulenaere Date: Thu, 28 Jul 2022 18:06:49 +0200 Subject: [PATCH] Move SystemUI test utils to SystemUI/tests/utils/ (1/2) This CL moves all the SystemUI-test-utils files to a separate SystemUI/tests/utils/ directory. This paves the way towards making this filegroup a reusable library instead. The files have been move using a small bash script [1]. [1] https://paste.googleplex.com/5565628199993344 Bug: 240431193 Test: m SystemUI-tests SystemUIGoogleTests SystemUIGoogleScreenshotTests ArcSystemUI-test Change-Id: I43ff578be211f1ef3f9c5bffd5c65771ef1492dc --- packages/SystemUI/Android.bp | 26 ++++------------ .../SystemUI/tests/utils/AndroidManifest.xml | 23 ++++++++++++++ .../systemui/SysuiBaseFragmentTest.java | 0 .../com/android/systemui/SysuiTestCase.java | 0 .../systemui/SysuiTestableContext.java | 0 .../android/systemui/TestableDependency.java | 0 .../broadcast/FakeBroadcastDispatcher.kt | 0 .../classifier/FalsingManagerFake.java | 0 .../people/FakePeopleTileRepository.kt | 30 +++++++++++++++++++ .../people/FakePeopleWidgetRepository.kt | 29 ++++++++++++++++++ .../FakeScrollCaptureConnection.java | 0 .../systemui/screenshot/FakeSession.java | 0 .../systemui/statusbar/RankingBuilder.java | 0 .../systemui/statusbar/SbnBuilder.java | 0 .../collection/NotificationEntryBuilder.java | 0 .../policy/FakeConfigurationController.kt | 0 .../systemui/util/DeviceConfigProxyFake.java | 0 .../util/concurrency/FakeExecutor.java | 0 .../concurrency/FakeRepeatableExecutor.java | 0 .../util/concurrency/FakeThreadFactory.java | 0 .../util/condition/FakeCondition.java | 0 .../util/io/FakeBasicFileAttributes.java | 0 .../util/sensors/FakeProximitySensor.java | 0 .../util/sensors/FakeSensorManager.java | 0 .../util/sensors/FakeThresholdSensor.java | 0 .../systemui/util/settings/FakeSettings.java | 0 .../systemui/util/time/FakeSystemClock.java | 0 .../systemui/util/wakelock/WakeLockFake.java | 0 .../systemui/utils/leaks/BaseLeakChecker.java | 0 .../utils/leaks/FakeBatteryController.java | 0 .../utils/leaks/FakeBluetoothController.java | 0 .../utils/leaks/FakeCastController.java | 0 .../leaks/FakeConfigurationController.java | 0 .../utils/leaks/FakeDataSaverController.java | 0 .../utils/leaks/FakeExtensionController.java | 0 .../utils/leaks/FakeFlashlightController.java | 0 .../utils/leaks/FakeHotspotController.java | 0 .../leaks/FakeKeyguardStateController.java | 0 .../utils/leaks/FakeLocationController.java | 0 .../leaks/FakeManagedProfileController.java | 0 .../utils/leaks/FakeNetworkController.java | 0 .../utils/leaks/FakeNextAlarmController.java | 0 .../utils/leaks/FakePluginManager.java | 0 .../leaks/FakeRotationLockController.java | 0 .../utils/leaks/FakeSecurityController.java | 0 .../leaks/FakeStatusBarIconController.java | 0 .../utils/leaks/FakeTunerService.java | 0 .../utils/leaks/FakeUserInfoController.java | 0 .../utils/leaks/FakeZenModeController.java | 0 .../systemui/utils/leaks/LeakCheckedTest.java | 0 .../systemui/utils/os/FakeHandler.java | 0 51 files changed, 88 insertions(+), 20 deletions(-) create mode 100644 packages/SystemUI/tests/utils/AndroidManifest.xml rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/SysuiBaseFragmentTest.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/SysuiTestCase.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/SysuiTestableContext.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/TestableDependency.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/broadcast/FakeBroadcastDispatcher.kt (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/classifier/FalsingManagerFake.java (100%) create mode 100644 packages/SystemUI/tests/utils/src/com/android/systemui/people/FakePeopleTileRepository.kt create mode 100644 packages/SystemUI/tests/utils/src/com/android/systemui/people/FakePeopleWidgetRepository.kt rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/screenshot/FakeScrollCaptureConnection.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/screenshot/FakeSession.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/statusbar/RankingBuilder.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/statusbar/SbnBuilder.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/statusbar/notification/collection/NotificationEntryBuilder.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/statusbar/policy/FakeConfigurationController.kt (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/util/DeviceConfigProxyFake.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/util/concurrency/FakeExecutor.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/util/concurrency/FakeRepeatableExecutor.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/util/concurrency/FakeThreadFactory.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/util/condition/FakeCondition.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/util/io/FakeBasicFileAttributes.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/util/sensors/FakeProximitySensor.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/util/sensors/FakeSensorManager.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/util/sensors/FakeThresholdSensor.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/util/settings/FakeSettings.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/util/time/FakeSystemClock.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/util/wakelock/WakeLockFake.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/utils/leaks/BaseLeakChecker.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/utils/leaks/FakeBatteryController.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/utils/leaks/FakeBluetoothController.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/utils/leaks/FakeCastController.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/utils/leaks/FakeConfigurationController.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/utils/leaks/FakeDataSaverController.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/utils/leaks/FakeExtensionController.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/utils/leaks/FakeFlashlightController.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/utils/leaks/FakeHotspotController.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/utils/leaks/FakeKeyguardStateController.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/utils/leaks/FakeLocationController.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/utils/leaks/FakeManagedProfileController.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/utils/leaks/FakeNetworkController.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/utils/leaks/FakeNextAlarmController.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/utils/leaks/FakePluginManager.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/utils/leaks/FakeRotationLockController.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/utils/leaks/FakeSecurityController.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/utils/leaks/FakeStatusBarIconController.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/utils/leaks/FakeTunerService.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/utils/leaks/FakeUserInfoController.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/utils/leaks/FakeZenModeController.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/utils/leaks/LeakCheckedTest.java (100%) rename packages/SystemUI/tests/{ => utils}/src/com/android/systemui/utils/os/FakeHandler.java (100%) diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp index ffd6b522e3943..9a261bf0da557 100644 --- a/packages/SystemUI/Android.bp +++ b/packages/SystemUI/Android.bp @@ -145,25 +145,10 @@ filegroup { filegroup { name: "SystemUI-tests-utils", srcs: [ - "tests/src/com/android/systemui/SysuiBaseFragmentTest.java", - "tests/src/com/android/systemui/SysuiTestCase.java", - "tests/src/com/android/systemui/TestableDependency.java", - "tests/src/com/android/systemui/classifier/FalsingManagerFake.java", - "tests/src/com/android/systemui/statusbar/notification/collection/NotificationEntryBuilder.java", - "tests/src/com/android/systemui/statusbar/RankingBuilder.java", - "tests/src/com/android/systemui/statusbar/SbnBuilder.java", - "tests/src/com/android/systemui/SysuiTestableContext.java", - "tests/src/com/android/systemui/util/**/*Fake.java", - "tests/src/com/android/systemui/utils/leaks/BaseLeakChecker.java", - "tests/src/com/android/systemui/utils/leaks/LeakCheckedTest.java", - "tests/src/com/android/systemui/**/Fake*.java", - "tests/src/com/android/systemui/**/Fake*.kt", + "tests/utils/src/**/*.java", + "tests/utils/src/**/*.kt", ], - exclude_srcs: [ - "tests/src/com/android/systemui/**/*Test.java", - "tests/src/com/android/systemui/**/*Test.kt", - ], - path: "tests/src", + path: "tests/utils/src", } java_library { @@ -171,8 +156,8 @@ java_library { srcs: [ "src/com/android/systemui/util/concurrency/DelayableExecutor.java", "src/com/android/systemui/util/time/SystemClock.java", - "tests/src/com/android/systemui/util/concurrency/FakeExecutor.java", - "tests/src/com/android/systemui/util/time/FakeSystemClock.java", + "tests/utils/src/com/android/systemui/util/concurrency/FakeExecutor.java", + "tests/utils/src/com/android/systemui/util/time/FakeSystemClock.java", ], jarjar_rules: ":jarjar-rules-shared", } @@ -195,6 +180,7 @@ android_library { "src/**/*.java", "src/**/I*.aidl", ":ReleaseJavaFiles", + ":SystemUI-tests-utils", ], static_libs: [ "WifiTrackerLib", diff --git a/packages/SystemUI/tests/utils/AndroidManifest.xml b/packages/SystemUI/tests/utils/AndroidManifest.xml new file mode 100644 index 0000000000000..cbef5f6036ab0 --- /dev/null +++ b/packages/SystemUI/tests/utils/AndroidManifest.xml @@ -0,0 +1,23 @@ + + + + + + + + diff --git a/packages/SystemUI/tests/src/com/android/systemui/SysuiBaseFragmentTest.java b/packages/SystemUI/tests/utils/src/com/android/systemui/SysuiBaseFragmentTest.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/SysuiBaseFragmentTest.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/SysuiBaseFragmentTest.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/SysuiTestCase.java b/packages/SystemUI/tests/utils/src/com/android/systemui/SysuiTestCase.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/SysuiTestCase.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/SysuiTestCase.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/SysuiTestableContext.java b/packages/SystemUI/tests/utils/src/com/android/systemui/SysuiTestableContext.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/SysuiTestableContext.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/SysuiTestableContext.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/TestableDependency.java b/packages/SystemUI/tests/utils/src/com/android/systemui/TestableDependency.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/TestableDependency.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/TestableDependency.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/broadcast/FakeBroadcastDispatcher.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/broadcast/FakeBroadcastDispatcher.kt similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/broadcast/FakeBroadcastDispatcher.kt rename to packages/SystemUI/tests/utils/src/com/android/systemui/broadcast/FakeBroadcastDispatcher.kt diff --git a/packages/SystemUI/tests/src/com/android/systemui/classifier/FalsingManagerFake.java b/packages/SystemUI/tests/utils/src/com/android/systemui/classifier/FalsingManagerFake.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/classifier/FalsingManagerFake.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/classifier/FalsingManagerFake.java diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/people/FakePeopleTileRepository.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/people/FakePeopleTileRepository.kt new file mode 100644 index 0000000000000..0bde5d21d32f9 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/people/FakePeopleTileRepository.kt @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.people + +import com.android.systemui.people.data.model.PeopleTileModel +import com.android.systemui.people.data.repository.PeopleTileRepository + +/** A fake [PeopleTileRepository] to be used in tests. */ +class FakePeopleTileRepository( + private val priorityTiles: List, + private val recentTiles: List, +) : PeopleTileRepository { + override fun priorityTiles(): List = priorityTiles + + override fun recentTiles(): List = recentTiles +} diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/people/FakePeopleWidgetRepository.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/people/FakePeopleWidgetRepository.kt new file mode 100644 index 0000000000000..2f814091f3e54 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/people/FakePeopleWidgetRepository.kt @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.people + +import com.android.systemui.people.data.repository.PeopleWidgetRepository +import com.android.systemui.people.widget.PeopleTileKey + +/** A fake [PeopleWidgetRepository] to be used in tests. */ +class FakePeopleWidgetRepository( + private val onSetWidgetTile: (widgetId: Int, tileKey: PeopleTileKey) -> Unit = { _, _ -> }, +) : PeopleWidgetRepository { + override fun setWidgetTile(widgetId: Int, tileKey: PeopleTileKey) { + onSetWidgetTile(widgetId, tileKey) + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/screenshot/FakeScrollCaptureConnection.java b/packages/SystemUI/tests/utils/src/com/android/systemui/screenshot/FakeScrollCaptureConnection.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/screenshot/FakeScrollCaptureConnection.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/screenshot/FakeScrollCaptureConnection.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/screenshot/FakeSession.java b/packages/SystemUI/tests/utils/src/com/android/systemui/screenshot/FakeSession.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/screenshot/FakeSession.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/screenshot/FakeSession.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/RankingBuilder.java b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/RankingBuilder.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/statusbar/RankingBuilder.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/RankingBuilder.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/SbnBuilder.java b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/SbnBuilder.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/statusbar/SbnBuilder.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/SbnBuilder.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotificationEntryBuilder.java b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/collection/NotificationEntryBuilder.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotificationEntryBuilder.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/collection/NotificationEntryBuilder.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/FakeConfigurationController.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/policy/FakeConfigurationController.kt similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/FakeConfigurationController.kt rename to packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/policy/FakeConfigurationController.kt diff --git a/packages/SystemUI/tests/src/com/android/systemui/util/DeviceConfigProxyFake.java b/packages/SystemUI/tests/utils/src/com/android/systemui/util/DeviceConfigProxyFake.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/util/DeviceConfigProxyFake.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/util/DeviceConfigProxyFake.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/util/concurrency/FakeExecutor.java b/packages/SystemUI/tests/utils/src/com/android/systemui/util/concurrency/FakeExecutor.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/util/concurrency/FakeExecutor.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/util/concurrency/FakeExecutor.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/util/concurrency/FakeRepeatableExecutor.java b/packages/SystemUI/tests/utils/src/com/android/systemui/util/concurrency/FakeRepeatableExecutor.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/util/concurrency/FakeRepeatableExecutor.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/util/concurrency/FakeRepeatableExecutor.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/util/concurrency/FakeThreadFactory.java b/packages/SystemUI/tests/utils/src/com/android/systemui/util/concurrency/FakeThreadFactory.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/util/concurrency/FakeThreadFactory.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/util/concurrency/FakeThreadFactory.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/util/condition/FakeCondition.java b/packages/SystemUI/tests/utils/src/com/android/systemui/util/condition/FakeCondition.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/util/condition/FakeCondition.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/util/condition/FakeCondition.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/util/io/FakeBasicFileAttributes.java b/packages/SystemUI/tests/utils/src/com/android/systemui/util/io/FakeBasicFileAttributes.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/util/io/FakeBasicFileAttributes.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/util/io/FakeBasicFileAttributes.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/util/sensors/FakeProximitySensor.java b/packages/SystemUI/tests/utils/src/com/android/systemui/util/sensors/FakeProximitySensor.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/util/sensors/FakeProximitySensor.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/util/sensors/FakeProximitySensor.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/util/sensors/FakeSensorManager.java b/packages/SystemUI/tests/utils/src/com/android/systemui/util/sensors/FakeSensorManager.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/util/sensors/FakeSensorManager.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/util/sensors/FakeSensorManager.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/util/sensors/FakeThresholdSensor.java b/packages/SystemUI/tests/utils/src/com/android/systemui/util/sensors/FakeThresholdSensor.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/util/sensors/FakeThresholdSensor.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/util/sensors/FakeThresholdSensor.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/util/settings/FakeSettings.java b/packages/SystemUI/tests/utils/src/com/android/systemui/util/settings/FakeSettings.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/util/settings/FakeSettings.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/util/settings/FakeSettings.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/util/time/FakeSystemClock.java b/packages/SystemUI/tests/utils/src/com/android/systemui/util/time/FakeSystemClock.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/util/time/FakeSystemClock.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/util/time/FakeSystemClock.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/util/wakelock/WakeLockFake.java b/packages/SystemUI/tests/utils/src/com/android/systemui/util/wakelock/WakeLockFake.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/util/wakelock/WakeLockFake.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/util/wakelock/WakeLockFake.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/BaseLeakChecker.java b/packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/BaseLeakChecker.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/utils/leaks/BaseLeakChecker.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/BaseLeakChecker.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeBatteryController.java b/packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeBatteryController.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeBatteryController.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeBatteryController.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeBluetoothController.java b/packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeBluetoothController.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeBluetoothController.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeBluetoothController.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeCastController.java b/packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeCastController.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeCastController.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeCastController.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeConfigurationController.java b/packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeConfigurationController.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeConfigurationController.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeConfigurationController.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeDataSaverController.java b/packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeDataSaverController.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeDataSaverController.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeDataSaverController.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeExtensionController.java b/packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeExtensionController.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeExtensionController.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeExtensionController.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeFlashlightController.java b/packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeFlashlightController.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeFlashlightController.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeFlashlightController.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeHotspotController.java b/packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeHotspotController.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeHotspotController.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeHotspotController.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeKeyguardStateController.java b/packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeKeyguardStateController.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeKeyguardStateController.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeKeyguardStateController.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeLocationController.java b/packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeLocationController.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeLocationController.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeLocationController.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeManagedProfileController.java b/packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeManagedProfileController.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeManagedProfileController.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeManagedProfileController.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeNetworkController.java b/packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeNetworkController.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeNetworkController.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeNetworkController.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeNextAlarmController.java b/packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeNextAlarmController.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeNextAlarmController.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeNextAlarmController.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakePluginManager.java b/packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakePluginManager.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakePluginManager.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakePluginManager.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeRotationLockController.java b/packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeRotationLockController.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeRotationLockController.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeRotationLockController.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeSecurityController.java b/packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeSecurityController.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeSecurityController.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeSecurityController.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeStatusBarIconController.java b/packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeStatusBarIconController.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeStatusBarIconController.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeStatusBarIconController.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeTunerService.java b/packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeTunerService.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeTunerService.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeTunerService.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeUserInfoController.java b/packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeUserInfoController.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeUserInfoController.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeUserInfoController.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeZenModeController.java b/packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeZenModeController.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeZenModeController.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeZenModeController.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/LeakCheckedTest.java b/packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/LeakCheckedTest.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/utils/leaks/LeakCheckedTest.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/LeakCheckedTest.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/utils/os/FakeHandler.java b/packages/SystemUI/tests/utils/src/com/android/systemui/utils/os/FakeHandler.java similarity index 100% rename from packages/SystemUI/tests/src/com/android/systemui/utils/os/FakeHandler.java rename to packages/SystemUI/tests/utils/src/com/android/systemui/utils/os/FakeHandler.java