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

Commit ac4064d0 authored by Nataniel Borges's avatar Nataniel Borges
Browse files

Split pip tests in different modules to enable sharding and reduce runtime 

Temporarily keep a `WMShellPipTests` module for compatibility with the presubmit configuration. This will be removed in a future CL after presubmit is updated to avoid causing instability

Bug: 301574363
Test: atest WMShellFlickerTestsPip
Change-Id: I3aa7de019ec1d2a0871206499bbc59fdf6677bf6
parent e87aad56

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

+66 −3
Original line number Original line Diff line number Diff line
@@ -39,7 +39,25 @@ filegroup { 
}

}





filegroup {

filegroup {

    name: "WMShellFlickerTestsPip-src",

    name: "WMShellFlickerTestsPip1-src",

    srcs: [

        "src/com/android/wm/shell/flicker/pip/A*.kt",

        "src/com/android/wm/shell/flicker/pip/B*.kt",

        "src/com/android/wm/shell/flicker/pip/C*.kt",

        "src/com/android/wm/shell/flicker/pip/D*.kt",

        "src/com/android/wm/shell/flicker/pip/S*.kt",

    ],

}



filegroup {

    name: "WMShellFlickerTestsPip2-src",

    srcs: [

        "src/com/android/wm/shell/flicker/pip/E*.kt",

    ],

}



filegroup {

    name: "WMShellFlickerTestsPip3-src",

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

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

}

}
@@ -176,7 +194,9 @@ android_test { 
    ],

    ],

    exclude_srcs: [

    exclude_srcs: [

        ":WMShellFlickerTestsBubbles-src",

        ":WMShellFlickerTestsBubbles-src",

        ":WMShellFlickerTestsPip-src",

        ":WMShellFlickerTestsPip1-src",

        ":WMShellFlickerTestsPip2-src",

        ":WMShellFlickerTestsPip3-src",

        ":WMShellFlickerTestsPipCommon-src",

        ":WMShellFlickerTestsPipCommon-src",

        ":WMShellFlickerTestsPipApps-src",

        ":WMShellFlickerTestsPipApps-src",

        ":WMShellFlickerTestsSplitScreenGroup1-src",

        ":WMShellFlickerTestsSplitScreenGroup1-src",
@@ -207,11 +227,54 @@ android_test { 
    instrumentation_target_package: "com.android.wm.shell.flicker.pip",

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

    srcs: [

    srcs: [

        ":WMShellFlickerTestsBase-src",

        ":WMShellFlickerTestsBase-src",

        ":WMShellFlickerTestsPip-src",

        ":WMShellFlickerTestsPip3-src",

        ":WMShellFlickerTestsPipCommon-src",

        ":WMShellFlickerTestsPipCommon-src",

    ],

    ],

}

}





android_test {

    name: "WMShellFlickerTestsPip1",

    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",

        ":WMShellFlickerTestsPip1-src",

        ":WMShellFlickerTestsPipCommon-src",

    ],

}



android_test {

    name: "WMShellFlickerTestsPip2",

    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",

        ":WMShellFlickerTestsPip2-src",

        ":WMShellFlickerTestsPipCommon-src",

    ],

}



android_test {

    name: "WMShellFlickerTestsPip3",

    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",

        ":WMShellFlickerTestsPip3-src",

        ":WMShellFlickerTestsPipCommon-src",

    ],

    exclude_srcs: [

        ":WMShellFlickerTestsPip1-src",

        ":WMShellFlickerTestsPip2-src",

    ],

}



android_test {

android_test {

    name: "WMShellFlickerTestsPipApps",

    name: "WMShellFlickerTestsPipApps",

    defaults: ["WMShellFlickerTestsDefault"],

    defaults: ["WMShellFlickerTestsDefault"],

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ import android.tools.device.flicker.legacy.FlickerBuilder 
import android.tools.device.flicker.legacy.LegacyFlickerTest

import android.tools.device.flicker.legacy.LegacyFlickerTest

import androidx.test.filters.FlakyTest

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice

import androidx.test.filters.RequiresDevice

import com.android.wm.shell.flicker.pip.common.EnterPipTransition

import org.junit.Assume

import org.junit.Assume

import org.junit.FixMethodOrder

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.Test
@@ -55,7 +56,7 @@ import org.junit.runners.Parameterized 
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

open class AutoEnterPipOnGoToHomeTest(flicker: LegacyFlickerTest) :

open class AutoEnterPipOnGoToHomeTest(flicker: LegacyFlickerTest) :

    EnterPipViaAppUiButtonTest(flicker) {

    EnterPipTransition(flicker) {

    override val thisTransition: FlickerBuilder.() -> Unit = { transitions { tapl.goHome() } }

    override val thisTransition: FlickerBuilder.() -> Unit = { transitions { tapl.goHome() } }





    override val defaultEnterPip: FlickerBuilder.() -> Unit = {

    override val defaultEnterPip: FlickerBuilder.() -> Unit = {