Merge "Add missing Rule for Flags" into main

This commit is contained in:
Massimo Carli
2025-03-17 03:01:26 -07:00
committed by Android (Google) Code Review
@@ -22,6 +22,7 @@ import android.content.Intent
import android.content.pm.PackageManager
import android.platform.test.annotations.DisableFlags
import android.platform.test.annotations.EnableFlags
import android.platform.test.flag.junit.SetFlagsRule
import android.view.Display.DEFAULT_DISPLAY
import androidx.test.platform.app.InstrumentationRegistry
import com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession
@@ -52,6 +53,7 @@ import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource
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.mockito.Mockito.`when`
import org.mockito.kotlin.any
@@ -64,8 +66,11 @@ import org.mockito.kotlin.whenever
import org.mockito.quality.Strictness
/** Test for [DesktopSystemShortcut] */
// TODO(b/403558856): Improve test coverage for DesktopModeCompatPolicy integration.
class DesktopSystemShortcutTest {
@get:Rule val setFlagsRule = SetFlagsRule(SetFlagsRule.DefaultInitValueType.DEVICE_DEFAULT)
private val launcher: RecentsViewContainer = mock()
private val statsLogManager: StatsLogManager = mock()
private val statsLogger: StatsLogManager.StatsLogger = mock()