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

Commit 160b9dfc authored by Nataniel Borges's avatar Nataniel Borges
Browse files

Split flicker configuration 

Split into multiple modules for better test sharding. This should reduce the overall test time, while keeping the same CUJ in the same shard to avoid extra rerun costs

Bug: 277902000
Test: atest FlickerTests WMShellFlickerTests
Change-Id: I044d958211805687ffbd82c71d214f4094958de3
parent 51c7ac44

libs/WindowManager/Shell/tests/flicker/Android.bp

+85 −13
Original line number Diff line number Diff line
@@ -23,14 +23,33 @@ package { 
    default_applicable_licenses: ["frameworks_base_license"],

}



android_test {

    name: "WMShellFlickerTests",

filegroup {

    name: "WMShellFlickerTestsBase-src",

    srcs: ["src/com/android/wm/shell/flicker/*.kt"],

}



filegroup {

    name: "WMShellFlickerTestsBubbles-src",

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

}



filegroup {

    name: "WMShellFlickerTestsPip-src",

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

}



filegroup {

    name: "WMShellFlickerTestsSplitScreen-src",

    srcs: [

        "src/**/*.java",

        "src/**/*.kt",

        "src/**/splitscreen/*.kt",

        "src/**/splitscreen/benchmark/*.kt",

    ],

    manifest: "AndroidManifest.xml",

    test_config: "AndroidTest.xml",

}



java_defaults {

    name: "WMShellFlickerTestsDefault",

    manifest: "manifests/AndroidManifest.xml",

    test_config_template: "AndroidTestTemplate.xml",

    platform_apis: true,

    certificate: "platform",

    optimize: {
@@ -40,16 +59,69 @@ android_test { 
    libs: ["android.test.runner"],

    static_libs: [

        "androidx.test.ext.junit",

        "flickertestapplib",

        "flickerlib",

        "flickerlib-apphelpers",

        "flickerlib-helpers",

        "truth-prebuilt",

        "app-helpers-core",

        "platform-test-annotations",

        "wm-flicker-common-app-helpers",

        "wm-flicker-common-assertions",

        "launcher-helper-lib",

        "launcher-aosp-tapl",

        "wm-flicker-common-assertions",

        "wm-flicker-common-app-helpers",

        "platform-test-annotations",

        "flickertestapplib",

    ],

    data: [

        ":FlickerTestApp",

    ],

}



android_test {

    name: "WMShellFlickerTestsOther",

    defaults: ["WMShellFlickerTestsDefault"],

    additional_manifests: ["manifests/AndroidManifestOther.xml"],

    package_name: "com.android.wm.shell.flicker",

    instrumentation_target_package: "com.android.wm.shell.flicker",

    srcs: [

        "src/**/*.java",

        "src/**/*.kt",

    ],

    exclude_srcs: [

        ":WMShellFlickerTestsBubbles-src",

        ":WMShellFlickerTestsPip-src",

        ":WMShellFlickerTestsSplitScreen-src",

    ],

}



android_test {

    name: "WMShellFlickerTestsBubbles",

    defaults: ["WMShellFlickerTestsDefault"],

    additional_manifests: ["manifests/AndroidManifestBubbles.xml"],

    package_name: "com.android.wm.shell.flicker.bubbles",

    instrumentation_target_package: "com.android.wm.shell.flicker.bubbles",

    srcs: [

        ":WMShellFlickerTestsBase-src",

        ":WMShellFlickerTestsBubbles-src",

    ],

}



android_test {

    name: "WMShellFlickerTestsPip",

    defaults: ["WMShellFlickerTestsDefault"],

    additional_manifests: ["manifests/AndroidManifestPip.xml"],

    package_name: "com.android.wm.shell.flicker.pip",

    instrumentation_target_package: "com.android.wm.shell.flicker.pip",

    srcs: [

        ":WMShellFlickerTestsBase-src",

        ":WMShellFlickerTestsPip-src",

    ],

}



android_test {

    name: "WMShellFlickerTestsSplitScreen",

    defaults: ["WMShellFlickerTestsDefault"],

    additional_manifests: ["manifests/AndroidManifestSplitScreen.xml"],

    package_name: "com.android.wm.shell.flicker.splitscreen",

    instrumentation_target_package: "com.android.wm.shell.flicker.splitscreen",

    srcs: [

        ":WMShellFlickerTestsBase-src",

        ":WMShellFlickerTestsSplitScreen-src",

    ],

}

libs/WindowManager/Shell/tests/flicker/AndroidTest.xml→libs/WindowManager/Shell/tests/flicker/AndroidTestTemplate.xml

+17 −5
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

 * Copyright 2020 Google Inc. All Rights Reserved.

  ~ Copyright (C) 2023 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

<configuration description="Runs WindowManager Shell Flicker Tests">

<configuration description="Runs WindowManager Shell Flicker Tests {MODULE}">

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

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

        <!-- keeps the screen on during tests -->
@@ -36,11 +48,11 @@ 
    </target_preparer>

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

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

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

        <option name="test-file-name" value="{MODULE}.apk"/>

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

    </target_preparer>

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

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

        <option name="package" value="{PACKAGE}"/>

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

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

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

libs/WindowManager/Shell/tests/flicker/manifests/AndroidManifestBubbles.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2023 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.wm.shell.flicker.bubble">



    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"

                     android:targetPackage="com.android.wm.shell.flicker.bubble"

                     android:label="WindowManager Flicker Tests">

    </instrumentation>

</manifest>

libs/WindowManager/Shell/tests/flicker/manifests/AndroidManifestOther.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2023 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.wm.shell.flicker">



    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"

                     android:targetPackage="com.android.wm.shell.flicker"

                     android:label="WindowManager Flicker Tests">

    </instrumentation>

</manifest>