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

Commit 5fe0a09a authored by Shrinidhi Hegde's avatar Shrinidhi Hegde
Browse files

Add a new test target for rollback observer. 

The tests were failing the first time on postsubmit because of test from
some other file. All the tests would pass on retry. Creating a new
target for rollback observer because we want them to run reliably.

Test: manual
Bug: 291137901
Change-Id: I7c4730391235bbbc07a98f17518d54037ff905e4
parent bb361a3f

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

0 → 100644
+56 −0
Original line number Diff line number Diff line 
// 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.



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"],

}



android_test {

    name: "RollbackPackageHealthObserverTests",



    srcs: [

        "*.java",

    ],



    static_libs: [

        "androidx.test.runner",

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

        "services.core",

        "truth",

        "flag-junit",

    ],



    libs: [

        "android.test.mock",

        "android.test.base",

        "android.test.runner",

    ],



    jni_libs: [

        "libdexmakerjvmtiagent",

        "libstaticjvmtiagent",

    ],



    certificate: "platform",

    platform_apis: true,

    test_suites: [

        "device-tests",

        "automotive-tests",

    ],

}

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

0 → 100644
+32 −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.

  -->



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

          package="com.android.server.rollback">



    <uses-sdk android:targetSdkVersion="35" />



    <application android:testOnly="true"

                 android:debuggable="true">

        <uses-library android:name="android.test.runner" />

    </application>



    <instrumentation

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

        android:targetPackage="com.android.server.rollback"

        android:label="Frameworks Rollback Package Health Observer test" />

</manifest>

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

0 → 100644
+34 −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 Rollback Package Health Observer Tests.">

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

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



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

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

        <option name="install-arg" value="-t" />

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

    </target_preparer>



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



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

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

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

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

    </test>

</configuration>

services/tests/mockingservicestests/src/com/android/server/rollback/TEST_MAPPING

+1 −1
Original line number Diff line number Diff line 
{

  "postsubmit": [

    {

      "name": "FrameworksMockingServicesTests",

      "name": "RollbackPackageHealthObserverTests",

      "options": [

        {

          "include-filter": "com.android.server.rollback"