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

Commit 432810ba authored by Harshit Mahajan's avatar Harshit Mahajan Committed by Android (Google) Code Review
Browse files

Merge "Add relevant unit test to CrashRecovery mts" into main

parents 8abc595c de4d86e1

services/tests/mockingservicestests/src/com/android/server/crashrecovery/Android.bp

+5 −3
Original line number Diff line number Diff line
@@ -32,18 +32,18 @@ android_test { 
    static_libs: [

        "androidx.test.core",

        "androidx.test.runner",

        "flag-junit",

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

        "services.core",

        "truth",

        "flag-junit",

    ] + select(soong_config_variable("ANDROID", "release_crashrecovery_module"), {

        "true": ["service-crashrecovery-pre-jarjar"],

        default: [],

    }),



    libs: [

        "android.test.mock.stubs.system",

        "android.test.base.stubs.system",

        "android.test.mock.stubs.system",

        "android.test.runner.stubs.system",

    ],
@@ -55,7 +55,9 @@ android_test { 
    certificate: "platform",

    platform_apis: true,

    test_suites: [

        "device-tests",

        "automotive-tests",

        "device-tests",

        "mts-crashrecovery",

    ],

    min_sdk_version: "36",

}

services/tests/mockingservicestests/src/com/android/server/rollback/Android.bp

+5 −3
Original line number Diff line number Diff line
@@ -30,18 +30,18 @@ android_test { 


    static_libs: [

        "androidx.test.runner",

        "flag-junit",

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

        "services.core",

        "truth",

        "flag-junit",

    ] + select(soong_config_variable("ANDROID", "release_crashrecovery_module"), {

        "true": ["service-crashrecovery-pre-jarjar"],

        default: [],

    }),



    libs: [

        "android.test.mock.stubs.system",

        "android.test.base.stubs.system",

        "android.test.mock.stubs.system",

        "android.test.runner.stubs.system",

    ],
@@ -53,9 +53,11 @@ android_test { 
    certificate: "platform",

    platform_apis: true,

    test_suites: [

        "device-tests",

        "automotive-tests",

        "device-tests",

        "mts-crashrecovery",

    ],

    min_sdk_version: "36",

}



test_module_config {

tests/PackageWatchdog/Android.bp

+9 −5
Original line number Diff line number Diff line
@@ -26,12 +26,12 @@ android_test { 
    name: "PackageWatchdogTest",

    srcs: ["src/**/*.java"],

    static_libs: [

        "junit",

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

        "PlatformProperties",

        "androidx.test.rules",

        "flag-junit",

        "frameworks-base-testutils",

        "androidx.test.rules",

        "PlatformProperties",

        "junit",

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

        "services.core",

        "services.net",

        "truth",
@@ -49,5 +49,9 @@ android_test { 
        "libstaticjvmtiagent",

    ],

    platform_apis: true,

    test_suites: ["device-tests"],

    test_suites: [

        "device-tests",

        "mts-crashrecovery",

    ],

    min_sdk_version: "36",

}