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

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

Merge changes Ifb73b678,Iec3df925 into main 

* changes:
  Use ScreenRecordRule for functional Desktop e2e tests
  Add base class for desktop e2e test scenarios
parents 38ea04a0 f1bca291

libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/AndroidTestTemplate.xml

+4 −3
Original line number Diff line number Diff line
@@ -65,7 +65,9 @@ 
    </target_preparer>



    <!-- Needed for pushing the trace config file -->

    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>

    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer">

        <option name="force-root" value="true" />

    </target_preparer>

    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">

        <option name="push-file"

                key="trace_config.textproto"
@@ -90,9 +92,8 @@ 
        <option name="instrumentation-arg" key="per_run" value="true"/>

        <option name="instrumentation-arg" key="perfetto_persist_pid_track" value="true"/>

    </test>

    <!-- Needed for pulling the collected trace config on to the host -->

    <!-- Needed for pulling the collected trace config and screenrecord to the host -->

    <metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector">

        <option name="pull-pattern-keys" value="perfetto_file_path"/>

        <option name="directory-keys"

                value="/data/user/0/com.android.wm.shell.flicker/files"/>

        <option name="collect-on-run-ended-only" value="true"/>

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

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


package com.android.wm.shell.functional



import android.platform.test.rule.ScreenRecordRule

import com.android.wm.shell.scenarios.AltTabSwitchInDesktopMode

import org.junit.Ignore

import org.junit.runner.RunWith
@@ -23,5 +24,6 @@ import org.junit.runners.BlockJUnit4ClassRunner 


/* Functional test for [AltTabSwitchInDesktopMode]. */

@RunWith(BlockJUnit4ClassRunner::class)

@ScreenRecordRule.ScreenRecord

@Ignore("Blocked by b/392820286, include in Postsubmit, when the issue is resolved")

class AltTabSwitchInDesktopModeTest : AltTabSwitchInDesktopMode()

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

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



import android.platform.test.annotations.Postsubmit

import android.platform.test.rule.ScreenRecordRule

import com.android.wm.shell.scenarios.BringDesktopAppsToFront

import org.junit.runner.RunWith

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

@RunWith(BlockJUnit4ClassRunner::class)

@Postsubmit

@ScreenRecordRule.ScreenRecord

class BringDesktopAppsToFrontTest : BringDesktopAppsToFront()

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/functional/CloseAllAppsWithAppHeaderExitTest.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.Postsubmit

import android.platform.test.rule.ScreenRecordRule

import com.android.wm.shell.scenarios.CloseAllAppsWithAppHeaderExit

import org.junit.runner.RunWith

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

@RunWith(BlockJUnit4ClassRunner::class)

@Postsubmit

@ScreenRecordRule.ScreenRecord

class CloseAllAppsWithAppHeaderExitTest() : CloseAllAppsWithAppHeaderExit()

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/functional/EnterDesktopViaMenuOfLiveOverviewTaskTest.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.Postsubmit

import android.platform.test.rule.ScreenRecordRule

import com.android.wm.shell.scenarios.EnterDesktopViaMenuOfLiveOverviewTask

import org.junit.runner.RunWith

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

@RunWith(BlockJUnit4ClassRunner::class)

@Postsubmit

@ScreenRecordRule.ScreenRecord

class EnterDesktopViaMenuOfLiveOverviewTaskTest : EnterDesktopViaMenuOfLiveOverviewTask()