diff --git a/tests/multivalentTests/src/com/android/launcher3/folder/PreviewItemManagerTest.kt b/tests/multivalentTests/src/com/android/launcher3/folder/PreviewItemManagerTest.kt index d236551ca6..111ffaa090 100644 --- a/tests/multivalentTests/src/com/android/launcher3/folder/PreviewItemManagerTest.kt +++ b/tests/multivalentTests/src/com/android/launcher3/folder/PreviewItemManagerTest.kt @@ -29,7 +29,6 @@ import com.android.launcher3.graphics.PreloadIconDrawable import com.android.launcher3.icons.BaseIconFactory import com.android.launcher3.icons.FastBitmapDrawable import com.android.launcher3.icons.UserBadgeDrawable -import com.android.launcher3.model.ModelTestRule import com.android.launcher3.model.data.FolderInfo import com.android.launcher3.model.data.ItemInfo import com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_ARCHIVED @@ -45,7 +44,6 @@ import com.android.launcher3.util.UserIconInfo import com.google.common.truth.Truth.assertThat import org.junit.After import org.junit.Before -import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith @@ -54,8 +52,6 @@ import org.junit.runner.RunWith @RunWith(AndroidJUnit4::class) class PreviewItemManagerTest { - @get:Rule val modelTestRule = ModelTestRule() - private lateinit var previewItemManager: PreviewItemManager private lateinit var context: Context private lateinit var folderItems: ArrayList @@ -99,8 +95,8 @@ class PreviewItemManagerTest { BaseIconFactory( context, context.resources.configuration.densityDpi, - previewItemManager.mIconSize - ) + previewItemManager.mIconSize, + ), ) // Set second icon to be non-themed. @@ -111,8 +107,8 @@ class PreviewItemManagerTest { BaseIconFactory( context, context.resources.configuration.densityDpi, - previewItemManager.mIconSize - ) + previewItemManager.mIconSize, + ), ) // Set third icon to be themed with badge. @@ -123,8 +119,8 @@ class PreviewItemManagerTest { BaseIconFactory( context, context.resources.configuration.densityDpi, - previewItemManager.mIconSize - ) + previewItemManager.mIconSize, + ), ) folderApps[2].bitmap = folderApps[2].bitmap.withFlags(profileFlagOp(UserIconInfo.TYPE_WORK)) @@ -137,8 +133,8 @@ class PreviewItemManagerTest { BaseIconFactory( context, context.resources.configuration.densityDpi, - previewItemManager.mIconSize - ) + previewItemManager.mIconSize, + ), ) defaultThemedIcons = get(context).get(THEMED_ICONS) diff --git a/tests/multivalentTests/src/com/android/launcher3/icons/IconCacheTest.java b/tests/multivalentTests/src/com/android/launcher3/icons/IconCacheTest.java index 519108d3ec..ce00b28c51 100644 --- a/tests/multivalentTests/src/com/android/launcher3/icons/IconCacheTest.java +++ b/tests/multivalentTests/src/com/android/launcher3/icons/IconCacheTest.java @@ -68,7 +68,6 @@ import com.android.launcher3.shortcuts.ShortcutKey; import com.android.launcher3.util.ApplicationInfoWrapper; import com.android.launcher3.util.ComponentKey; import com.android.launcher3.util.PackageUserKey; -import com.android.launcher3.util.RoboApiWrapper; import com.google.common.truth.Truth; @@ -148,7 +147,6 @@ public class IconCacheTest { @Test public void launcherActivityInfo_cached_in_memory() { - RoboApiWrapper.INSTANCE.initialize(); ComponentName cn = new ComponentName(TEST_PACKAGE, TEST_ACTIVITY); UserHandle user = myUserHandle(); ComponentKey cacheKey = new ComponentKey(cn, user); @@ -213,7 +211,6 @@ public class IconCacheTest { @Test public void item_kept_in_db_if_nothing_changes() { - RoboApiWrapper.INSTANCE.initialize(); ComponentName cn = new ComponentName(TEST_PACKAGE, TEST_ACTIVITY); UserHandle user = myUserHandle(); @@ -232,7 +229,6 @@ public class IconCacheTest { @Test public void item_updated_in_db_if_appInfo_changes() { - RoboApiWrapper.INSTANCE.initialize(); ComponentName cn = new ComponentName(TEST_PACKAGE, TEST_ACTIVITY); UserHandle user = myUserHandle(); @@ -253,7 +249,6 @@ public class IconCacheTest { @Test public void item_removed_in_db_if_item_removed() { - RoboApiWrapper.INSTANCE.initialize(); ComponentName cn = new ComponentName(TEST_PACKAGE, TEST_ACTIVITY); UserHandle user = myUserHandle(); diff --git a/tests/multivalentTests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.kt b/tests/multivalentTests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.kt index 43dc36ba0c..ce0468270d 100644 --- a/tests/multivalentTests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.kt +++ b/tests/multivalentTests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.kt @@ -27,7 +27,6 @@ import com.android.launcher3.util.TestUtil.runOnExecutorSync import com.google.common.truth.Truth.assertThat import org.junit.After import org.junit.Before -import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.mockito.Mockito.times @@ -44,8 +43,6 @@ import org.mockito.kotlin.whenever @RunWith(AndroidJUnit4::class) class AddWorkspaceItemsTaskTest : AbstractWorkspaceModelTest() { - @get:Rule val modelTestRule = ModelTestRule() - private lateinit var mDataModelCallbacks: MyCallbacks private val mWorkspaceItemSpaceFinder: WorkspaceItemSpaceFinder = mock() @@ -121,18 +118,8 @@ class AddWorkspaceItemsTaskTest : AbstractWorkspaceModelTest() { @Test fun givenMultipleItems_whenExecuteTask_thenAddThem() { val itemsToAdd = - arrayOf( - getNewItem(), - getExistingItem(), - getNewItem(), - getNewItem(), - getExistingItem(), - ) - givenNewItemSpaces( - NewItemSpace(1, 3, 3), - NewItemSpace(2, 0, 0), - NewItemSpace(2, 0, 1), - ) + arrayOf(getNewItem(), getExistingItem(), getNewItem(), getNewItem(), getExistingItem()) + givenNewItemSpaces(NewItemSpace(1, 3, 3), NewItemSpace(2, 0, 0), NewItemSpace(2, 0, 1)) val nonEmptyScreenIds = listOf(0, 1) val addedItems = testAddItems(nonEmptyScreenIds, *itemsToAdd) @@ -173,7 +160,7 @@ class AddWorkspaceItemsTaskTest : AbstractWorkspaceModelTest() { eq(IntArray.wrap(*nonEmptyScreenIds.toIntArray())), eq(IntArray()), eq(1), - eq(1) + eq(1), ) } @@ -183,7 +170,7 @@ class AddWorkspaceItemsTaskTest : AbstractWorkspaceModelTest() { */ private fun testAddItems( nonEmptyScreenIds: List, - vararg itemsToAdd: WorkspaceItemInfo + vararg itemsToAdd: WorkspaceItemInfo, ): List { setupWorkspaces(nonEmptyScreenIds) val task = newTask(*itemsToAdd) @@ -220,7 +207,7 @@ private class MyCallbacks : BgDataModel.Callbacks { override fun bindAppsAdded( newScreens: IntArray?, addNotAnimated: ArrayList, - addAnimated: ArrayList + addAnimated: ArrayList, ) { addedItems.addAll(addAnimated.map { AddedItem(it, true) }) addedItems.addAll(addNotAnimated.map { AddedItem(it, false) }) diff --git a/tests/multivalentTests/src/com/android/launcher3/model/AsyncBindingTest.kt b/tests/multivalentTests/src/com/android/launcher3/model/AsyncBindingTest.kt index dce75b92df..c91577f39e 100644 --- a/tests/multivalentTests/src/com/android/launcher3/model/AsyncBindingTest.kt +++ b/tests/multivalentTests/src/com/android/launcher3/model/AsyncBindingTest.kt @@ -64,8 +64,6 @@ class AsyncBindingTest { @get:Rule val setFlagsRule = SetFlagsRule() - @get:Rule val modelTestRule = ModelTestRule() - @Spy private var callbacks = MyCallbacks() @Mock private lateinit var itemInflater: ItemInflater<*> @@ -203,7 +201,7 @@ class AsyncBindingTest { pendingTasks: RunnableList, onCompleteSignal: RunnableList, workspaceItemCount: Int, - isBindSync: Boolean + isBindSync: Boolean, ) { this.pendingTasks = pendingTasks this.onCompleteSignal = onCompleteSignal diff --git a/tests/multivalentTests/src/com/android/launcher3/model/CacheDataUpdatedTaskTest.java b/tests/multivalentTests/src/com/android/launcher3/model/CacheDataUpdatedTaskTest.java index 535080ae93..600af42a38 100644 --- a/tests/multivalentTests/src/com/android/launcher3/model/CacheDataUpdatedTaskTest.java +++ b/tests/multivalentTests/src/com/android/launcher3/model/CacheDataUpdatedTaskTest.java @@ -64,11 +64,7 @@ import java.util.List; @RunWith(AndroidJUnit4.class) public class CacheDataUpdatedTaskTest { - @Rule(order = 0) - public TestRule testStabilityRule = new TestStabilityRule(); - - @Rule(order = 1) - public ModelTestRule mModelTestRule = new ModelTestRule(); + @Rule public TestRule testStabilityRule = new TestStabilityRule(); private static final String PENDING_APP_1 = TEST_PACKAGE + ".pending1"; private static final String PENDING_APP_2 = TEST_PACKAGE + ".pending2"; diff --git a/tests/multivalentTests/src/com/android/launcher3/model/DefaultLayoutProviderTest.java b/tests/multivalentTests/src/com/android/launcher3/model/DefaultLayoutProviderTest.java index e14e145614..1e2431fea8 100644 --- a/tests/multivalentTests/src/com/android/launcher3/model/DefaultLayoutProviderTest.java +++ b/tests/multivalentTests/src/com/android/launcher3/model/DefaultLayoutProviderTest.java @@ -39,7 +39,6 @@ import com.android.launcher3.util.LauncherModelHelper; import org.junit.After; import org.junit.Before; -import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -50,8 +49,6 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public class DefaultLayoutProviderTest { - @Rule public ModelTestRule rule = new ModelTestRule(); - private LauncherModelHelper mModelHelper; private LauncherModelHelper.SandboxModelContext mTargetContext; diff --git a/tests/multivalentTests/src/com/android/launcher3/model/FirstScreenBroadcastHelperTest.kt b/tests/multivalentTests/src/com/android/launcher3/model/FirstScreenBroadcastHelperTest.kt index d2d951217d..9cc380eaf7 100644 --- a/tests/multivalentTests/src/com/android/launcher3/model/FirstScreenBroadcastHelperTest.kt +++ b/tests/multivalentTests/src/com/android/launcher3/model/FirstScreenBroadcastHelperTest.kt @@ -34,7 +34,6 @@ import com.android.launcher3.model.data.WorkspaceItemInfo import com.android.launcher3.util.PackageManagerHelper import com.android.launcher3.util.PackageUserKey import junit.framework.Assert.assertEquals -import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.mockito.ArgumentCaptor @@ -46,8 +45,6 @@ import org.mockito.kotlin.whenever @RunWith(AndroidJUnit4::class) class FirstScreenBroadcastHelperTest { - @get:Rule val modelTestRule = ModelTestRule() - private val context = spy(InstrumentationRegistry.getInstrumentation().targetContext) private val mockPmHelper = mock() private val expectedAppPackage = "appPackageExpected" @@ -70,7 +67,7 @@ class FirstScreenBroadcastHelperTest { container = CONTAINER_HOTSEAT intent = expectedIntent }, - LauncherAppWidgetInfo().apply { providerName = expectedComponentName } + LauncherAppWidgetInfo().apply { providerName = expectedComponentName }, ) @Test @@ -89,7 +86,7 @@ class FirstScreenBroadcastHelperTest { val sessionInfoMap: HashMap = hashMapOf( PackageUserKey(unexpectedAppPackage, UserHandle(0)) to sessionInfoExpected, - PackageUserKey(expectedAppPackage, UserHandle(0)) to sessionInfoUnexpected + PackageUserKey(expectedAppPackage, UserHandle(0)) to sessionInfoUnexpected, ) // When @@ -98,7 +95,7 @@ class FirstScreenBroadcastHelperTest { packageManagerHelper = mockPmHelper, firstScreenItems = firstScreenItems, userKeyToSessionMap = sessionInfoMap, - allWidgets = listOf() + allWidgets = listOf(), ) // Then @@ -108,7 +105,7 @@ class FirstScreenBroadcastHelperTest { installerPackage = expectedInstallerPackage, pendingWorkspaceItems = mutableSetOf(expectedAppPackage), pendingHotseatItems = mutableSetOf(expectedAppPackage), - pendingWidgetItems = mutableSetOf(expectedAppPackage) + pendingWidgetItems = mutableSetOf(expectedAppPackage), ) ) @@ -133,7 +130,7 @@ class FirstScreenBroadcastHelperTest { providerName = expectedComponentName screenId = 0 } - ) + ), ) // Then @@ -143,7 +140,7 @@ class FirstScreenBroadcastHelperTest { installerPackage = expectedInstallerPackage, installedHotseatItems = mutableSetOf(expectedAppPackage), installedWorkspaceItems = mutableSetOf(expectedAppPackage), - firstScreenInstalledWidgets = mutableSetOf(expectedAppPackage) + firstScreenInstalledWidgets = mutableSetOf(expectedAppPackage), ) ) assertEquals(expectedResult, actualResult) @@ -178,8 +175,8 @@ class FirstScreenBroadcastHelperTest { LauncherAppWidgetInfo().apply { providerName = unexpectedComponentName screenId = 0 - } - ) + }, + ), ) // Then @@ -190,7 +187,7 @@ class FirstScreenBroadcastHelperTest { installedHotseatItems = mutableSetOf(), installedWorkspaceItems = mutableSetOf(), firstScreenInstalledWidgets = mutableSetOf(expectedAppPackage), - secondaryScreenInstalledWidgets = mutableSetOf(expectedAppPackage2) + secondaryScreenInstalledWidgets = mutableSetOf(expectedAppPackage2), ) ) assertEquals(expectedResult, actualResult) @@ -224,7 +221,7 @@ class FirstScreenBroadcastHelperTest { packageManagerHelper = mockPmHelper, firstScreenItems = firstScreenItems, userKeyToSessionMap = sessionInfoMap, - allWidgets = listOf() + allWidgets = listOf(), ) // Then @@ -232,7 +229,7 @@ class FirstScreenBroadcastHelperTest { listOf( FirstScreenBroadcastModel( installerPackage = expectedInstallerPackage, - pendingCollectionItems = mutableSetOf(expectedAppPackage) + pendingCollectionItems = mutableSetOf(expectedAppPackage), ) ) assertEquals(expectedResult, actualResult) @@ -259,7 +256,7 @@ class FirstScreenBroadcastHelperTest { firstScreenInstalledWidgets = mutableSetOf().apply { repeat(20) { add(it.toString()) } }, secondaryScreenInstalledWidgets = - mutableSetOf().apply { repeat(20) { add(it.toString()) } } + mutableSetOf().apply { repeat(20) { add(it.toString()) } }, ) // When @@ -334,7 +331,7 @@ class FirstScreenBroadcastHelperTest { installedWorkspaceItems = mutableSetOf("installedWorkspaceItems"), installedHotseatItems = mutableSetOf("installedHotseatItems"), firstScreenInstalledWidgets = mutableSetOf("firstScreenInstalledWidgetItems"), - secondaryScreenInstalledWidgets = mutableSetOf("secondaryInstalledWidgetItems") + secondaryScreenInstalledWidgets = mutableSetOf("secondaryInstalledWidgetItems"), ) ) val expectedPendingIntent = @@ -342,7 +339,7 @@ class FirstScreenBroadcastHelperTest { context, 0 /* requestCode */, Intent(), - PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE + PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE, ) // When @@ -354,40 +351,40 @@ class FirstScreenBroadcastHelperTest { assertEquals( "com.android.launcher3.action.FIRST_SCREEN_ACTIVE_INSTALLS", - argumentCaptor.value.action + argumentCaptor.value.action, ) assertEquals(expectedInstallerPackage, argumentCaptor.value.`package`) assertEquals( expectedPendingIntent, - argumentCaptor.value.getParcelableExtra("verificationToken") + argumentCaptor.value.getParcelableExtra("verificationToken"), ) assertEquals( arrayListOf("pendingCollectionItem"), - argumentCaptor.value.getStringArrayListExtra("folderItem") + argumentCaptor.value.getStringArrayListExtra("folderItem"), ) assertEquals( arrayListOf("pendingWorkspaceItem"), - argumentCaptor.value.getStringArrayListExtra("workspaceItem") + argumentCaptor.value.getStringArrayListExtra("workspaceItem"), ) assertEquals( arrayListOf("pendingHotseatItems"), - argumentCaptor.value.getStringArrayListExtra("hotseatItem") + argumentCaptor.value.getStringArrayListExtra("hotseatItem"), ) assertEquals( arrayListOf("pendingWidgetItems"), - argumentCaptor.value.getStringArrayListExtra("widgetItem") + argumentCaptor.value.getStringArrayListExtra("widgetItem"), ) assertEquals( arrayListOf("installedWorkspaceItems"), - argumentCaptor.value.getStringArrayListExtra("workspaceInstalledItems") + argumentCaptor.value.getStringArrayListExtra("workspaceInstalledItems"), ) assertEquals( arrayListOf("installedHotseatItems"), - argumentCaptor.value.getStringArrayListExtra("hotseatInstalledItems") + argumentCaptor.value.getStringArrayListExtra("hotseatInstalledItems"), ) assertEquals( arrayListOf("firstScreenInstalledWidgetItems", "secondaryInstalledWidgetItems"), - argumentCaptor.value.getStringArrayListExtra("widgetInstalledItems") + argumentCaptor.value.getStringArrayListExtra("widgetInstalledItems"), ) } } diff --git a/tests/multivalentTests/src/com/android/launcher3/model/FolderIconLoadTest.kt b/tests/multivalentTests/src/com/android/launcher3/model/FolderIconLoadTest.kt index 4ca47e3eb6..e8f778fde7 100644 --- a/tests/multivalentTests/src/com/android/launcher3/model/FolderIconLoadTest.kt +++ b/tests/multivalentTests/src/com/android/launcher3/model/FolderIconLoadTest.kt @@ -30,7 +30,6 @@ import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertWithMessage import org.junit.After import org.junit.Before -import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith @@ -39,8 +38,6 @@ import org.junit.runner.RunWith @RunWith(AndroidJUnit4::class) class FolderIconLoadTest { - @get:Rule(order = 0) val modelTestRule = ModelTestRule() - private lateinit var modelHelper: LauncherModelHelper private val uniqueActivities = diff --git a/tests/multivalentTests/src/com/android/launcher3/model/LoaderCursorTest.java b/tests/multivalentTests/src/com/android/launcher3/model/LoaderCursorTest.java index ac911b3984..b4945d7129 100644 --- a/tests/multivalentTests/src/com/android/launcher3/model/LoaderCursorTest.java +++ b/tests/multivalentTests/src/com/android/launcher3/model/LoaderCursorTest.java @@ -67,7 +67,6 @@ import com.android.launcher3.util.PackageManagerHelper; import org.junit.After; import org.junit.Before; -import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -78,8 +77,6 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public class LoaderCursorTest { - @Rule public ModelTestRule rule = new ModelTestRule(); - private LauncherModelHelper mModelHelper; private LauncherAppState mApp; private PackageManagerHelper mPmHelper; diff --git a/tests/multivalentTests/src/com/android/launcher3/model/ModelTestRule.kt b/tests/multivalentTests/src/com/android/launcher3/model/ModelTestRule.kt deleted file mode 100644 index ad2c2a49f0..0000000000 --- a/tests/multivalentTests/src/com/android/launcher3/model/ModelTestRule.kt +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 2024 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.launcher3.model - -import com.android.launcher3.util.RoboApiWrapper -import org.junit.rules.TestWatcher -import org.junit.runner.Description - -class ModelTestRule : TestWatcher() { - override fun starting(description: Description?) { - RoboApiWrapper.initialize() - } -} diff --git a/tests/multivalentTests/src/com/android/launcher3/model/PackageInstallStateChangedTaskTest.java b/tests/multivalentTests/src/com/android/launcher3/model/PackageInstallStateChangedTaskTest.java index a0d9da94b3..0f1fc00b9b 100644 --- a/tests/multivalentTests/src/com/android/launcher3/model/PackageInstallStateChangedTaskTest.java +++ b/tests/multivalentTests/src/com/android/launcher3/model/PackageInstallStateChangedTaskTest.java @@ -37,7 +37,6 @@ import com.android.launcher3.util.LauncherModelHelper; import org.junit.After; import org.junit.Before; -import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -48,8 +47,6 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public class PackageInstallStateChangedTaskTest { - @Rule public ModelTestRule mModelTestRule = new ModelTestRule(); - private static final String PENDING_APP_1 = TEST_PACKAGE + ".pending1"; private static final String PENDING_APP_2 = TEST_PACKAGE + ".pending2"; diff --git a/tests/multivalentTests/src/com/android/launcher3/model/WorkspaceItemProcessorTest.kt b/tests/multivalentTests/src/com/android/launcher3/model/WorkspaceItemProcessorTest.kt index c7abce6e5e..ed8b39740d 100644 --- a/tests/multivalentTests/src/com/android/launcher3/model/WorkspaceItemProcessorTest.kt +++ b/tests/multivalentTests/src/com/android/launcher3/model/WorkspaceItemProcessorTest.kt @@ -58,7 +58,6 @@ import com.android.launcher3.widget.WidgetInflater import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertWithMessage import org.junit.Before -import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.mockito.ArgumentCaptor @@ -77,8 +76,6 @@ import org.mockito.kotlin.whenever @RunWith(AndroidJUnit4::class) class WorkspaceItemProcessorTest { - @get:Rule val modelTestRule = ModelTestRule() - @Mock private lateinit var mockIconRequestInfo: IconRequestInfo @Mock private lateinit var mockWorkspaceInfo: WorkspaceItemInfo @Mock private lateinit var mockBgDataModel: BgDataModel diff --git a/tests/multivalentTests/src/com/android/launcher3/model/WorkspaceItemSpaceFinderTest.kt b/tests/multivalentTests/src/com/android/launcher3/model/WorkspaceItemSpaceFinderTest.kt index ae8e96612b..dd03eee12c 100644 --- a/tests/multivalentTests/src/com/android/launcher3/model/WorkspaceItemSpaceFinderTest.kt +++ b/tests/multivalentTests/src/com/android/launcher3/model/WorkspaceItemSpaceFinderTest.kt @@ -21,7 +21,6 @@ import androidx.test.filters.SmallTest import com.google.common.truth.Truth.assertThat import org.junit.After import org.junit.Before -import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith @@ -30,8 +29,6 @@ import org.junit.runner.RunWith @RunWith(AndroidJUnit4::class) class WorkspaceItemSpaceFinderTest : AbstractWorkspaceModelTest() { - @get:Rule val modelTestRule = ModelTestRule() - private val mItemSpaceFinder = WorkspaceItemSpaceFinder() @Before @@ -52,7 +49,7 @@ class WorkspaceItemSpaceFinderTest : AbstractWorkspaceModelTest() { mExistingScreens, mNewScreens, spanX, - spanY + spanY, ) .let { NewItemSpace.fromIntArray(it) } @@ -62,7 +59,7 @@ class WorkspaceItemSpaceFinderTest : AbstractWorkspaceModelTest() { newItemSpace.cellX, newItemSpace.cellY, spanX, - spanY + spanY, ) ) .isTrue() @@ -171,7 +168,7 @@ class WorkspaceItemSpaceFinderTest : AbstractWorkspaceModelTest() { screen0 = listOf(Rect(2, 0, 5, 2)), screen1 = fullScreenSpaces, // full screens are skipped screen2 = fullScreenSpaces, // full screens are skipped - screen3 = emptyScreenSpaces + screen3 = emptyScreenSpaces, ) val spaceFound = findSpace(3, 1) diff --git a/tests/multivalentTests/src/com/android/launcher3/pm/InstallSessionTrackerTest.kt b/tests/multivalentTests/src/com/android/launcher3/pm/InstallSessionTrackerTest.kt index d860710a34..15a9964a5f 100644 --- a/tests/multivalentTests/src/com/android/launcher3/pm/InstallSessionTrackerTest.kt +++ b/tests/multivalentTests/src/com/android/launcher3/pm/InstallSessionTrackerTest.kt @@ -26,7 +26,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SdkSuppress import androidx.test.filters.SmallTest import com.android.launcher3.Flags.FLAG_ENABLE_SUPPORT_FOR_ARCHIVING -import com.android.launcher3.model.ModelTestRule import com.android.launcher3.util.Executors.MODEL_EXECUTOR import com.android.launcher3.util.LauncherModelHelper import com.android.launcher3.util.PackageUserKey @@ -45,9 +44,7 @@ import org.mockito.kotlin.whenever @SmallTest @RunWith(AndroidJUnit4::class) class InstallSessionTrackerTest { - @get:Rule(order = 0) val setFlagsRule = SetFlagsRule() - - @get:Rule(order = 1) val modelTestRule = ModelTestRule() + @get:Rule val setFlagsRule = SetFlagsRule() private val mockInstallSessionHelper: InstallSessionHelper = mock() private val mockCallback: InstallSessionTracker.Callback = mock() @@ -67,7 +64,7 @@ class InstallSessionTrackerTest { mockInstallSessionHelper, mockCallback, mockPackageInstaller, - launcherApps + launcherApps, ) } diff --git a/tests/multivalentTests/src/com/android/launcher3/pm/UserCacheTest.kt b/tests/multivalentTests/src/com/android/launcher3/pm/UserCacheTest.kt index 482dcedb0e..5f08c31f35 100644 --- a/tests/multivalentTests/src/com/android/launcher3/pm/UserCacheTest.kt +++ b/tests/multivalentTests/src/com/android/launcher3/pm/UserCacheTest.kt @@ -20,7 +20,6 @@ import android.os.Process.myUserHandle import android.os.UserHandle import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry -import com.android.launcher3.model.ModelTestRule import com.android.launcher3.util.Executors.MODEL_EXECUTOR import com.android.launcher3.util.LauncherModelHelper import com.android.launcher3.util.TestUtil @@ -28,15 +27,12 @@ import com.android.launcher3.util.UserIconInfo import com.google.common.truth.Truth.assertThat import org.junit.After import org.junit.Before -import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith @RunWith(AndroidJUnit4::class) class UserCacheTest { - @get:Rule val modelTestRule = ModelTestRule() - private val launcherModelHelper = LauncherModelHelper() private val sandboxContext = launcherModelHelper.sandboxContext private lateinit var userCache: UserCache diff --git a/tests/src/com/android/launcher3/model/PackageUpdatedTaskTest.kt b/tests/src/com/android/launcher3/model/PackageUpdatedTaskTest.kt index 05f626d207..d9af07a196 100644 --- a/tests/src/com/android/launcher3/model/PackageUpdatedTaskTest.kt +++ b/tests/src/com/android/launcher3/model/PackageUpdatedTaskTest.kt @@ -58,8 +58,7 @@ import org.mockito.kotlin.whenever @RunWith(AndroidJUnit4::class) class PackageUpdatedTaskTest { - @get:Rule(order = 0) val setFlagsRule = SetFlagsRule() - @get:Rule(order = 1) val modelTestRule = ModelTestRule() + @get:Rule val setFlagsRule = SetFlagsRule() private val mUser = UserHandle(0) private val mDataModel: BgDataModel = BgDataModel() diff --git a/tests/src/com/android/launcher3/util/RoboApiWrapper.kt b/tests/src/com/android/launcher3/util/RoboApiWrapper.kt index 583652dc49..7f74e56f2a 100644 --- a/tests/src/com/android/launcher3/util/RoboApiWrapper.kt +++ b/tests/src/com/android/launcher3/util/RoboApiWrapper.kt @@ -24,12 +24,10 @@ import java.util.function.Supplier object RoboApiWrapper { - fun initialize() {} - fun registerInputStream( contentResolver: ContentResolver, uri: Uri, - inputStreamSupplier: Supplier + inputStreamSupplier: Supplier, ) {} fun waitForLooperSync(looper: Looper) {} diff --git a/tests/src_deviceless/com/android/launcher3/util/RoboApiWrapper.kt b/tests/src_deviceless/com/android/launcher3/util/RoboApiWrapper.kt index 92322686d9..a2b8303386 100644 --- a/tests/src_deviceless/com/android/launcher3/util/RoboApiWrapper.kt +++ b/tests/src_deviceless/com/android/launcher3/util/RoboApiWrapper.kt @@ -16,70 +16,19 @@ package com.android.launcher3.util -import android.content.ComponentName import android.content.ContentResolver -import android.content.Intent -import android.content.IntentFilter -import android.content.pm.ApplicationInfo -import android.content.pm.LauncherActivityInfo -import android.content.pm.LauncherApps import android.net.Uri import android.os.Looper -import android.os.Process -import androidx.test.platform.app.InstrumentationRegistry import java.io.InputStream import java.util.function.Supplier -import org.mockito.Mockito -import org.mockito.kotlin.whenever -import org.robolectric.RuntimeEnvironment import org.robolectric.Shadows object RoboApiWrapper { - fun initialize() { - Shadows.shadowOf( - RuntimeEnvironment.getApplication().getSystemService(LauncherApps::class.java) - ) - .addEnabledPackage( - Process.myUserHandle(), - InstrumentationRegistry.getInstrumentation().context.packageName - ) - LauncherModelHelper.ACTIVITY_LIST.forEach { - installApp(ComponentName(InstrumentationRegistry.getInstrumentation().context, it)) - } - } - - private fun installApp(componentName: ComponentName) { - val app = RuntimeEnvironment.getApplication() - val user = Process.myUserHandle() - - val pm = Shadows.shadowOf(app.packageManager) - val ai = pm.addActivityIfNotPresent(componentName) - pm.addIntentFilterForActivity( - componentName, - IntentFilter(Intent.ACTION_MAIN).apply { addCategory(Intent.CATEGORY_LAUNCHER) } - ) - - val li = Mockito.mock(LauncherActivityInfo::class.java) - val appInfo = ApplicationInfo().apply { flags = 0 } - Mockito.doReturn(ai).whenever(li).activityInfo - Mockito.doReturn(appInfo).whenever(li).applicationInfo - Mockito.doReturn(user).whenever(li).user - Mockito.doReturn(1f).whenever(li).loadingProgress - Mockito.doReturn(componentName).whenever(li).componentName - - Shadows.shadowOf(app.getSystemService(LauncherApps::class.java)).apply { - addActivity(user, li) - addEnabledPackage(user, componentName.packageName) - setActivityEnabled(user, componentName) - addApplicationInfo(user, componentName.packageName, ai.applicationInfo) - } - } - fun registerInputStream( contentResolver: ContentResolver, uri: Uri, - inputStreamSupplier: Supplier + inputStreamSupplier: Supplier, ) { Shadows.shadowOf(contentResolver).registerInputStreamSupplier(uri, inputStreamSupplier) }