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

Commit 60f50baa authored by Seth Moore's avatar Seth Moore Committed by Automerger Merge Worker
Browse files

Merge "Add unit tests for RemoteProvisioningRegistration" am: 6c5c89ed am:... 

Merge "Add unit tests for RemoteProvisioningRegistration" am: 6c5c89ed am: 5cc7f80a am: 44e66d35

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2359449



Change-Id: I57aa5116d7cc2b83a780fb6c5a1b3c9f700676ea
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f7085af3 44e66d35

services/core/java/com/android/server/security/rkp/TEST_MAPPING

0 → 100644
+8 −0
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "RemoteProvisioningServiceTests"

    }

  ]

}

services/tests/RemoteProvisioningServiceTests/Android.bp

0 → 100644
+39 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 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

    default_applicable_licenses: ["frameworks_base_license"],

}



android_test {

    name: "RemoteProvisioningServiceTests",

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

    static_libs: [

        "android.security.rkp_aidl-java",

        "androidx.test.core",

        "androidx.test.ext.junit",

        "androidx.test.rules",

        "mockito-target",

        "service-rkp.impl",

        "services.core",

        "truth-prebuilt",

    ],

    test_suites: [

        "device-tests",

    ],

    platform_apis: true,

}

services/tests/RemoteProvisioningServiceTests/AndroidManifest.xml

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

<!-- Copyright (C) 2022 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.security.rkp.test">



    <application android:testOnly="true">

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

    </application>



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

                     android:targetPackage="com.android.server.security.rkp.test"

                     android:label="Remote Provisioning System Service Tests"/>

</manifest>

services/tests/RemoteProvisioningServiceTests/AndroidTest.xml

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

<!-- Copyright (C) 2022 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 Frameworks RemoteProvisioningService Tests.">

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

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

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



    <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="RemoteProvisioningServiceTests.apk" />

    </target_preparer>



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

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

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

        <option name="exclude-annotation" value="androidx.test.filters.FlakyTest" />

    </test>

</configuration>

services/tests/RemoteProvisioningServiceTests/OWNERS

0 → 100644
+1 −0
Original line number Diff line number Diff line 
file:platform/frameworks/base:master:/core/java/android/security/rkp/OWNERS