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

Commit ff05b242 authored by Benedict Wong's avatar Benedict Wong Committed by Automerger Merge Worker
Browse files

Merge "Add test mapping and setup tests for VCN" am: a5690195 am: ee28787c... 

Merge "Add test mapping and setup tests for VCN" am: a5690195 am: ee28787c am: f3e79de9 am: 5649ba12

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

Change-Id: I3566ddab6af6cf1eee2a8be12481d96812558f04
parents c53c2858 5649ba12

tests/vcn/Android.bp

0 → 100644
+27 −0
Original line number Diff line number Diff line 
//########################################################################

// Build FrameworksVcnTests package

//########################################################################



android_test {

    name: "FrameworksVcnTests",

    srcs: [

        "java/**/*.java",

        "java/**/*.kt",

    ],

    platform_apis: true,

    test_suites: ["device-tests"],

    certificate: "platform",

    static_libs: [

        "androidx.test.rules",

        "frameworks-base-testutils",

        "framework-protos",

        "mockito-target-minus-junit4",

        "platform-test-annotations",

        "services.core",

    ],

    libs: [

        "android.test.runner",

        "android.test.base",

        "android.test.mock",

    ],

}

tests/vcn/AndroidManifest.xml

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

<!-- Copyright (C) 2020 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.frameworks.tests.vcn">



    <application>

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

    </application>



    <instrumentation

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

        android:targetPackage="com.android.frameworks.tests.vcn"

        android:label="Frameworks VCN Tests" />

</manifest>

tests/vcn/AndroidTest.xml

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

<!-- Copyright (C) 2020 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 VCN Tests.">

    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">

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

    </target_preparer>



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

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

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

        <option name="package" value="com.android.frameworks.tests.vcn" />

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

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

    </test>

</configuration>

tests/vcn/TEST_MAPPING

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

  "presubmit": [

    {

      "name": "FrameworksVcnTests"

    }

  ]

}
 
 No newline at end of file