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

Commit 5b36cc03 authored by Nataniel Borges's avatar Nataniel Borges Committed by Android (Google) Code Review
Browse files

Merge "Improve bubble test naming"

parents d6310c0b 8afa1fab

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/MultiBubblesScreen.kt→libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/ChangeActiveActivityFromBubbleTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ import org.junit.runners.Parameterized 
@RequiresDevice

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

open class MultiBubblesScreen(flicker: FlickerTest) : BaseBubbleScreen(flicker) {

open class ChangeActiveActivityFromBubbleTest(flicker: FlickerTest) : BaseBubbleScreen(flicker) {



    @Before

    open fun before() {

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/ExpandBubbleScreenCfArm.kt→libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/ChangeActiveActivityFromBubbleTestCfArm.kt

+2 −1
Original line number Diff line number Diff line
@@ -23,4 +23,5 @@ import org.junit.runners.Parameterized 


@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

class ExpandBubbleScreenCfArm(flicker: FlickerTest) : ExpandBubbleScreen(flicker)
 
open class ChangeActiveActivityFromBubbleTestCfArm(flicker: FlickerTest) :

    ChangeActiveActivityFromBubbleTest(flicker)

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/MultiBubblesScreenShellTransit.kt→libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/ChangeActiveActivityFromBubbleTestShellTransit.kt

+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FlakyTest(bugId = 217777115)

class MultiBubblesScreenShellTransit(flicker: FlickerTest) : MultiBubblesScreen(flicker) {

class ChangeActiveActivityFromBubbleTestShellTransit(flicker: FlickerTest) :

    ChangeActiveActivityFromBubbleTest(flicker) {

    @Before

    override fun before() {

        Assume.assumeTrue(isShellTransitionsEnabled)

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/DismissBubbleScreen.kt→libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/DragToDismissBubbleScreenTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ import org.junit.runners.Parameterized 
@RequiresDevice

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

open class DismissBubbleScreen(flicker: FlickerTest) : BaseBubbleScreen(flicker) {

open class DragToDismissBubbleScreenTest(flicker: FlickerTest) : BaseBubbleScreen(flicker) {



    private val wm = context.getSystemService(Context.WINDOW_SERVICE) as WindowManager

    private val displaySize = DisplayMetrics()

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/LaunchBubbleScreenCfArm.kt→libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/DragToDismissBubbleScreenTestCfArm.kt

+2 −1
Original line number Diff line number Diff line
@@ -23,4 +23,5 @@ import org.junit.runners.Parameterized 


@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

open class LaunchBubbleScreenCfArm(flicker: FlickerTest) : LaunchBubbleScreen(flicker)
 
class DragToDismissBubbleScreenTestCfArm(flicker: FlickerTest) :

    DragToDismissBubbleScreenTest(flicker)