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

Commit d4af12be authored by Uwais Ashraf's avatar Uwais Ashraf Committed by Android (Google) Code Review
Browse files

Merge "Remove classes related to E2E testing from deviceless test classpath" into main

parents ddde91b9 9c2f5a4c

Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -107,11 +107,11 @@ android_library { 
        "launcher-testing-shared",

    ],

    srcs: [

        "tests/multivalentTests/tapl/**/*.java",

        "tests/multivalentTests/tapl/**/*.kt",

        "tests/tapl/**/*.java",

        "tests/tapl/**/*.kt",

    ],

    resource_dirs: [],

    manifest: "tests/multivalentTests/tapl/AndroidManifest.xml",

    manifest: "tests/tapl/AndroidManifest.xml",

    platform_apis: true,

}

tests/Android.bp

+34 −34
Original line number Diff line number Diff line
@@ -35,25 +35,25 @@ filegroup { 
filegroup {

    name: "launcher-image-tests-helpers",

    srcs: [

        "multivalentTests/src/com/android/launcher3/celllayout/board/*.java",

        "multivalentTests/src/com/android/launcher3/celllayout/board/*.kt",

        "multivalentTests/src/com/android/launcher3/celllayout/FavoriteItemsTransaction.java",

        "multivalentTests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java",

        "multivalentTests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java",

        "multivalentTests/src/com/android/launcher3/ui/TestViewHelpers.java",

        "src/com/android/launcher3/celllayout/board/*.java",

        "src/com/android/launcher3/celllayout/board/*.kt",

        "src/com/android/launcher3/celllayout/FavoriteItemsTransaction.java",

        "src/com/android/launcher3/ui/AbstractLauncherUiTest.java",

        "src/com/android/launcher3/ui/PortraitLandscapeRunner.java",

        "src/com/android/launcher3/ui/TestViewHelpers.java",

        "multivalentTests/src/com/android/launcher3/util/LauncherLayoutBuilder.java",

        "multivalentTests/src/com/android/launcher3/util/ModelTestExtensions.kt",

        "multivalentTests/src/com/android/launcher3/util/TestConstants.java",

        "src/com/android/launcher3/util/ModelTestExtensions.kt",

        "src/com/android/launcher3/util/TestConstants.java",

        "multivalentTests/src/com/android/launcher3/util/TestUtil.java",

        "multivalentTests/src/com/android/launcher3/util/Wait.java",

        "src/com/android/launcher3/util/Wait.java",

        "multivalentTests/src/com/android/launcher3/util/WidgetUtils.java",

        "src/com/android/launcher3/util/rule/*.java",

        "src/com/android/launcher3/util/rule/*.kt",

        "multivalentTests/src/com/android/launcher3/util/rule/*.java",

        "multivalentTests/src/com/android/launcher3/util/rule/*.kt",

        "multivalentTests/src/com/android/launcher3/util/rule/*.java",

        "multivalentTests/src/com/android/launcher3/util/rule/*.kt",

        "multivalentTests/src/com/android/launcher3/util/viewcapture_analysis/*.java",

        "multivalentTests/src/com/android/launcher3/testcomponent/*.java",

        "multivalentTests/src/com/android/launcher3/testcomponent/*.kt",

        "src/com/android/launcher3/util/viewcapture_analysis/*.java",

        "src/com/android/launcher3/testcomponent/*.java",

        "src/com/android/launcher3/testcomponent/*.kt",

    ],

}
@@ -75,30 +75,30 @@ filegroup { 
        "src/com/android/launcher3/appiconmenu/TaplAppIconMenuTest.java",

        "src/com/android/launcher3/dragging/TaplDragTest.java",

        "src/com/android/launcher3/dragging/TaplUninstallRemoveTest.java",

        "multivalentTests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java",

        "multivalentTests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java",

        "src/com/android/launcher3/ui/AbstractLauncherUiTest.java",

        "src/com/android/launcher3/ui/PortraitLandscapeRunner.java",

        "src/com/android/launcher3/ui/TaplTestsLauncher3Test.java",

        "src/com/android/launcher3/ui/widget/TaplWidgetPickerTest.java",

        "src/com/android/launcher3/ui/workspace/TaplWorkspaceTest.java",

        "multivalentTests/src/com/android/launcher3/util/LauncherLayoutBuilder.java",

        "multivalentTests/src/com/android/launcher3/util/TestConstants.java",

        "src/com/android/launcher3/util/TestConstants.java",

        "multivalentTests/src/com/android/launcher3/util/TestUtil.java",

        "multivalentTests/src/com/android/launcher3/util/Wait.java",

        "src/com/android/launcher3/util/Wait.java",

        "multivalentTests/src/com/android/launcher3/util/WidgetUtils.java",

        "multivalentTests/src/com/android/launcher3/util/rule/FailureWatcher.java",

        "multivalentTests/src/com/android/launcher3/util/rule/ViewCaptureRule.kt",

        "multivalentTests/src/com/android/launcher3/util/rule/SamplerRule.java",

        "multivalentTests/src/com/android/launcher3/util/rule/ScreenRecordRule.java",

        "multivalentTests/src/com/android/launcher3/util/rule/ShellCommandRule.java",

        "multivalentTests/src/com/android/launcher3/util/rule/TestIsolationRule.java",

        "src/com/android/launcher3/util/rule/FailureWatcher.java",

        "src/com/android/launcher3/util/rule/ViewCaptureRule.kt",

        "src/com/android/launcher3/util/rule/SamplerRule.java",

        "src/com/android/launcher3/util/rule/ScreenRecordRule.java",

        "src/com/android/launcher3/util/rule/ShellCommandRule.java",

        "src/com/android/launcher3/util/rule/TestIsolationRule.java",

        "multivalentTests/src/com/android/launcher3/util/rule/TestStabilityRule.java",

        "multivalentTests/src/com/android/launcher3/util/viewcapture_analysis/*.java",

        "multivalentTests/src/com/android/launcher3/testcomponent/BaseTestingActivity.java",

        "multivalentTests/src/com/android/launcher3/testcomponent/OtherBaseTestingActivity.java",

        "multivalentTests/src/com/android/launcher3/testcomponent/CustomShortcutConfigActivity.java",

        "multivalentTests/src/com/android/launcher3/testcomponent/TestCommandReceiver.java",

        "multivalentTests/src/com/android/launcher3/testcomponent/TestLauncherActivity.java",

        "multivalentTests/src/com/android/launcher3/testcomponent/ImeTestActivity.java",

        "src/com/android/launcher3/util/viewcapture_analysis/*.java",

        "src/com/android/launcher3/testcomponent/BaseTestingActivity.java",

        "src/com/android/launcher3/testcomponent/OtherBaseTestingActivity.java",

        "src/com/android/launcher3/testcomponent/CustomShortcutConfigActivity.java",

        "src/com/android/launcher3/testcomponent/TestCommandReceiver.java",

        "src/com/android/launcher3/testcomponent/TestLauncherActivity.java",

        "src/com/android/launcher3/testcomponent/ImeTestActivity.java",

    ],

}
@@ -192,9 +192,9 @@ filegroup { 
        "src/**/*.kt",

        "multivalentTests/src/**/*.java",

        "multivalentTests/src/**/*.kt",

        "multivalentTests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java",

        "multivalentTests/tapl/com/android/launcher3/tapl/*.java",

        "multivalentTests/tapl/com/android/launcher3/tapl/*.kt",

        "src/com/android/launcher3/ui/AbstractLauncherUiTest.java",

        "tapl/com/android/launcher3/tapl/*.java",

        "tapl/com/android/launcher3/tapl/*.kt",

    ],

    exclude_srcs: [

        // Test classes