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

Commit d4fca214 authored by Nergi Rahardi's avatar Nergi Rahardi Committed by Android (Google) Code Review
Browse files

Merge "Add screen record annotation to better debug failing/flaky tests" into main

parents 820dec16 aa28d8ef

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/functional/DragMoveWindowToNextDisplayTest.kt

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.wm.shell.functional



import android.platform.test.annotations.Presubmit

import android.platform.test.rule.ScreenRecordRule

import com.android.wm.shell.scenarios.DragMoveWindowToNextDisplay

import org.junit.runner.RunWith

import org.junit.runners.BlockJUnit4ClassRunner
@@ -24,4 +25,5 @@ import org.junit.runners.BlockJUnit4ClassRunner 
/* Functional test for [DragMoveWindowToNextDisplay]. */

@RunWith(BlockJUnit4ClassRunner::class)

@Presubmit

@ScreenRecordRule.ScreenRecord

class DragMoveWindowToNextDisplayTest : DragMoveWindowToNextDisplay()

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/DragMoveWindowToNextDisplay.kt

+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.graphics.Point 
import android.hardware.display.DisplayManager

import android.platform.test.annotations.RequiresFlagsEnabled

import android.platform.test.flag.junit.DeviceFlagsValueProvider

import android.platform.test.rule.ScreenRecordRule

import android.tools.NavBar

import android.tools.Rotation

import android.tools.traces.parsers.WindowManagerStateHelper
@@ -59,6 +60,8 @@ abstract class DragMoveWindowToNextDisplay { 
    val testSetupRule = Utils.testSetupRule(NavBar.MODE_GESTURAL, Rotation.ROTATION_0)

    @get:Rule(order = 2) val connectedDisplayRule = SimulatedConnectedDisplayTestRule()

    @get:Rule(order = 3) val desktopMouseRule = DesktopMouseTestRule()

    @get:Rule(order = 4)

    val screenRecordRule = ScreenRecordRule(/* keepTestLevelRecordingOnSuccess= */ false)



    @Before

    fun setup() {