From f9befbb347492fffd5e986dd2cc2d6f1fc4b4503 Mon Sep 17 00:00:00 2001 From: Jeremy Goldman Date: Tue, 20 Oct 2020 09:41:04 +0000 Subject: [PATCH] Move JUnit tests not from telephony settings into legacy directory. In order to enable the junit tests as a blocking presubmit, we want to ensure that all tests within this directory are being actively maintained. A number of these tests were migrated to robolectric sometime in 2017-2018, and because they are no longer maintained this CL moves them into a separate folder, so that they will not be included in the presubmit. Please verify that this is the appropriate action to take for these tests. In the future, the settings team may decide to delete this legacy directory entirely. Note that AutoSelectPreferenceControllerTest.setChecked_isChecked_showProgressDialog is currently failing, but we can fix it in a separate CL. Test: make SettingsUnitTests && adb install -r out/target/product/shamu/testcases/SettingsUnitTests/arm64/SettingsUnitTests.apk Change-Id: Iafc15b9ac69b5ca2fec76d3c0c7e247ea0017d49 --- .../{unit => legacy_unit}/InstrumentedEntitlementApp/Android.bp | 0 .../InstrumentedEntitlementApp/AndroidManifest.xml | 0 .../test/entitlement/InstrumentedEntitlementActivity.java | 0 tests/legacy_unit/README | 1 + .../src/com/android/settings/UserCredentialsTest.java | 0 .../src/com/android/settings/UtilsTest.java | 0 .../accessibility/ToggleFeaturePreferenceFragmentTest.java | 0 .../src/com/android/settings/accounts/AccountsSettingsTest.java | 0 .../src/com/android/settings/accounts/Authenticator.java | 0 .../src/com/android/settings/accounts/TestAuthService.java | 0 .../manageapplications/ManageApplicationsUnitTest.java | 0 .../src/com/android/settings/backup/BackupIntentTest.java | 0 .../com/android/settings/bluetooth/Utf8ByteLengthFilterTest.java | 0 .../com/android/settings/core/LifecycleEventHandlingTest.java | 0 .../src/com/android/settings/dashboard/FirstIdViewMatcher.java | 0 .../src/com/android/settings/dashboard/PreferenceThemeTest.java | 0 .../com/android/settings/dashboard/UiBlockerControllerTest.java | 0 .../settings/datetime/timezone/model/TimeZoneDataTest.java | 0 .../settings/display/NightDisplaySettingsActivityTest.java | 0 .../android/settings/display/ThemePreferenceControllerTest.java | 0 .../homepage/contextualcards/ContextualCardLoaderTest.java | 0 .../settings/notification/AppBubbleNotificationSettingsTest.java | 0 .../settings/notification/ChannelNotificationSettingsTest.java | 0 .../src/com/android/settings/notification/OWNERS | 0 .../notification/app/ChannelListPreferenceControllerTest.java | 0 .../settings/password/SetupChooseLockPasswordAppTest.java | 0 .../com/android/settings/print/PrintJobSettingsActivityTest.java | 0 .../android/settings/search/SearchIndexablesContractTest.java | 0 .../com/android/settings/search/SearchResultTrampolineTest.java | 0 .../settings/search/SettingsSearchIndexablesProviderTest.java | 0 tests/{unit => legacy_unit}/src/com/android/settings/sim/OWNERS | 0 .../android/settings/tests/BluetoothRequestPermissionTest.java | 0 .../src/com/android/settings/tests/Manufacturer.java | 0 .../src/com/android/settings/tests/Operator.java | 0 .../src/com/android/settings/utils/FileSizeFormatterTest.java | 0 .../src/com/android/settings/utils/MockedServiceManager.java | 0 .../src/com/android/settings/vpn2/AppSettingsTest.java | 0 .../src/com/android/settings/vpn2/PreferenceListTest.java | 0 .../src/com/android/settings/wifi/calling/OWNERS | 0 tests/unit/AndroidTest.xml | 1 - 40 files changed, 1 insertion(+), 1 deletion(-) rename tests/{unit => legacy_unit}/InstrumentedEntitlementApp/Android.bp (100%) rename tests/{unit => legacy_unit}/InstrumentedEntitlementApp/AndroidManifest.xml (100%) rename tests/{unit => legacy_unit}/InstrumentedEntitlementApp/src/android/test/entitlement/InstrumentedEntitlementActivity.java (100%) create mode 100644 tests/legacy_unit/README rename tests/{unit => legacy_unit}/src/com/android/settings/UserCredentialsTest.java (100%) rename tests/{unit => legacy_unit}/src/com/android/settings/UtilsTest.java (100%) rename tests/{unit => legacy_unit}/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java (100%) rename tests/{unit => legacy_unit}/src/com/android/settings/accounts/AccountsSettingsTest.java (100%) rename tests/{unit => legacy_unit}/src/com/android/settings/accounts/Authenticator.java (100%) rename tests/{unit => legacy_unit}/src/com/android/settings/accounts/TestAuthService.java (100%) rename tests/{unit => legacy_unit}/src/com/android/settings/applications/manageapplications/ManageApplicationsUnitTest.java (100%) rename tests/{unit => legacy_unit}/src/com/android/settings/backup/BackupIntentTest.java (100%) rename tests/{unit => legacy_unit}/src/com/android/settings/bluetooth/Utf8ByteLengthFilterTest.java (100%) rename tests/{unit => legacy_unit}/src/com/android/settings/core/LifecycleEventHandlingTest.java (100%) rename tests/{unit => legacy_unit}/src/com/android/settings/dashboard/FirstIdViewMatcher.java (100%) rename tests/{unit => legacy_unit}/src/com/android/settings/dashboard/PreferenceThemeTest.java (100%) rename tests/{unit => legacy_unit}/src/com/android/settings/dashboard/UiBlockerControllerTest.java (100%) rename tests/{unit => legacy_unit}/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java (100%) rename tests/{unit => legacy_unit}/src/com/android/settings/display/NightDisplaySettingsActivityTest.java (100%) rename tests/{unit => legacy_unit}/src/com/android/settings/display/ThemePreferenceControllerTest.java (100%) rename tests/{unit => legacy_unit}/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java (100%) rename tests/{unit => legacy_unit}/src/com/android/settings/notification/AppBubbleNotificationSettingsTest.java (100%) rename tests/{unit => legacy_unit}/src/com/android/settings/notification/ChannelNotificationSettingsTest.java (100%) rename tests/{unit => legacy_unit}/src/com/android/settings/notification/OWNERS (100%) rename tests/{unit => legacy_unit}/src/com/android/settings/notification/app/ChannelListPreferenceControllerTest.java (100%) rename tests/{unit => legacy_unit}/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java (100%) rename tests/{unit => legacy_unit}/src/com/android/settings/print/PrintJobSettingsActivityTest.java (100%) rename tests/{unit => legacy_unit}/src/com/android/settings/search/SearchIndexablesContractTest.java (100%) rename tests/{unit => legacy_unit}/src/com/android/settings/search/SearchResultTrampolineTest.java (100%) rename tests/{unit => legacy_unit}/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java (100%) rename tests/{unit => legacy_unit}/src/com/android/settings/sim/OWNERS (100%) rename tests/{unit => legacy_unit}/src/com/android/settings/tests/BluetoothRequestPermissionTest.java (100%) rename tests/{unit => legacy_unit}/src/com/android/settings/tests/Manufacturer.java (100%) rename tests/{unit => legacy_unit}/src/com/android/settings/tests/Operator.java (100%) rename tests/{unit => legacy_unit}/src/com/android/settings/utils/FileSizeFormatterTest.java (100%) rename tests/{unit => legacy_unit}/src/com/android/settings/utils/MockedServiceManager.java (100%) rename tests/{unit => legacy_unit}/src/com/android/settings/vpn2/AppSettingsTest.java (100%) rename tests/{unit => legacy_unit}/src/com/android/settings/vpn2/PreferenceListTest.java (100%) rename tests/{unit => legacy_unit}/src/com/android/settings/wifi/calling/OWNERS (100%) 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 @@