aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-11 06:44:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Run UiThreadTest in LauncherMultivalentJUnit" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-06-05 17:02:46 +00:00
committed by Android (Google) Code Review
parent 901edc82e6 3b2a136272
commit e8638f4eb2
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/src/com/android/launcher3/util/DisplayControllerTest.kt → tests/multivalentTests/src/com/android/launcher3/util/DisplayControllerTest.kt
View File

@@ -27,7 +27,6 @@ import android.view.Display
import android.view.Surface
import androidx.test.annotation.UiThreadTest
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.SmallTest
import com.android.launcher3.LauncherPrefs
import com.android.launcher3.LauncherPrefs.Companion.TASKBAR_PINNING
@@ -55,7 +54,7 @@ import org.mockito.stubbing.Answer
/** Unit tests for {@link DisplayController} */
@SmallTest
@RunWith(AndroidJUnit4::class)
@RunWith(LauncherMultivalentJUnit::class)
class DisplayControllerTest {
private val appContext: Context = ApplicationProvider.getApplicationContext()

4
tests/src/com/android/launcher3/popup/SystemShortcutTest.java
View File

@@ -49,7 +49,6 @@ import android.platform.test.flag.junit.SetFlagsRule;
import android.view.View;
import androidx.test.annotation.UiThreadTest;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.SmallTest;
import com.android.launcher3.allapps.PrivateProfileManager;
@@ -60,6 +59,7 @@ import com.android.launcher3.pm.UserCache;
import com.android.launcher3.util.ApiWrapper;
import com.android.launcher3.util.ComponentKey;
import com.android.launcher3.util.LauncherModelHelper.SandboxModelContext;
import com.android.launcher3.util.LauncherMultivalentJUnit;
import com.android.launcher3.util.TestSandboxModelContextWrapper;
import com.android.launcher3.util.UserIconInfo;
import com.android.launcher3.views.BaseDragLayer;
@@ -76,7 +76,7 @@ import org.mockito.MockitoAnnotations;
import java.util.ArrayList;
@SmallTest
@RunWith(AndroidJUnit4.class)
@RunWith(LauncherMultivalentJUnit.class)
public class SystemShortcutTest {
@Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(DEVICE_DEFAULT);
private static final UserHandle PRIVATE_HANDLE = new UserHandle(11);