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

Commit 448690d8 authored by Nataniel Borges's avatar Nataniel Borges
Browse files

Clean up unnecessary modules 

We now use test_module_config to split and shard the tests better and
don't need the module breakdown

Also update class javadoc to match the commands

Flag: TEST_ONLY
Fixes: 352725912
Test: atest FlickerTests WMShellFlickerTests
Change-Id: I1989a8ca838cc46d9c4e8fff6f285b5ba2e75438
parent 27a0aa54

libs/WindowManager/Shell/tests/e2e/splitscreen/flicker-legacy/Android.bp

+0 −110
Original line number Diff line number Diff line
@@ -68,116 +68,6 @@ android_test { 
    data: ["trace_config/*"],

}



////////////////////////////////////////////////////////////////////////////////

// Begin cleanup after gcl merges



filegroup {

    name: "WMShellFlickerTestsSplitScreenGroup1-src",

    srcs: [

        "src/**/A*.kt",

        "src/**/B*.kt",

        "src/**/C*.kt",

        "src/**/D*.kt",

    ],

}



filegroup {

    name: "WMShellFlickerTestsSplitScreenGroup2-src",

    srcs: [

        "src/**/E*.kt",

    ],

}



filegroup {

    name: "WMShellFlickerTestsSplitScreenGroup3-src",

    srcs: [

        "src/**/S*.kt",

    ],

}



filegroup {

    name: "WMShellFlickerTestsSplitScreenGroupOther-src",

    srcs: [

        "src/**/*.kt",

    ],

}



android_test {

    name: "WMShellFlickerTestsSplitScreenGroup1",

    defaults: ["WMShellFlickerTestsDefault"],

    manifest: "AndroidManifest.xml",

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

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

    test_config_template: "AndroidTestTemplate.xml",

    srcs: [

        ":WMShellFlickerTestsSplitScreenGroup1-src",

    ],

    static_libs: [

        "WMShellFlickerTestsBase",

        "WMShellFlickerTestsSplitScreenBase",

    ],

    data: ["trace_config/*"],

}



android_test {

    name: "WMShellFlickerTestsSplitScreenGroup2",

    defaults: ["WMShellFlickerTestsDefault"],

    manifest: "AndroidManifest.xml",

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

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

    test_config_template: "AndroidTestTemplate.xml",

    srcs: [

        ":WMShellFlickerTestsSplitScreenGroup2-src",

    ],

    static_libs: [

        "WMShellFlickerTestsBase",

        "WMShellFlickerTestsSplitScreenBase",

    ],

    data: ["trace_config/*"],

}



android_test {

    name: "WMShellFlickerTestsSplitScreenGroup3",

    defaults: ["WMShellFlickerTestsDefault"],

    manifest: "AndroidManifest.xml",

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

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

    test_config_template: "AndroidTestTemplate.xml",

    srcs: [

        ":WMShellFlickerTestsSplitScreenGroup3-src",

    ],

    static_libs: [

        "WMShellFlickerTestsBase",

        "WMShellFlickerTestsSplitScreenBase",

    ],

    data: ["trace_config/*"],

}



android_test {

    name: "WMShellFlickerTestsSplitScreenGroupOther",

    defaults: ["WMShellFlickerTestsDefault"],

    manifest: "AndroidManifest.xml",

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

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

    test_config_template: "AndroidTestTemplate.xml",

    srcs: [

        ":WMShellFlickerTestsSplitScreenGroupOther-src",

    ],

    exclude_srcs: [

        ":WMShellFlickerTestsSplitScreenGroup1-src",

        ":WMShellFlickerTestsSplitScreenGroup2-src",

        ":WMShellFlickerTestsSplitScreenGroup3-src",

    ],

    static_libs: [

        "WMShellFlickerTestsBase",

        "WMShellFlickerTestsSplitScreenBase",

    ],

    data: ["trace_config/*"],

}



////////////////////////////////////////////////////////////////////////////////

// End cleanup after gcl merges



////////////////////////////////////////////////////////////////////////////////

// Begin breakdowns for FlickerTestsRotation module

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

+0 −25
Original line number Diff line number Diff line
@@ -24,31 +24,6 @@ package { 
    default_applicable_licenses: ["frameworks_base_license"],

}



////////////////////////////////////////////////////////////////////////////////

// Begin cleanup after gcl merge



filegroup {

    name: "WMShellFlickerTestsAppCompat-src",

    srcs: [

        "src/**/*.kt",

    ],

}



android_test {

    name: "WMShellFlickerTestsOther",

    defaults: ["WMShellFlickerTestsDefault"],

    manifest: "AndroidManifest.xml",

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

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

    test_config_template: "AndroidTestTemplate.xml",

    srcs: [":WMShellFlickerTestsAppCompat-src"],

    static_libs: ["WMShellFlickerTestsBase"],

    data: ["trace_config/*"],

}



////////////////////////////////////////////////////////////////////////////////

// End cleanup after gcl merge



android_test {

    name: "WMShellFlickerTestsAppCompat",

    defaults: ["WMShellFlickerTestsDefault"],

libs/WindowManager/Shell/tests/flicker/appcompat/src/com/android/wm/shell/flicker/appcompat/OpenAppInSizeCompatModeTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ import org.junit.runners.Parameterized 
/**

 * Test launching app in size compat mode.

 *

 * To run this test: `atest WMShellFlickerTestsOther:OpenAppInSizeCompatModeTest`

 * To run this test: `atest WMShellFlickerTestsAppCompat:OpenAppInSizeCompatModeTest`

 *

 * Actions:

 * ```

libs/WindowManager/Shell/tests/flicker/appcompat/src/com/android/wm/shell/flicker/appcompat/OpenTransparentActivityTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import org.junit.runners.Parameterized 
/**

 * Test launching app in size compat mode.

 *

 * To run this test: `atest WMShellFlickerTestsOther:OpenTransparentActivityTest`

 * To run this test: `atest WMShellFlickerTestsAppCompat:OpenTransparentActivityTest`

 *

 * Actions:

 * ```

libs/WindowManager/Shell/tests/flicker/appcompat/src/com/android/wm/shell/flicker/appcompat/QuickSwitchLauncherToLetterboxAppTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ import org.junit.runners.Parameterized 
/**

 * Test quick switching to letterboxed app from launcher

 *

 * To run this test: `atest WMShellFlickerTestsOther:QuickSwitchLauncherToLetterboxAppTest`

 * To run this test: `atest WMShellFlickerTestsAppCompat:QuickSwitchLauncherToLetterboxAppTest`

 *

 * Actions:

 * ```