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

Commit 2b707c57 authored by Nataniel Borges's avatar Nataniel Borges
Browse files

Use annotation for tests that require a device 

Currently all flicker tests run on a physical devices.

In the future, some flicker tests may run on a physical devices
and others may run on virtual devices for scalability. In this CL
we use the "RequireDevice" annotation to indicate which tests should
run on device

Test: atest FlickerTests
Change-Id: I472c30612535310265717a5ae420feb534159c41
parent babd37c8

tests/FlickerTests/Android.bp

+22 −1
Original line number Diff line number Diff line
@@ -18,7 +18,28 @@ android_test { 
    name: "FlickerTests",

    srcs: ["src/**/*.java", "src/**/*.kt"],

    manifest: "AndroidManifest.xml",

    test_config: "AndroidTest.xml",

    test_config: "AndroidTestPhysicalDevices.xml",

    platform_apis: true,

    certificate: "platform",

    test_suites: ["device-tests"],

    libs: ["android.test.runner"],

    static_libs: [

        "androidx.test.ext.junit",

        "flickertestapplib",

        "flickerlib",

        "truth-prebuilt",

        "app-helpers-core",

        "launcher-helper-lib",

        "launcher-aosp-tapl"

    ],

}





android_test {

    name: "FlickerTestsVirtual",

    srcs: ["src/**/*.java", "src/**/*.kt"],

    manifest: "AndroidManifest.xml",

    test_config: "AndroidTestVirtualDevices.xml",

    platform_apis: true,

    certificate: "platform",

    test_suites: ["device-tests"],

tests/FlickerTests/AndroidTest.xml→tests/FlickerTests/AndroidTestPhysicalDevices.xml

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
    </target_preparer>

    <test class="com.android.tradefed.testtype.AndroidJUnitTest">

        <option name="package" value="com.android.server.wm.flicker"/>

        <option name="include-annotation" value="androidx.test.filters.RequiresDevice" />

        <option name="exclude-annotation" value="androidx.test.filters.FlakyTest" />

        <option name="shell-timeout" value="6600s" />

        <option name="test-timeout" value="6000s" />

tests/FlickerTests/AndroidTestVirtualDevices.xml

0 → 100644
+41 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

 * Copyright 2018 Google Inc. All Rights Reserved.

 -->

<configuration description="Runs WindowManager Flicker Tests">

    <option name="test-tag" value="FlickerTests" />

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

        <!-- keeps the screen on during tests -->

        <option name="screen-always-on" value="on" />

        <!-- prevents the phone from restarting -->

        <option name="force-skip-system-props" value="true" />

        <!-- set WM tracing verbose level to all -->

        <option name="run-command" value="cmd window tracing level all" />

        <!-- inform WM to log all transactions -->

        <option name="run-command" value="cmd window tracing transaction" />

        <!-- restart launcher to activate TAPL -->

        <option name="run-command" value="setprop ro.test_harness 1 ; am force-stop com.google.android.apps.nexuslauncher" />

    </target_preparer>

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

        <!-- reboot the device to teardown any crashed tests -->

        <option name="cleanup-action" value="REBOOT" />

    </target_preparer>

    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">

        <option name="cleanup-apks" value="true"/>

        <option name="test-file-name" value="FlickerTests.apk"/>

        <option name="test-file-name" value="FlickerTestApp.apk" />

    </target_preparer>

    <test class="com.android.tradefed.testtype.AndroidJUnitTest">

        <option name="package" value="com.android.server.wm.flicker"/>

        <option name="exclude-annotation" value="androidx.test.filters.RequiresDevice" />

        <option name="exclude-annotation" value="androidx.test.filters.FlakyTest" />

        <option name="shell-timeout" value="6600s" />

        <option name="test-timeout" value="6000s" />

        <option name="hidden-api-checks" value="false" />

    </test>

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

        <option name="directory-keys" value="/storage/emulated/0/Android/data/com.android.server.wm.flicker/files" />

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

        <option name="clean-up" value="true" />

    </metrics_collector>

</configuration>

tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToAppTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package com.android.server.wm.flicker.ime



import android.view.Surface

import androidx.test.filters.LargeTest

import androidx.test.filters.RequiresDevice

import com.android.server.wm.flicker.dsl.flicker

import com.android.server.wm.flicker.helpers.ImeAppAutoFocusHelper

import com.android.server.wm.flicker.helpers.ImeAppHelper
@@ -39,7 +39,7 @@ import org.junit.runners.Parameterized 
 * Test IME window closing back to app window transitions.

 * To run this test: `atest FlickerTests:CloseImeWindowToAppTest`

 */

@LargeTest

@RequiresDevice

@RunWith(Parameterized::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

class CloseImeAutoOpenWindowToAppTest(

tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package com.android.server.wm.flicker.ime



import android.view.Surface

import androidx.test.filters.LargeTest

import androidx.test.filters.RequiresDevice

import com.android.server.wm.flicker.dsl.flicker

import com.android.server.wm.flicker.helpers.ImeAppAutoFocusHelper

import com.android.server.wm.flicker.helpers.ImeAppHelper
@@ -39,7 +39,7 @@ import org.junit.runners.Parameterized 
 * Test IME window closing back to app window transitions.

 * To run this test: `atest FlickerTests:CloseImeWindowToAppTest`

 */

@LargeTest

@RequiresDevice

@RunWith(Parameterized::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

class CloseImeAutoOpenWindowToHomeTest(