diff --git a/quickstep/tests/src/com/android/launcher3/taskbar/FallbackTaskbarUIControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/FallbackTaskbarUIControllerTest.kt similarity index 98% rename from quickstep/tests/src/com/android/launcher3/taskbar/FallbackTaskbarUIControllerTest.kt rename to quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/FallbackTaskbarUIControllerTest.kt index df98606c9f..b39c3f1e35 100644 --- a/quickstep/tests/src/com/android/launcher3/taskbar/FallbackTaskbarUIControllerTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/FallbackTaskbarUIControllerTest.kt @@ -17,7 +17,7 @@ package com.android.launcher3.taskbar -import androidx.test.runner.AndroidJUnit4 +import androidx.test.ext.junit.runners.AndroidJUnit4 import com.android.launcher3.statemanager.StateManager import com.android.quickstep.RecentsActivity import com.android.quickstep.fallback.RecentsState diff --git a/quickstep/tests/src/com/android/launcher3/taskbar/TaskbarBaseTestCase.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarBaseTestCase.kt similarity index 99% rename from quickstep/tests/src/com/android/launcher3/taskbar/TaskbarBaseTestCase.kt rename to quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarBaseTestCase.kt index d064f4aef7..26f1197f7e 100644 --- a/quickstep/tests/src/com/android/launcher3/taskbar/TaskbarBaseTestCase.kt +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarBaseTestCase.kt @@ -99,7 +99,7 @@ abstract class TaskbarBaseTestCase { keyboardQuickSwitchController, taskbarPinningController, optionalBubbleControllers, - taskbarDesktopModeController + taskbarDesktopModeController, ) } } diff --git a/quickstep/tests/src/com/android/launcher3/taskbar/TaskbarKeyguardControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarKeyguardControllerTest.kt similarity index 97% rename from quickstep/tests/src/com/android/launcher3/taskbar/TaskbarKeyguardControllerTest.kt rename to quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarKeyguardControllerTest.kt index e619e7cd38..24310202ca 100644 --- a/quickstep/tests/src/com/android/launcher3/taskbar/TaskbarKeyguardControllerTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarKeyguardControllerTest.kt @@ -16,6 +16,7 @@ package com.android.launcher3.taskbar import android.app.KeyguardManager +import androidx.test.ext.junit.runners.AndroidJUnit4 import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BACK_DISABLED import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BOUNCER_SHOWING import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_DEVICE_DOZING @@ -23,6 +24,7 @@ import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_B import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED import org.junit.Before import org.junit.Test +import org.junit.runner.RunWith import org.mockito.kotlin.any import org.mockito.kotlin.mock import org.mockito.kotlin.never @@ -30,6 +32,7 @@ import org.mockito.kotlin.times import org.mockito.kotlin.verify import org.mockito.kotlin.whenever +@RunWith(AndroidJUnit4::class) class TaskbarKeyguardControllerTest : TaskbarBaseTestCase() { private val baseDragLayer: TaskbarDragLayer = mock() diff --git a/quickstep/tests/src/com/android/launcher3/taskbar/TaskbarRecentAppsControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarRecentAppsControllerTest.kt similarity index 99% rename from quickstep/tests/src/com/android/launcher3/taskbar/TaskbarRecentAppsControllerTest.kt rename to quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarRecentAppsControllerTest.kt index fbfc40b37b..0bae42c523 100644 --- a/quickstep/tests/src/com/android/launcher3/taskbar/TaskbarRecentAppsControllerTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarRecentAppsControllerTest.kt @@ -24,8 +24,7 @@ import android.content.res.Resources import android.os.Process import android.os.UserHandle import android.platform.test.annotations.EnableFlags -import android.platform.test.rule.TestWatcher -import android.testing.AndroidTestingRunner +import androidx.test.annotation.UiThreadTest import com.android.internal.R import com.android.launcher3.BubbleTextView.RunningAppState import com.android.launcher3.Flags @@ -35,6 +34,7 @@ import com.android.launcher3.model.data.AppInfo import com.android.launcher3.model.data.ItemInfo import com.android.launcher3.model.data.TaskItemInfo import com.android.launcher3.model.data.WorkspaceItemInfo +import com.android.launcher3.util.LauncherMultivalentJUnit import com.android.quickstep.RecentsModel import com.android.quickstep.RecentsModel.RecentTasksChangedListener import com.android.quickstep.TaskIconCache @@ -46,6 +46,7 @@ import java.util.function.Consumer import org.junit.Before import org.junit.Rule import org.junit.Test +import org.junit.rules.TestWatcher import org.junit.runner.Description import org.junit.runner.RunWith import org.mockito.ArgumentCaptor @@ -58,7 +59,8 @@ import org.mockito.kotlin.times import org.mockito.kotlin.verify import org.mockito.kotlin.whenever -@RunWith(AndroidTestingRunner::class) +@UiThreadTest +@RunWith(LauncherMultivalentJUnit::class) @EnableFlags(Flags.FLAG_ENABLE_MULTI_INSTANCE_MENU_TASKBAR) class TaskbarRecentAppsControllerTest : TaskbarBaseTestCase() { diff --git a/quickstep/tests/src/com/android/quickstep/RecentTasksListTest.java b/quickstep/tests/multivalentTests/src/com/android/quickstep/RecentTasksListTest.java similarity index 97% rename from quickstep/tests/src/com/android/quickstep/RecentTasksListTest.java rename to quickstep/tests/multivalentTests/src/com/android/quickstep/RecentTasksListTest.java index ccc0311698..ccfe36d6b9 100644 --- a/quickstep/tests/src/com/android/quickstep/RecentTasksListTest.java +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/RecentTasksListTest.java @@ -21,7 +21,7 @@ import static com.google.common.truth.Truth.assertThat; import static junit.framework.TestCase.assertNull; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -34,6 +34,7 @@ import android.app.TaskInfo; import android.content.Context; import android.content.res.Resources; +import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; import com.android.internal.R; @@ -45,6 +46,7 @@ import com.android.wm.shell.shared.GroupedTaskInfo; import org.junit.Before; import org.junit.Test; +import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @@ -56,6 +58,7 @@ import java.util.Set; import java.util.stream.Collectors; @SmallTest +@RunWith(AndroidJUnit4.class) public class RecentTasksListTest { @Mock diff --git a/quickstep/tests/src/com/android/quickstep/RecentsAnimationDeviceStateTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/RecentsAnimationDeviceStateTest.kt similarity index 95% rename from quickstep/tests/src/com/android/quickstep/RecentsAnimationDeviceStateTest.kt rename to quickstep/tests/multivalentTests/src/com/android/quickstep/RecentsAnimationDeviceStateTest.kt index 6cab71ab73..0245908b43 100644 --- a/quickstep/tests/src/com/android/quickstep/RecentsAnimationDeviceStateTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/RecentsAnimationDeviceStateTest.kt @@ -1,7 +1,7 @@ package com.android.quickstep import android.content.Context -import android.testing.AndroidTestingRunner +import androidx.test.annotation.UiThreadTest import androidx.test.core.app.ApplicationProvider import androidx.test.filters.SmallTest import com.android.launcher3.util.DisplayController.CHANGE_DENSITY @@ -10,6 +10,7 @@ import com.android.launcher3.util.DisplayController.CHANGE_ROTATION import com.android.launcher3.util.DisplayController.Info import com.android.launcher3.util.Executors.MAIN_EXECUTOR import com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR +import com.android.launcher3.util.LauncherMultivalentJUnit import com.android.launcher3.util.NavigationMode import com.android.quickstep.util.GestureExclusionManager import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_ALLOW_GESTURE_IGNORING_BAR_VISIBILITY @@ -33,12 +34,13 @@ import org.mockito.Mockito.reset import org.mockito.Mockito.verify import org.mockito.MockitoAnnotations import org.mockito.kotlin.doReturn -import org.mockito.kotlin.verifyZeroInteractions +import org.mockito.kotlin.verifyNoMoreInteractions import org.mockito.kotlin.whenever /** Unit test for [RecentsAnimationDeviceState]. */ @SmallTest -@RunWith(AndroidTestingRunner::class) +@UiThreadTest +@RunWith(LauncherMultivalentJUnit::class) class RecentsAnimationDeviceStateTest { @Mock private lateinit var exclusionManager: GestureExclusionManager @@ -74,7 +76,7 @@ class RecentsAnimationDeviceStateTest { underTest.registerExclusionListener() - verifyZeroInteractions(exclusionManager) + verifyNoMoreInteractions(exclusionManager) } @Test @@ -95,7 +97,7 @@ class RecentsAnimationDeviceStateTest { underTest.unregisterExclusionListener() - verifyZeroInteractions(exclusionManager) + verifyNoMoreInteractions(exclusionManager) } @Test @@ -126,7 +128,7 @@ class RecentsAnimationDeviceStateTest { underTest.onDisplayInfoChanged(context, info, CHANGE_DENSITY) - verifyZeroInteractions(exclusionManager) + verifyNoMoreInteractions(exclusionManager) } @Test diff --git a/quickstep/tests/src/com/android/quickstep/RecentsModelTest.java b/quickstep/tests/multivalentTests/src/com/android/quickstep/RecentsModelTest.java similarity index 98% rename from quickstep/tests/src/com/android/quickstep/RecentsModelTest.java rename to quickstep/tests/multivalentTests/src/com/android/quickstep/RecentsModelTest.java index 4e34e11421..a5c60ce769 100644 --- a/quickstep/tests/src/com/android/quickstep/RecentsModelTest.java +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/RecentsModelTest.java @@ -35,6 +35,7 @@ import android.content.res.Resources; import android.platform.test.flag.junit.SetFlagsRule; import androidx.test.annotation.UiThreadTest; +import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; import com.android.launcher3.Flags; @@ -48,6 +49,7 @@ import com.android.systemui.shared.system.TaskStackChangeListeners; import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @@ -56,6 +58,7 @@ import java.util.ArrayList; import java.util.function.Consumer; @SmallTest +@RunWith(AndroidJUnit4.class) public class RecentsModelTest { @Mock private Context mContext; diff --git a/quickstep/tests/src/com/android/quickstep/TaskAnimationManagerTest.java b/quickstep/tests/multivalentTests/src/com/android/quickstep/TaskAnimationManagerTest.java similarity index 96% rename from quickstep/tests/src/com/android/quickstep/TaskAnimationManagerTest.java rename to quickstep/tests/multivalentTests/src/com/android/quickstep/TaskAnimationManagerTest.java index a87c3289bc..6e9885ad43 100644 --- a/quickstep/tests/src/com/android/quickstep/TaskAnimationManagerTest.java +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/TaskAnimationManagerTest.java @@ -27,16 +27,19 @@ import android.app.ActivityOptions; import android.content.Context; import android.content.Intent; +import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; import androidx.test.platform.app.InstrumentationRegistry; import org.junit.Before; import org.junit.Test; +import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @SmallTest +@RunWith(AndroidJUnit4.class) public class TaskAnimationManagerTest { protected final Context mContext = diff --git a/quickstep/tests/src/com/android/quickstep/TaskThumbnailCacheTest.java b/quickstep/tests/multivalentTests/src/com/android/quickstep/TaskThumbnailCacheTest.java similarity index 96% rename from quickstep/tests/src/com/android/quickstep/TaskThumbnailCacheTest.java rename to quickstep/tests/multivalentTests/src/com/android/quickstep/TaskThumbnailCacheTest.java index 4e04261e5c..3686c16ad1 100644 --- a/quickstep/tests/src/com/android/quickstep/TaskThumbnailCacheTest.java +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/TaskThumbnailCacheTest.java @@ -28,6 +28,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; +import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; import com.android.launcher3.R; @@ -35,12 +36,14 @@ import com.android.quickstep.util.TaskKeyCache; import org.junit.Before; import org.junit.Test; +import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import java.util.concurrent.Executor; @SmallTest +@RunWith(AndroidJUnit4.class) public class TaskThumbnailCacheTest { @Mock private Context mContext; diff --git a/quickstep/tests/src/com/android/quickstep/taskbar/controllers/TaskbarPinningControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/taskbar/controllers/TaskbarPinningControllerTest.kt similarity index 98% rename from quickstep/tests/src/com/android/quickstep/taskbar/controllers/TaskbarPinningControllerTest.kt rename to quickstep/tests/multivalentTests/src/com/android/quickstep/taskbar/controllers/TaskbarPinningControllerTest.kt index 3148737425..5b42d6c69c 100644 --- a/quickstep/tests/src/com/android/quickstep/taskbar/controllers/TaskbarPinningControllerTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/taskbar/controllers/TaskbarPinningControllerTest.kt @@ -56,9 +56,9 @@ class TaskbarPinningControllerTest : TaskbarBaseTestCase() { private val taskbarSharedState = mock() private var isInDesktopMode = false private val launcherPrefs = - mock { - on { get(TASKBAR_PINNING) } doReturn false - on { get(TASKBAR_PINNING_IN_DESKTOP_MODE) } doReturn false + mock().apply { + doReturn(false).whenever(this).get(TASKBAR_PINNING) + doReturn(false).whenever(this).get(TASKBAR_PINNING_IN_DESKTOP_MODE) } private val statsLogger = mock() private val statsLogManager = mock { on { logger() } doReturn statsLogger } diff --git a/quickstep/tests/src/com/android/quickstep/util/GestureExclusionManagerTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/GestureExclusionManagerTest.kt similarity index 90% rename from quickstep/tests/src/com/android/quickstep/util/GestureExclusionManagerTest.kt rename to quickstep/tests/multivalentTests/src/com/android/quickstep/util/GestureExclusionManagerTest.kt index c190cfebab..555e62bead 100644 --- a/quickstep/tests/src/com/android/quickstep/util/GestureExclusionManagerTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/GestureExclusionManagerTest.kt @@ -18,11 +18,12 @@ package com.android.quickstep.util import android.graphics.Rect import android.graphics.Region -import android.testing.AndroidTestingRunner import android.view.Display.DEFAULT_DISPLAY import android.view.IWindowManager +import androidx.test.annotation.UiThreadTest import androidx.test.filters.SmallTest import com.android.launcher3.util.Executors +import com.android.launcher3.util.LauncherMultivalentJUnit import com.android.quickstep.util.GestureExclusionManager.ExclusionListener import org.junit.Before import org.junit.Test @@ -31,11 +32,12 @@ import org.mockito.Mock import org.mockito.MockitoAnnotations import org.mockito.kotlin.reset import org.mockito.kotlin.verify -import org.mockito.kotlin.verifyZeroInteractions +import org.mockito.kotlin.verifyNoMoreInteractions /** Unit test for [GestureExclusionManager]. */ @SmallTest -@RunWith(AndroidTestingRunner::class) +@UiThreadTest +@RunWith(LauncherMultivalentJUnit::class) class GestureExclusionManagerTest { @Mock private lateinit var windowManager: IWindowManager @@ -72,7 +74,7 @@ class GestureExclusionManagerTest { underTest.addListener(listener2) awaitTasksCompleted() - verifyZeroInteractions(windowManager) + verifyNoMoreInteractions(windowManager) } @Test @@ -98,7 +100,7 @@ class GestureExclusionManagerTest { underTest.removeListener(listener1) awaitTasksCompleted() - verifyZeroInteractions(windowManager) + verifyNoMoreInteractions(windowManager) } @Test @@ -119,12 +121,12 @@ class GestureExclusionManagerTest { awaitTasksCompleted() underTest.addListener(listener1) awaitTasksCompleted() - verifyZeroInteractions(listener1) + verifyNoMoreInteractions(listener1) underTest.addListener(listener2) awaitTasksCompleted() - verifyZeroInteractions(listener1) + verifyNoMoreInteractions(listener1) verify(listener2).onGestureExclusionChanged(r1, r2) } diff --git a/tests/src/com/android/launcher3/allapps/FloatingMaskViewTest.kt b/tests/multivalentTests/src/com/android/launcher3/allapps/FloatingMaskViewTest.kt similarity index 83% rename from tests/src/com/android/launcher3/allapps/FloatingMaskViewTest.kt rename to tests/multivalentTests/src/com/android/launcher3/allapps/FloatingMaskViewTest.kt index cf03adcc5b..7ddd859123 100644 --- a/tests/src/com/android/launcher3/allapps/FloatingMaskViewTest.kt +++ b/tests/multivalentTests/src/com/android/launcher3/allapps/FloatingMaskViewTest.kt @@ -20,28 +20,33 @@ import android.view.ViewGroup import android.view.ViewGroup.MarginLayoutParams import android.widget.ImageView import androidx.test.core.app.ApplicationProvider +import androidx.test.ext.junit.runners.AndroidJUnit4 import com.android.launcher3.util.ActivityContextWrapper import com.google.common.truth.Truth import org.junit.Before import org.junit.Test +import org.junit.runner.RunWith import org.mockito.Mock import org.mockito.Mockito import org.mockito.MockitoAnnotations +@RunWith(AndroidJUnit4::class) class FloatingMaskViewTest { - @Mock - private val mockAllAppsRecyclerView: AllAppsRecyclerView? = null + @Mock private val mockAllAppsRecyclerView: AllAppsRecyclerView? = null - @Mock - private val mockBottomBox: ImageView? = null + @Mock private val mockBottomBox: ImageView? = null private var mVut: FloatingMaskView? = null + @Before fun setUp() { MockitoAnnotations.initMocks(this) val context: Context = ActivityContextWrapper(ApplicationProvider.getApplicationContext()) mVut = FloatingMaskView(context) - mVut!!.layoutParams = MarginLayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, - ViewGroup.LayoutParams.WRAP_CONTENT) + mVut!!.layoutParams = + MarginLayoutParams( + ViewGroup.LayoutParams.WRAP_CONTENT, + ViewGroup.LayoutParams.WRAP_CONTENT, + ) } @Test diff --git a/tests/src/com/android/launcher3/allapps/PrivateProfileManagerTest.java b/tests/multivalentTests/src/com/android/launcher3/allapps/PrivateProfileManagerTest.java similarity index 99% rename from tests/src/com/android/launcher3/allapps/PrivateProfileManagerTest.java rename to tests/multivalentTests/src/com/android/launcher3/allapps/PrivateProfileManagerTest.java index 430e496b7d..d757d10b71 100644 --- a/tests/src/com/android/launcher3/allapps/PrivateProfileManagerTest.java +++ b/tests/multivalentTests/src/com/android/launcher3/allapps/PrivateProfileManagerTest.java @@ -42,7 +42,7 @@ import android.os.Process; import android.os.UserHandle; import android.os.UserManager; -import androidx.test.runner.AndroidJUnit4; +import androidx.test.ext.junit.runners.AndroidJUnit4; import com.android.launcher3.logging.StatsLogManager; import com.android.launcher3.pm.UserCache; diff --git a/tests/src/com/android/launcher3/allapps/PrivateSpaceHeaderViewTest.java b/tests/multivalentTests/src/com/android/launcher3/allapps/PrivateSpaceHeaderViewTest.java similarity index 98% rename from tests/src/com/android/launcher3/allapps/PrivateSpaceHeaderViewTest.java rename to tests/multivalentTests/src/com/android/launcher3/allapps/PrivateSpaceHeaderViewTest.java index 398f9c5e3e..23b00c2a83 100644 --- a/tests/src/com/android/launcher3/allapps/PrivateSpaceHeaderViewTest.java +++ b/tests/multivalentTests/src/com/android/launcher3/allapps/PrivateSpaceHeaderViewTest.java @@ -52,8 +52,8 @@ import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; +import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; import com.android.launcher3.R; import com.android.launcher3.logging.StatsLogManager; @@ -300,7 +300,7 @@ public class PrivateSpaceHeaderViewTest { && info.user.equals(MAIN_HANDLE)); int rows = (int) (ALL_APPS_HEIGHT - PS_HEADER_HEIGHT - HEADER_PROTECTION_HEIGHT); - int position = rows * NUM_APP_COLS - (NUM_APP_COLS-1) + 1; + int position = rows * NUM_APP_COLS - (NUM_APP_COLS - 1) + 1; assertEquals(NUM_PRIVATE_SPACE_APPS + MAIN_USER_APP_COUNT + CONTAINER_HEADER_ELEMENT_COUNT + VIEW_AT_END_OF_APP_LIST, @@ -335,7 +335,7 @@ public class PrivateSpaceHeaderViewTest { && info.user.equals(MAIN_HANDLE)); int rows = (int) (ALL_APPS_HEIGHT - PS_HEADER_HEIGHT - HEADER_PROTECTION_HEIGHT) - 1; - int position = rows * NUM_APP_COLS - (NUM_APP_COLS-1) + 1; + int position = rows * NUM_APP_COLS - (NUM_APP_COLS - 1) + 1; assertEquals(NUM_PRIVATE_SPACE_APPS + MAIN_USER_APP_COUNT + CONTAINER_HEADER_ELEMENT_COUNT + VIEW_AT_END_OF_APP_LIST, @@ -370,7 +370,7 @@ public class PrivateSpaceHeaderViewTest { && info.user.equals(MAIN_HANDLE)); int rows = (int) (ALL_APPS_HEIGHT - BIGGER_PS_HEADER_HEIGHT - HEADER_PROTECTION_HEIGHT); - int position = rows * NUM_APP_COLS - (NUM_APP_COLS-1) + 1; + int position = rows * NUM_APP_COLS - (NUM_APP_COLS - 1) + 1; assertEquals(NUM_PRIVATE_SPACE_APPS + MAIN_USER_APP_COUNT + CONTAINER_HEADER_ELEMENT_COUNT + VIEW_AT_END_OF_APP_LIST, diff --git a/tests/src/com/android/launcher3/allapps/WorkUtilityViewTest.java b/tests/multivalentTests/src/com/android/launcher3/allapps/WorkUtilityViewTest.java similarity index 100% rename from tests/src/com/android/launcher3/allapps/WorkUtilityViewTest.java rename to tests/multivalentTests/src/com/android/launcher3/allapps/WorkUtilityViewTest.java