From c902df4e41078c31e124ab15ce5ab958b5084b23 Mon Sep 17 00:00:00 2001 From: Uwais Ashraf Date: Sat, 22 Jun 2024 22:14:30 +0000 Subject: [PATCH] Enable currently functional multivalent tests Flag: EXEMPT test-only Bug: 325088619 Bug: 325088638 Bug: 325088328 Test: Presubmit Test: Gradle robolectric run Change-Id: I20e77a401ed98c97168bf9c752eacc93c3c545dd --- .../android/launcher3/model/WidgetsPredictionsRequesterTest.kt | 0 .../taskbar/customization/TaskbarSpecsEvaluatorTest.kt | 0 .../launcher3/allapps/PrivateSpaceSettingsButtonTest.java | 2 +- .../com/android/launcher3/folder/FolderNameProviderTest.java | 0 .../src/com/android/launcher3/model/DbDowngradeHelperTest.java | 0 .../src/com/android/launcher3/provider/RestoreDbTaskTest.java | 0 6 files changed, 1 insertion(+), 1 deletion(-) rename quickstep/tests/{ => multivalentTests}/src/com/android/launcher3/model/WidgetsPredictionsRequesterTest.kt (100%) rename quickstep/tests/{ => multivalentTests}/src/com/android/quickstep/taskbar/customization/TaskbarSpecsEvaluatorTest.kt (100%) rename tests/{ => multivalentTests}/src/com/android/launcher3/allapps/PrivateSpaceSettingsButtonTest.java (97%) rename tests/{ => multivalentTests}/src/com/android/launcher3/folder/FolderNameProviderTest.java (100%) rename tests/{ => multivalentTests}/src/com/android/launcher3/model/DbDowngradeHelperTest.java (100%) rename tests/{ => multivalentTests}/src/com/android/launcher3/provider/RestoreDbTaskTest.java (100%) diff --git a/quickstep/tests/src/com/android/launcher3/model/WidgetsPredictionsRequesterTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/model/WidgetsPredictionsRequesterTest.kt similarity index 100% rename from quickstep/tests/src/com/android/launcher3/model/WidgetsPredictionsRequesterTest.kt rename to quickstep/tests/multivalentTests/src/com/android/launcher3/model/WidgetsPredictionsRequesterTest.kt diff --git a/quickstep/tests/src/com/android/quickstep/taskbar/customization/TaskbarSpecsEvaluatorTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/taskbar/customization/TaskbarSpecsEvaluatorTest.kt similarity index 100% rename from quickstep/tests/src/com/android/quickstep/taskbar/customization/TaskbarSpecsEvaluatorTest.kt rename to quickstep/tests/multivalentTests/src/com/android/quickstep/taskbar/customization/TaskbarSpecsEvaluatorTest.kt diff --git a/tests/src/com/android/launcher3/allapps/PrivateSpaceSettingsButtonTest.java b/tests/multivalentTests/src/com/android/launcher3/allapps/PrivateSpaceSettingsButtonTest.java similarity index 97% rename from tests/src/com/android/launcher3/allapps/PrivateSpaceSettingsButtonTest.java rename to tests/multivalentTests/src/com/android/launcher3/allapps/PrivateSpaceSettingsButtonTest.java index 9537e1c63f..1eb4173593 100644 --- a/tests/src/com/android/launcher3/allapps/PrivateSpaceSettingsButtonTest.java +++ b/tests/multivalentTests/src/com/android/launcher3/allapps/PrivateSpaceSettingsButtonTest.java @@ -24,7 +24,7 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import androidx.test.runner.AndroidJUnit4; +import androidx.test.ext.junit.runners.AndroidJUnit4; import com.android.launcher3.model.data.AppInfo; import com.android.launcher3.util.ActivityContextWrapper; 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/model/DbDowngradeHelperTest.java b/tests/multivalentTests/src/com/android/launcher3/model/DbDowngradeHelperTest.java similarity index 100% rename from tests/src/com/android/launcher3/model/DbDowngradeHelperTest.java rename to tests/multivalentTests/src/com/android/launcher3/model/DbDowngradeHelperTest.java diff --git a/tests/src/com/android/launcher3/provider/RestoreDbTaskTest.java b/tests/multivalentTests/src/com/android/launcher3/provider/RestoreDbTaskTest.java similarity index 100% rename from tests/src/com/android/launcher3/provider/RestoreDbTaskTest.java rename to tests/multivalentTests/src/com/android/launcher3/provider/RestoreDbTaskTest.java