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

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

Merge "Add module controller for mts crashrecovery tests" into main

parents d22f7cd9 48bf7540

services/tests/mockingservicestests/src/com/android/server/crashrecovery/AndroidTest.xml

+5 −0
Original line number Diff line number Diff line
@@ -31,4 +31,9 @@ 
        <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />

        <option name="hidden-api-checks" value="false"/>

    </test>



    <!-- Only run this Tests if the Crashrecovery Mainline module is installed. -->

    <object type="module_controller" class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">

        <option name="mainline-module-package-name" value="com.google.android.crashrecovery" />

    </object>

</configuration>

services/tests/mockingservicestests/src/com/android/server/rollback/AndroidTest.xml

+5 −0
Original line number Diff line number Diff line
@@ -31,4 +31,9 @@ 
        <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />

        <option name="hidden-api-checks" value="false"/>

    </test>



    <!-- Only run this Tests if the Crashrecovery Mainline module is installed. -->

    <object type="module_controller" class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">

        <option name="mainline-module-package-name" value="com.google.android.crashrecovery" />

    </object>

</configuration>

tests/PackageWatchdog/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ android_test { 
    static_libs: [

        "PlatformProperties",

        "androidx.test.rules",

        "androidx.test.runner",

        "flag-junit",

        "frameworks-base-testutils",

        "junit",

tests/PackageWatchdog/AndroidManifest.xml

+3 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
-->



<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.tests.packagewatchdog" >

    package="com.android.server" >



    <application android:debuggable="true">

        <uses-library android:name="android.test.runner" />
@@ -23,6 +23,6 @@ 




    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"

                     android:targetPackage="com.android.tests.packagewatchdog"

        android:targetPackage="com.android.server"

        android:label="PackageWatchdog Test"/>

</manifest>

tests/PackageWatchdog/AndroidTest.xml

0 → 100644
+36 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2024 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.

  -->

<configuration description="Runs PackageWatchdog Tests.">

    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">

        <option name="cleanup-apks" value="true" />

        <option name="test-file-name" value="PackageWatchdogTest.apk" />

    </target_preparer>



    <option name="test-suite-tag" value="apct" />

    <option name="test-tag" value="PackageWatchdogTest" />



    <!-- Only run this tests in MTS if the Crashrecovery Mainline module is installed. -->

    <object type="module_controller" class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">

        <option name="mainline-module-package-name" value="com.google.android.crashrecovery" />

    </object>



    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >

        <option name="package" value="com.android.server" />

        <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />

        <option name="hidden-api-checks" value="false"/>

    </test>

</configuration>