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

Commit f45b9cae authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use androidx.test.filters package for annotations"

parents 452bb886 3df367e3

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/LaunchBubbleFromLockScreen.kt

+2 −6
Original line number Diff line number Diff line
@@ -94,13 +94,9 @@ class LaunchBubbleFromLockScreen(flicker: FlickerTest) : BaseBubbleScreen(flicke 
        flicker.assertLayersEnd { this.isVisible(testApp) }

    }



    @Postsubmit

    @Test

    fun navBarLayerIsVisibleAtEnd() = flicker.navBarLayerIsVisibleAtEnd()

    @Postsubmit @Test fun navBarLayerIsVisibleAtEnd() = flicker.navBarLayerIsVisibleAtEnd()



    @Postsubmit

    @Test

    fun navBarLayerPositionAtEnd() = flicker.navBarLayerPositionAtEnd()

    @Postsubmit @Test fun navBarLayerPositionAtEnd() = flicker.navBarLayerPositionAtEnd()



    /** {@inheritDoc} */

    @FlakyTest

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/LaunchBubbleScreen.kt

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.wm.shell.flicker.bubble



import android.platform.test.annotations.RequiresDevice

import androidx.test.filters.RequiresDevice

import androidx.test.uiautomator.By

import androidx.test.uiautomator.Until

import com.android.server.wm.flicker.FlickerBuilder

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/MovePipDownShelfHeightChangeTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package com.android.wm.shell.flicker.pip



import android.platform.test.annotations.Presubmit

import android.platform.test.annotations.RequiresDevice

import androidx.test.filters.RequiresDevice

import com.android.server.wm.flicker.FlickerBuilder

import com.android.server.wm.flicker.FlickerTest

import com.android.server.wm.flicker.FlickerTestFactory

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/tv/PipTestBase.kt

+1 −4
Original line number Diff line number Diff line
@@ -24,10 +24,7 @@ import androidx.test.uiautomator.UiDevice 
import org.junit.Before

import org.junit.runners.Parameterized



abstract class PipTestBase(

    protected val rotationName: String,

    protected val rotation: Int

) {

abstract class PipTestBase(protected val rotationName: String, protected val rotation: Int) {

    val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()

    val uiDevice = UiDevice.getInstance(instrumentation)

    val packageManager: PackageManager = instrumentation.context.packageManager

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/DragDividerToResize.kt

+2 −1
Original line number Diff line number Diff line
@@ -93,7 +93,8 @@ class DragDividerToResize(flicker: FlickerTest) : SplitScreenBase(flicker) { 
    }



    @FlakyTest(bugId = 263213649)

    @Test fun primaryAppLayerKeepVisible_ShellTransit() {

    @Test

    fun primaryAppLayerKeepVisible_ShellTransit() {

        Assume.assumeTrue(isShellTransitionsEnabled)

        flicker.layerKeepVisible(primaryApp)

    }