From 784b4f28b0477ef8ce5b42b8646e2c1f3a76fcca Mon Sep 17 00:00:00 2001 From: Uwais Ashraf Date: Tue, 21 May 2024 15:42:34 +0000 Subject: [PATCH] Fix some compile errors occurring as a result of robo enablement Fix: 297950111 Test: :NexusLauncher.Robo:testGoogleWithQuickstepDebugUnitTest Test: atest NexusLauncherRoboTests Flag: NA Change-Id: Ic9b09fff630d274558d09b7031d12ec28f10fbc7 --- .../src/com/android/quickstep/FullscreenDrawParamsTest.kt | 0 .../src/com/android/quickstep/HotseatWidthCalculationTest.kt | 0 .../src/com/android/quickstep/util/AppPairsControllerTest.kt | 0 .../com/android/quickstep/util/RecentsOrientedStateTest.java | 0 .../com/android/quickstep/util/SplitAnimationControllerTest.kt | 0 tests/Android.bp | 2 ++ .../src/com/android/launcher3/AbstractDeviceProfileTest.kt | 0 .../src/com/android/launcher3/DeleteDropTargetTest.kt | 0 .../src/com/android/launcher3/FakeInvariantDeviceProfileTest.kt | 0 .../src/com/android/launcher3/LauncherPrefsTest.kt | 0 .../com/android/launcher3/allapps/AlphabeticalAppsListTest.java | 0 .../com/android/launcher3/folder/FolderNameProviderTest.java | 0 .../src/com/android/launcher3/icons/IconCacheTest.java | 0 .../src/com/android/launcher3/model/DatabaseHelperTest.kt | 0 .../com/android/launcher3/model/GridSizeMigrationUtilTest.kt | 0 .../src/com/android/launcher3/responsive/SizeSpecTest.kt | 0 .../android/launcher3/ui/ActivityAllAppsContainerViewTest.java | 0 .../src/com/android/launcher3/util/CellContentDimensionsTest.kt | 0 .../com/android/launcher3/util/PackageManagerHelperTest.java | 0 .../src/com/android/launcher3/util/rule/SetFlagsRuleExt.kt | 0 .../launcher3/widget/LauncherAppWidgetProviderInfoTest.java | 0 21 files changed, 2 insertions(+) rename quickstep/tests/{ => multivalentTests}/src/com/android/quickstep/FullscreenDrawParamsTest.kt (100%) rename quickstep/tests/{ => multivalentTests}/src/com/android/quickstep/HotseatWidthCalculationTest.kt (100%) rename quickstep/tests/{ => multivalentTests}/src/com/android/quickstep/util/AppPairsControllerTest.kt (100%) rename quickstep/tests/{ => multivalentTests}/src/com/android/quickstep/util/RecentsOrientedStateTest.java (100%) rename quickstep/tests/{ => multivalentTests}/src/com/android/quickstep/util/SplitAnimationControllerTest.kt (100%) rename tests/{ => multivalentTests}/src/com/android/launcher3/AbstractDeviceProfileTest.kt (100%) rename tests/{ => multivalentTests}/src/com/android/launcher3/DeleteDropTargetTest.kt (100%) rename tests/{ => multivalentTests}/src/com/android/launcher3/FakeInvariantDeviceProfileTest.kt (100%) rename tests/{ => multivalentTests}/src/com/android/launcher3/LauncherPrefsTest.kt (100%) rename tests/{ => multivalentTests}/src/com/android/launcher3/allapps/AlphabeticalAppsListTest.java (100%) rename tests/{ => multivalentTests}/src/com/android/launcher3/folder/FolderNameProviderTest.java (100%) rename tests/{ => multivalentTests}/src/com/android/launcher3/icons/IconCacheTest.java (100%) rename tests/{ => multivalentTests}/src/com/android/launcher3/model/DatabaseHelperTest.kt (100%) rename tests/{ => multivalentTests}/src/com/android/launcher3/model/GridSizeMigrationUtilTest.kt (100%) rename tests/{ => multivalentTests}/src/com/android/launcher3/responsive/SizeSpecTest.kt (100%) rename tests/{ => multivalentTests}/src/com/android/launcher3/ui/ActivityAllAppsContainerViewTest.java (100%) rename tests/{ => multivalentTests}/src/com/android/launcher3/util/CellContentDimensionsTest.kt (100%) rename tests/{ => multivalentTests}/src/com/android/launcher3/util/PackageManagerHelperTest.java (100%) rename tests/{ => multivalentTests}/src/com/android/launcher3/util/rule/SetFlagsRuleExt.kt (100%) rename tests/{ => multivalentTests}/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfoTest.java (100%) diff --git a/quickstep/tests/src/com/android/quickstep/FullscreenDrawParamsTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/FullscreenDrawParamsTest.kt similarity index 100% rename from quickstep/tests/src/com/android/quickstep/FullscreenDrawParamsTest.kt rename to quickstep/tests/multivalentTests/src/com/android/quickstep/FullscreenDrawParamsTest.kt diff --git a/quickstep/tests/src/com/android/quickstep/HotseatWidthCalculationTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/HotseatWidthCalculationTest.kt similarity index 100% rename from quickstep/tests/src/com/android/quickstep/HotseatWidthCalculationTest.kt rename to quickstep/tests/multivalentTests/src/com/android/quickstep/HotseatWidthCalculationTest.kt diff --git a/quickstep/tests/src/com/android/quickstep/util/AppPairsControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/AppPairsControllerTest.kt similarity index 100% rename from quickstep/tests/src/com/android/quickstep/util/AppPairsControllerTest.kt rename to quickstep/tests/multivalentTests/src/com/android/quickstep/util/AppPairsControllerTest.kt diff --git a/quickstep/tests/src/com/android/quickstep/util/RecentsOrientedStateTest.java b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/RecentsOrientedStateTest.java similarity index 100% rename from quickstep/tests/src/com/android/quickstep/util/RecentsOrientedStateTest.java rename to quickstep/tests/multivalentTests/src/com/android/quickstep/util/RecentsOrientedStateTest.java diff --git a/quickstep/tests/src/com/android/quickstep/util/SplitAnimationControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/SplitAnimationControllerTest.kt similarity index 100% rename from quickstep/tests/src/com/android/quickstep/util/SplitAnimationControllerTest.kt rename to quickstep/tests/multivalentTests/src/com/android/quickstep/util/SplitAnimationControllerTest.kt diff --git a/tests/Android.bp b/tests/Android.bp index cc0021be6b..5794cce8f5 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -192,6 +192,7 @@ android_robolectric_test { java_resource_dirs: ["config"], static_libs: [ "flag-junit-base", + "flag-junit", "com_android_launcher3_flags_lib", "com_android_wm_shell_flags_lib", "androidx.test.uiautomator_uiautomator", @@ -202,6 +203,7 @@ android_robolectric_test { "inline-mockito-robolectric-prebuilt", "mockito-kotlin-nodeps", "platform-parametric-runner-lib", + "platform-test-rules-deviceless", "testables", "Launcher3TestResources", "SystemUISharedLib", diff --git a/tests/src/com/android/launcher3/AbstractDeviceProfileTest.kt b/tests/multivalentTests/src/com/android/launcher3/AbstractDeviceProfileTest.kt similarity index 100% rename from tests/src/com/android/launcher3/AbstractDeviceProfileTest.kt rename to tests/multivalentTests/src/com/android/launcher3/AbstractDeviceProfileTest.kt diff --git a/tests/src/com/android/launcher3/DeleteDropTargetTest.kt b/tests/multivalentTests/src/com/android/launcher3/DeleteDropTargetTest.kt similarity index 100% rename from tests/src/com/android/launcher3/DeleteDropTargetTest.kt rename to tests/multivalentTests/src/com/android/launcher3/DeleteDropTargetTest.kt diff --git a/tests/src/com/android/launcher3/FakeInvariantDeviceProfileTest.kt b/tests/multivalentTests/src/com/android/launcher3/FakeInvariantDeviceProfileTest.kt similarity index 100% rename from tests/src/com/android/launcher3/FakeInvariantDeviceProfileTest.kt rename to tests/multivalentTests/src/com/android/launcher3/FakeInvariantDeviceProfileTest.kt diff --git a/tests/src/com/android/launcher3/LauncherPrefsTest.kt b/tests/multivalentTests/src/com/android/launcher3/LauncherPrefsTest.kt similarity index 100% rename from tests/src/com/android/launcher3/LauncherPrefsTest.kt rename to tests/multivalentTests/src/com/android/launcher3/LauncherPrefsTest.kt diff --git a/tests/src/com/android/launcher3/allapps/AlphabeticalAppsListTest.java b/tests/multivalentTests/src/com/android/launcher3/allapps/AlphabeticalAppsListTest.java similarity index 100% rename from tests/src/com/android/launcher3/allapps/AlphabeticalAppsListTest.java rename to tests/multivalentTests/src/com/android/launcher3/allapps/AlphabeticalAppsListTest.java diff --git a/tests/src/com/android/launcher3/folder/FolderNameProviderTest.java b/tests/multivalentTests/src/com/android/launcher3/folder/FolderNameProviderTest.java similarity index 100% rename from tests/src/com/android/launcher3/folder/FolderNameProviderTest.java rename to tests/multivalentTests/src/com/android/launcher3/folder/FolderNameProviderTest.java diff --git a/tests/src/com/android/launcher3/icons/IconCacheTest.java b/tests/multivalentTests/src/com/android/launcher3/icons/IconCacheTest.java similarity index 100% rename from tests/src/com/android/launcher3/icons/IconCacheTest.java rename to tests/multivalentTests/src/com/android/launcher3/icons/IconCacheTest.java diff --git a/tests/src/com/android/launcher3/model/DatabaseHelperTest.kt b/tests/multivalentTests/src/com/android/launcher3/model/DatabaseHelperTest.kt similarity index 100% rename from tests/src/com/android/launcher3/model/DatabaseHelperTest.kt rename to tests/multivalentTests/src/com/android/launcher3/model/DatabaseHelperTest.kt diff --git a/tests/src/com/android/launcher3/model/GridSizeMigrationUtilTest.kt b/tests/multivalentTests/src/com/android/launcher3/model/GridSizeMigrationUtilTest.kt similarity index 100% rename from tests/src/com/android/launcher3/model/GridSizeMigrationUtilTest.kt rename to tests/multivalentTests/src/com/android/launcher3/model/GridSizeMigrationUtilTest.kt diff --git a/tests/src/com/android/launcher3/responsive/SizeSpecTest.kt b/tests/multivalentTests/src/com/android/launcher3/responsive/SizeSpecTest.kt similarity index 100% rename from tests/src/com/android/launcher3/responsive/SizeSpecTest.kt rename to tests/multivalentTests/src/com/android/launcher3/responsive/SizeSpecTest.kt diff --git a/tests/src/com/android/launcher3/ui/ActivityAllAppsContainerViewTest.java b/tests/multivalentTests/src/com/android/launcher3/ui/ActivityAllAppsContainerViewTest.java similarity index 100% rename from tests/src/com/android/launcher3/ui/ActivityAllAppsContainerViewTest.java rename to tests/multivalentTests/src/com/android/launcher3/ui/ActivityAllAppsContainerViewTest.java diff --git a/tests/src/com/android/launcher3/util/CellContentDimensionsTest.kt b/tests/multivalentTests/src/com/android/launcher3/util/CellContentDimensionsTest.kt similarity index 100% rename from tests/src/com/android/launcher3/util/CellContentDimensionsTest.kt rename to tests/multivalentTests/src/com/android/launcher3/util/CellContentDimensionsTest.kt diff --git a/tests/src/com/android/launcher3/util/PackageManagerHelperTest.java b/tests/multivalentTests/src/com/android/launcher3/util/PackageManagerHelperTest.java similarity index 100% rename from tests/src/com/android/launcher3/util/PackageManagerHelperTest.java rename to tests/multivalentTests/src/com/android/launcher3/util/PackageManagerHelperTest.java diff --git a/tests/src/com/android/launcher3/util/rule/SetFlagsRuleExt.kt b/tests/multivalentTests/src/com/android/launcher3/util/rule/SetFlagsRuleExt.kt similarity index 100% rename from tests/src/com/android/launcher3/util/rule/SetFlagsRuleExt.kt rename to tests/multivalentTests/src/com/android/launcher3/util/rule/SetFlagsRuleExt.kt diff --git a/tests/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfoTest.java b/tests/multivalentTests/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfoTest.java similarity index 100% rename from tests/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfoTest.java rename to tests/multivalentTests/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfoTest.java