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

Commit 425e0ea8 authored by Liran Binyamin's avatar Liran Binyamin
Browse files

Move multivalent test targets to multivalentTests dir 

Test: atest WMShellMultivalentTestsOnDevice
Test: atest WMShellRobolectricTests
Bug: 308004028
Change-Id: I384ae5afd57c020f098046a0b204fd2bb4123ef8
parent 56cd5fb2

libs/WindowManager/Shell/Android.bp

+0 −73
Original line number Diff line number Diff line
@@ -212,76 +212,3 @@ android_library { 
    plugins: ["dagger2-compiler"],

    use_resource_processor: true,

}
 


android_app {

    name: "WindowManagerShellRobolectric",

    platform_apis: true,

    static_libs: [

        "WindowManager-Shell",

    ],

    manifest: "multivalentTests/AndroidManifestRobolectric.xml",

    use_resource_processor: true,

}



android_robolectric_test {

    name: "WMShellRobolectricTests",

    instrumentation_for: "WindowManagerShellRobolectric",

    upstream: true,

    java_resource_dirs: [

        "multivalentTests/robolectric/config",

    ],

    srcs: [

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

    ],

    // TODO(b/323188766): Include BubbleStackViewTest once the robolectric issue is fixed.

    exclude_srcs: ["multivalentTests/src/com/android/wm/shell/bubbles/BubbleStackViewTest.kt"],

    static_libs: [

        "junit",

        "androidx.test.runner",

        "androidx.test.rules",

        "androidx.test.ext.junit",

        "mockito-robolectric-prebuilt",

        "mockito-kotlin2",

        "truth",

    ],

}



android_test {

    name: "WMShellMultivalentTestsOnDevice",

    srcs: [

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

    ],

    static_libs: [

        "WindowManager-Shell",

        "junit",

        "androidx.test.runner",

        "androidx.test.rules",

        "androidx.test.ext.junit",

        "frameworks-base-testutils",

        "mockito-kotlin2",

        "mockito-target-extended-minus-junit4",

        "truth",

        "platform-test-annotations",

        "platform-test-rules",

    ],

    libs: [

        "android.test.base",

        "android.test.runner",

    ],

    jni_libs: [

        "libdexmakerjvmtiagent",

        "libstaticjvmtiagent",

    ],

    kotlincflags: ["-Xjvm-default=all"],

    optimize: {

        enabled: false,

    },

    test_suites: ["device-tests"],

    platform_apis: true,

    certificate: "platform",

    aaptflags: [

        "--extra-packages",

        "com.android.wm.shell",

    ],

    manifest: "multivalentTests/AndroidManifest.xml",

}

libs/WindowManager/Shell/multivalentTests/Android.bp

0 → 100644
+97 −0
Original line number Diff line number Diff line 
// Copyright (C) 2019 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.



package {

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "frameworks_base_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_base_license"],

    default_team: "trendy_team_multitasking_windowing",

}



android_app {

    name: "WindowManagerShellRobolectric",

    platform_apis: true,

    static_libs: [

        "WindowManager-Shell",

    ],

    manifest: "AndroidManifestRobolectric.xml",

    use_resource_processor: true,

}



android_robolectric_test {

    name: "WMShellRobolectricTests",

    instrumentation_for: "WindowManagerShellRobolectric",

    upstream: true,

    java_resource_dirs: [

        "robolectric/config",

    ],

    srcs: [

        "src/**/*.kt",

    ],

    // TODO(b/323188766): Include BubbleStackViewTest once the robolectric issue is fixed.

    exclude_srcs: ["src/com/android/wm/shell/bubbles/BubbleStackViewTest.kt"],

    static_libs: [

        "junit",

        "androidx.test.runner",

        "androidx.test.rules",

        "androidx.test.ext.junit",

        "mockito-robolectric-prebuilt",

        "mockito-kotlin2",

        "truth",

    ],

    auto_gen_config: true,

}



android_test {

    name: "WMShellMultivalentTestsOnDevice",

    srcs: [

        "src/**/*.kt",

    ],

    static_libs: [

        "WindowManager-Shell",

        "junit",

        "androidx.test.runner",

        "androidx.test.rules",

        "androidx.test.ext.junit",

        "frameworks-base-testutils",

        "mockito-kotlin2",

        "mockito-target-extended-minus-junit4",

        "truth",

        "platform-test-annotations",

        "platform-test-rules",

    ],

    libs: [

        "android.test.base",

        "android.test.runner",

    ],

    jni_libs: [

        "libdexmakerjvmtiagent",

        "libstaticjvmtiagent",

    ],

    kotlincflags: ["-Xjvm-default=all"],

    optimize: {

        enabled: false,

    },

    test_suites: ["device-tests"],

    platform_apis: true,

    certificate: "platform",

    aaptflags: [

        "--extra-packages",

        "com.android.wm.shell",

    ],

    manifest: "AndroidManifest.xml",

}