Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44d69e21 authored by Pragya Bajoria's avatar Pragya Bajoria Committed by Android (Google) Code Review
Browse files

Merge "Add SetFlagsRule to DesktopRepositoryTest to fix the flag framework." into main

parents d668fbac 42a8b6d4
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.wm.shell.desktopmode

import android.graphics.Rect
import android.platform.test.annotations.EnableFlags
import android.platform.test.flag.junit.SetFlagsRule
import android.testing.AndroidTestingRunner
import android.util.ArraySet
import android.view.Display.DEFAULT_DISPLAY
@@ -43,6 +44,7 @@ import kotlinx.coroutines.test.runTest
import kotlinx.coroutines.test.setMain
import org.junit.After
import org.junit.Before
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import org.mockito.Mock
@@ -58,6 +60,8 @@ import org.mockito.kotlin.whenever
@ExperimentalCoroutinesApi
class DesktopRepositoryTest : ShellTestCase() {

    @JvmField @Rule val setFlagsRule = SetFlagsRule()

    private lateinit var repo: DesktopRepository
    private lateinit var shellInit: ShellInit
    private lateinit var datastoreScope: CoroutineScope