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

Commit 48564c65 authored by Etienne Ruffieux's avatar Etienne Ruffieux
Browse files

Fixed service / framework test suites broken after migration 

Bluetooth/service and Bluetooth/framework test suites were
broken after the migration of the files from frameworks.
The Bluetooth/framework test suite is split between stress
tests that require a physical Bluetooth device to run and
the unit tests that test the framework hidden APIs.
Both framework unit tests and service tests are signed
and can be added to the MTS.

Test: atest GoogleFrameworkBluetoothTests
Test: atest GoogleServiceBluetoothTests
Bug: 232577476
Tag: #feature
Ignore-AOSP-First: Module only
Change-Id: Ibdb20c650db2483c4569d979da5e024e0e95284c
Merged-In: Ibdb20c650db2483c4569d979da5e024e0e95284c
parent 3fbae318

framework/tests/Android.bp

+0 −29
Original line number Diff line number Diff line 
package {

    default_applicable_licenses: ["Android-Apache-2.0"],

}

android_test {

    name: "BluetoothTests",



    defaults: ["framework-bluetooth-tests-defaults"],



    min_sdk_version: "current",

    target_sdk_version: "current",



    // Include all test java files.

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

    jacoco: {

        include_filter: ["android.bluetooth.*"],

        exclude_filter: [],

    },

    libs: [

        "android.test.runner",

        "android.test.base",

    ],

    static_libs: [

        "junit",

        "modules-utils-bytesmatcher",

    ],

    test_suites: [

        "general-tests",

    ],

}

framework/tests/AndroidTest.xml

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

<!-- Copyright 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="Config for Bluetooth test cases">

    <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="test-file-name" value="BluetoothTests.apk" />

    </target_preparer>



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

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



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

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

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

        <option name="runner" value="android.bluetooth.BluetoothTestRunner"/>

    </test>

</configuration>