diff --git a/tests/unit/InstrumentedEntitlementApp/Android.bp b/tests/legacy_unit/InstrumentedEntitlementApp/Android.bp similarity index 100% rename from tests/unit/InstrumentedEntitlementApp/Android.bp rename to tests/legacy_unit/InstrumentedEntitlementApp/Android.bp diff --git a/tests/unit/InstrumentedEntitlementApp/AndroidManifest.xml b/tests/legacy_unit/InstrumentedEntitlementApp/AndroidManifest.xml similarity index 100% rename from tests/unit/InstrumentedEntitlementApp/AndroidManifest.xml rename to tests/legacy_unit/InstrumentedEntitlementApp/AndroidManifest.xml diff --git a/tests/unit/InstrumentedEntitlementApp/src/android/test/entitlement/InstrumentedEntitlementActivity.java b/tests/legacy_unit/InstrumentedEntitlementApp/src/android/test/entitlement/InstrumentedEntitlementActivity.java similarity index 100% rename from tests/unit/InstrumentedEntitlementApp/src/android/test/entitlement/InstrumentedEntitlementActivity.java rename to tests/legacy_unit/InstrumentedEntitlementApp/src/android/test/entitlement/InstrumentedEntitlementActivity.java diff --git a/tests/legacy_unit/README b/tests/legacy_unit/README new file mode 100644 index 00000000000..9e318d7d359 --- /dev/null +++ b/tests/legacy_unit/README @@ -0,0 +1 @@ +Directory for legacy settings unit tests, which are no longer maintained. diff --git a/tests/unit/src/com/android/settings/UserCredentialsTest.java b/tests/legacy_unit/src/com/android/settings/UserCredentialsTest.java similarity index 100% rename from tests/unit/src/com/android/settings/UserCredentialsTest.java rename to tests/legacy_unit/src/com/android/settings/UserCredentialsTest.java diff --git a/tests/unit/src/com/android/settings/UtilsTest.java b/tests/legacy_unit/src/com/android/settings/UtilsTest.java similarity index 100% rename from tests/unit/src/com/android/settings/UtilsTest.java rename to tests/legacy_unit/src/com/android/settings/UtilsTest.java diff --git a/tests/unit/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java b/tests/legacy_unit/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java similarity index 100% rename from tests/unit/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java rename to tests/legacy_unit/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java diff --git a/tests/unit/src/com/android/settings/accounts/AccountsSettingsTest.java b/tests/legacy_unit/src/com/android/settings/accounts/AccountsSettingsTest.java similarity index 100% rename from tests/unit/src/com/android/settings/accounts/AccountsSettingsTest.java rename to tests/legacy_unit/src/com/android/settings/accounts/AccountsSettingsTest.java diff --git a/tests/unit/src/com/android/settings/accounts/Authenticator.java b/tests/legacy_unit/src/com/android/settings/accounts/Authenticator.java similarity index 100% rename from tests/unit/src/com/android/settings/accounts/Authenticator.java rename to tests/legacy_unit/src/com/android/settings/accounts/Authenticator.java diff --git a/tests/unit/src/com/android/settings/accounts/TestAuthService.java b/tests/legacy_unit/src/com/android/settings/accounts/TestAuthService.java similarity index 100% rename from tests/unit/src/com/android/settings/accounts/TestAuthService.java rename to tests/legacy_unit/src/com/android/settings/accounts/TestAuthService.java diff --git a/tests/unit/src/com/android/settings/applications/manageapplications/ManageApplicationsUnitTest.java b/tests/legacy_unit/src/com/android/settings/applications/manageapplications/ManageApplicationsUnitTest.java similarity index 100% rename from tests/unit/src/com/android/settings/applications/manageapplications/ManageApplicationsUnitTest.java rename to tests/legacy_unit/src/com/android/settings/applications/manageapplications/ManageApplicationsUnitTest.java diff --git a/tests/unit/src/com/android/settings/backup/BackupIntentTest.java b/tests/legacy_unit/src/com/android/settings/backup/BackupIntentTest.java similarity index 100% rename from tests/unit/src/com/android/settings/backup/BackupIntentTest.java rename to tests/legacy_unit/src/com/android/settings/backup/BackupIntentTest.java diff --git a/tests/unit/src/com/android/settings/bluetooth/Utf8ByteLengthFilterTest.java b/tests/legacy_unit/src/com/android/settings/bluetooth/Utf8ByteLengthFilterTest.java similarity index 100% rename from tests/unit/src/com/android/settings/bluetooth/Utf8ByteLengthFilterTest.java rename to tests/legacy_unit/src/com/android/settings/bluetooth/Utf8ByteLengthFilterTest.java diff --git a/tests/unit/src/com/android/settings/core/LifecycleEventHandlingTest.java b/tests/legacy_unit/src/com/android/settings/core/LifecycleEventHandlingTest.java similarity index 100% rename from tests/unit/src/com/android/settings/core/LifecycleEventHandlingTest.java rename to tests/legacy_unit/src/com/android/settings/core/LifecycleEventHandlingTest.java diff --git a/tests/unit/src/com/android/settings/dashboard/FirstIdViewMatcher.java b/tests/legacy_unit/src/com/android/settings/dashboard/FirstIdViewMatcher.java similarity index 100% rename from tests/unit/src/com/android/settings/dashboard/FirstIdViewMatcher.java rename to tests/legacy_unit/src/com/android/settings/dashboard/FirstIdViewMatcher.java diff --git a/tests/unit/src/com/android/settings/dashboard/PreferenceThemeTest.java b/tests/legacy_unit/src/com/android/settings/dashboard/PreferenceThemeTest.java similarity index 100% rename from tests/unit/src/com/android/settings/dashboard/PreferenceThemeTest.java rename to tests/legacy_unit/src/com/android/settings/dashboard/PreferenceThemeTest.java diff --git a/tests/unit/src/com/android/settings/dashboard/UiBlockerControllerTest.java b/tests/legacy_unit/src/com/android/settings/dashboard/UiBlockerControllerTest.java similarity index 100% rename from tests/unit/src/com/android/settings/dashboard/UiBlockerControllerTest.java rename to tests/legacy_unit/src/com/android/settings/dashboard/UiBlockerControllerTest.java diff --git a/tests/unit/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java b/tests/legacy_unit/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java similarity index 100% rename from tests/unit/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java rename to tests/legacy_unit/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java diff --git a/tests/unit/src/com/android/settings/display/NightDisplaySettingsActivityTest.java b/tests/legacy_unit/src/com/android/settings/display/NightDisplaySettingsActivityTest.java similarity index 100% rename from tests/unit/src/com/android/settings/display/NightDisplaySettingsActivityTest.java rename to tests/legacy_unit/src/com/android/settings/display/NightDisplaySettingsActivityTest.java diff --git a/tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java b/tests/legacy_unit/src/com/android/settings/display/ThemePreferenceControllerTest.java similarity index 100% rename from tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java rename to tests/legacy_unit/src/com/android/settings/display/ThemePreferenceControllerTest.java diff --git a/tests/unit/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java b/tests/legacy_unit/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java similarity index 100% rename from tests/unit/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java rename to tests/legacy_unit/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java diff --git a/tests/unit/src/com/android/settings/notification/AppBubbleNotificationSettingsTest.java b/tests/legacy_unit/src/com/android/settings/notification/AppBubbleNotificationSettingsTest.java similarity index 100% rename from tests/unit/src/com/android/settings/notification/AppBubbleNotificationSettingsTest.java rename to tests/legacy_unit/src/com/android/settings/notification/AppBubbleNotificationSettingsTest.java diff --git a/tests/unit/src/com/android/settings/notification/ChannelNotificationSettingsTest.java b/tests/legacy_unit/src/com/android/settings/notification/ChannelNotificationSettingsTest.java similarity index 100% rename from tests/unit/src/com/android/settings/notification/ChannelNotificationSettingsTest.java rename to tests/legacy_unit/src/com/android/settings/notification/ChannelNotificationSettingsTest.java diff --git a/tests/unit/src/com/android/settings/notification/OWNERS b/tests/legacy_unit/src/com/android/settings/notification/OWNERS similarity index 100% rename from tests/unit/src/com/android/settings/notification/OWNERS rename to tests/legacy_unit/src/com/android/settings/notification/OWNERS diff --git a/tests/unit/src/com/android/settings/notification/app/ChannelListPreferenceControllerTest.java b/tests/legacy_unit/src/com/android/settings/notification/app/ChannelListPreferenceControllerTest.java similarity index 100% rename from tests/unit/src/com/android/settings/notification/app/ChannelListPreferenceControllerTest.java rename to tests/legacy_unit/src/com/android/settings/notification/app/ChannelListPreferenceControllerTest.java diff --git a/tests/unit/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java b/tests/legacy_unit/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java similarity index 100% rename from tests/unit/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java rename to tests/legacy_unit/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java diff --git a/tests/unit/src/com/android/settings/print/PrintJobSettingsActivityTest.java b/tests/legacy_unit/src/com/android/settings/print/PrintJobSettingsActivityTest.java similarity index 100% rename from tests/unit/src/com/android/settings/print/PrintJobSettingsActivityTest.java rename to tests/legacy_unit/src/com/android/settings/print/PrintJobSettingsActivityTest.java diff --git a/tests/unit/src/com/android/settings/search/SearchIndexablesContractTest.java b/tests/legacy_unit/src/com/android/settings/search/SearchIndexablesContractTest.java similarity index 100% rename from tests/unit/src/com/android/settings/search/SearchIndexablesContractTest.java rename to tests/legacy_unit/src/com/android/settings/search/SearchIndexablesContractTest.java diff --git a/tests/unit/src/com/android/settings/search/SearchResultTrampolineTest.java b/tests/legacy_unit/src/com/android/settings/search/SearchResultTrampolineTest.java similarity index 100% rename from tests/unit/src/com/android/settings/search/SearchResultTrampolineTest.java rename to tests/legacy_unit/src/com/android/settings/search/SearchResultTrampolineTest.java diff --git a/tests/unit/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java b/tests/legacy_unit/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java similarity index 100% rename from tests/unit/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java rename to tests/legacy_unit/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java diff --git a/tests/unit/src/com/android/settings/sim/OWNERS b/tests/legacy_unit/src/com/android/settings/sim/OWNERS similarity index 100% rename from tests/unit/src/com/android/settings/sim/OWNERS rename to tests/legacy_unit/src/com/android/settings/sim/OWNERS diff --git a/tests/unit/src/com/android/settings/tests/BluetoothRequestPermissionTest.java b/tests/legacy_unit/src/com/android/settings/tests/BluetoothRequestPermissionTest.java similarity index 100% rename from tests/unit/src/com/android/settings/tests/BluetoothRequestPermissionTest.java rename to tests/legacy_unit/src/com/android/settings/tests/BluetoothRequestPermissionTest.java diff --git a/tests/unit/src/com/android/settings/tests/Manufacturer.java b/tests/legacy_unit/src/com/android/settings/tests/Manufacturer.java similarity index 100% rename from tests/unit/src/com/android/settings/tests/Manufacturer.java rename to tests/legacy_unit/src/com/android/settings/tests/Manufacturer.java diff --git a/tests/unit/src/com/android/settings/tests/Operator.java b/tests/legacy_unit/src/com/android/settings/tests/Operator.java similarity index 100% rename from tests/unit/src/com/android/settings/tests/Operator.java rename to tests/legacy_unit/src/com/android/settings/tests/Operator.java diff --git a/tests/unit/src/com/android/settings/utils/FileSizeFormatterTest.java b/tests/legacy_unit/src/com/android/settings/utils/FileSizeFormatterTest.java similarity index 100% rename from tests/unit/src/com/android/settings/utils/FileSizeFormatterTest.java rename to tests/legacy_unit/src/com/android/settings/utils/FileSizeFormatterTest.java diff --git a/tests/unit/src/com/android/settings/utils/MockedServiceManager.java b/tests/legacy_unit/src/com/android/settings/utils/MockedServiceManager.java similarity index 100% rename from tests/unit/src/com/android/settings/utils/MockedServiceManager.java rename to tests/legacy_unit/src/com/android/settings/utils/MockedServiceManager.java diff --git a/tests/unit/src/com/android/settings/vpn2/AppSettingsTest.java b/tests/legacy_unit/src/com/android/settings/vpn2/AppSettingsTest.java similarity index 100% rename from tests/unit/src/com/android/settings/vpn2/AppSettingsTest.java rename to tests/legacy_unit/src/com/android/settings/vpn2/AppSettingsTest.java diff --git a/tests/unit/src/com/android/settings/vpn2/PreferenceListTest.java b/tests/legacy_unit/src/com/android/settings/vpn2/PreferenceListTest.java similarity index 100% rename from tests/unit/src/com/android/settings/vpn2/PreferenceListTest.java rename to tests/legacy_unit/src/com/android/settings/vpn2/PreferenceListTest.java diff --git a/tests/unit/src/com/android/settings/wifi/calling/OWNERS b/tests/legacy_unit/src/com/android/settings/wifi/calling/OWNERS similarity index 100% rename from tests/unit/src/com/android/settings/wifi/calling/OWNERS rename to tests/legacy_unit/src/com/android/settings/wifi/calling/OWNERS diff --git a/tests/unit/AndroidTest.xml b/tests/unit/AndroidTest.xml index 9ce76579d1a..b9321a3021a 100644 --- a/tests/unit/AndroidTest.xml +++ b/tests/unit/AndroidTest.xml @@ -19,7 +19,6 @@