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

Commit 840ad63e 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
parent 7709ca1e

framework/tests/src/android/bluetooth/BluetoothCodecStatusTest.java

deleted100644 → 0
+0 −493

File deleted.

Preview size limit exceeded, changes collapsed.

framework/tests/src/android/bluetooth/le/AdvertiseDataTest.java

deleted100644 → 0
+0 −144
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2014 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 android.bluetooth.le;



import android.os.Parcel;

import android.os.ParcelUuid;

import android.test.suitebuilder.annotation.SmallTest;



import junit.framework.TestCase;



/**

 * Unit test cases for {@link AdvertiseData}.

 * <p>

 * To run the test, use adb shell am instrument -e class 'android.bluetooth.le.AdvertiseDataTest' -w

 * 'com.android.bluetooth.tests/android.bluetooth.BluetoothTestRunner'

 */

public class AdvertiseDataTest extends TestCase {



    private AdvertiseData.Builder mAdvertiseDataBuilder;



    @Override

    protected void setUp() throws Exception {

        mAdvertiseDataBuilder = new AdvertiseData.Builder();

    }



    @SmallTest

    public void testEmptyData() {

        Parcel parcel = Parcel.obtain();

        AdvertiseData data = mAdvertiseDataBuilder.build();

        data.writeToParcel(parcel, 0);

        parcel.setDataPosition(0);

        AdvertiseData dataFromParcel =

                AdvertiseData.CREATOR.createFromParcel(parcel);

        assertEquals(data, dataFromParcel);

    }



    @SmallTest

    public void testEmptyServiceUuid() {

        Parcel parcel = Parcel.obtain();

        AdvertiseData data = mAdvertiseDataBuilder.setIncludeDeviceName(true).build();

        data.writeToParcel(parcel, 0);

        parcel.setDataPosition(0);

        AdvertiseData dataFromParcel =

                AdvertiseData.CREATOR.createFromParcel(parcel);

        assertEquals(data, dataFromParcel);

    }



    @SmallTest

    public void testEmptyManufacturerData() {

        Parcel parcel = Parcel.obtain();

        int manufacturerId = 50;

        byte[] manufacturerData = new byte[0];

        AdvertiseData data =

                mAdvertiseDataBuilder.setIncludeDeviceName(true)

                        .addManufacturerData(manufacturerId, manufacturerData).build();

        data.writeToParcel(parcel, 0);

        parcel.setDataPosition(0);

        AdvertiseData dataFromParcel =

                AdvertiseData.CREATOR.createFromParcel(parcel);

        assertEquals(data, dataFromParcel);

    }



    @SmallTest

    public void testEmptyServiceData() {

        Parcel parcel = Parcel.obtain();

        ParcelUuid uuid = ParcelUuid.fromString("0000110A-0000-1000-8000-00805F9B34FB");

        byte[] serviceData = new byte[0];

        AdvertiseData data =

                mAdvertiseDataBuilder.setIncludeDeviceName(true)

                        .addServiceData(uuid, serviceData).build();

        data.writeToParcel(parcel, 0);

        parcel.setDataPosition(0);

        AdvertiseData dataFromParcel =

                AdvertiseData.CREATOR.createFromParcel(parcel);

        assertEquals(data, dataFromParcel);

    }



    @SmallTest

    public void testServiceUuid() {

        Parcel parcel = Parcel.obtain();

        ParcelUuid uuid = ParcelUuid.fromString("0000110A-0000-1000-8000-00805F9B34FB");

        ParcelUuid uuid2 = ParcelUuid.fromString("0000110B-0000-1000-8000-00805F9B34FB");



        AdvertiseData data =

                mAdvertiseDataBuilder.setIncludeDeviceName(true)

                        .addServiceUuid(uuid).addServiceUuid(uuid2).build();

        data.writeToParcel(parcel, 0);

        parcel.setDataPosition(0);

        AdvertiseData dataFromParcel =

                AdvertiseData.CREATOR.createFromParcel(parcel);

        assertEquals(data, dataFromParcel);

    }



    @SmallTest

    public void testManufacturerData() {

        Parcel parcel = Parcel.obtain();

        ParcelUuid uuid = ParcelUuid.fromString("0000110A-0000-1000-8000-00805F9B34FB");

        ParcelUuid uuid2 = ParcelUuid.fromString("0000110B-0000-1000-8000-00805F9B34FB");



        int manufacturerId = 50;

        byte[] manufacturerData = new byte[] {

                (byte) 0xF0, 0x00, 0x02, 0x15 };

        AdvertiseData data =

                mAdvertiseDataBuilder.setIncludeDeviceName(true)

                        .addServiceUuid(uuid).addServiceUuid(uuid2)

                        .addManufacturerData(manufacturerId, manufacturerData).build();



        data.writeToParcel(parcel, 0);

        parcel.setDataPosition(0);

        AdvertiseData dataFromParcel =

                AdvertiseData.CREATOR.createFromParcel(parcel);

        assertEquals(data, dataFromParcel);

    }



    @SmallTest

    public void testServiceData() {

        Parcel parcel = Parcel.obtain();

        ParcelUuid uuid = ParcelUuid.fromString("0000110A-0000-1000-8000-00805F9B34FB");

        byte[] serviceData = new byte[] {

                (byte) 0xF0, 0x00, 0x02, 0x15 };

        AdvertiseData data =

                mAdvertiseDataBuilder.setIncludeDeviceName(true)

                        .addServiceData(uuid, serviceData).build();

        data.writeToParcel(parcel, 0);

        parcel.setDataPosition(0);

        AdvertiseData dataFromParcel =

                AdvertiseData.CREATOR.createFromParcel(parcel);

        assertEquals(data, dataFromParcel);

    }

}

framework/tests/src/android/bluetooth/le/ScanFilterTest.java

deleted100644 → 0
+0 −215
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2014 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 android.bluetooth.le;



import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.le.ScanFilter;

import android.bluetooth.le.ScanRecord;

import android.os.Parcel;

import android.os.ParcelUuid;

import android.test.suitebuilder.annotation.SmallTest;



import junit.framework.TestCase;



/**

 * Unit test cases for Bluetooth LE scan filters.

 * <p>

 * To run this test, use adb shell am instrument -e class 'android.bluetooth.ScanFilterTest' -w

 * 'com.android.bluetooth.tests/android.bluetooth.BluetoothTestRunner'

 */

public class ScanFilterTest extends TestCase {



    private static final String DEVICE_MAC = "01:02:03:04:05:AB";

    private ScanResult mScanResult;

    private ScanFilter.Builder mFilterBuilder;



    @Override

    protected void setUp() throws Exception {

        byte[] scanRecord = new byte[] {

                0x02, 0x01, 0x1a, // advertising flags

                0x05, 0x02, 0x0b, 0x11, 0x0a, 0x11, // 16 bit service uuids

                0x04, 0x09, 0x50, 0x65, 0x64, // setName

                0x02, 0x0A, (byte) 0xec, // tx power level

                0x05, 0x16, 0x0b, 0x11, 0x50, 0x64, // service data

                0x05, (byte) 0xff, (byte) 0xe0, 0x00, 0x02, 0x15, // manufacturer specific data

                0x03, 0x50, 0x01, 0x02, // an unknown data type won't cause trouble

        };



        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();

        BluetoothDevice device = adapter.getRemoteDevice(DEVICE_MAC);

        mScanResult = new ScanResult(device, ScanRecord.parseFromBytes(scanRecord),

                -10, 1397545200000000L);

        mFilterBuilder = new ScanFilter.Builder();

    }



    @SmallTest

    public void testsetNameFilter() {

        ScanFilter filter = mFilterBuilder.setDeviceName("Ped").build();

        assertTrue("setName filter fails", filter.matches(mScanResult));



        filter = mFilterBuilder.setDeviceName("Pem").build();

        assertFalse("setName filter fails", filter.matches(mScanResult));



    }



    @SmallTest

    public void testDeviceFilter() {

        ScanFilter filter = mFilterBuilder.setDeviceAddress(DEVICE_MAC).build();

        assertTrue("device filter fails", filter.matches(mScanResult));



        filter = mFilterBuilder.setDeviceAddress("11:22:33:44:55:66").build();

        assertFalse("device filter fails", filter.matches(mScanResult));

    }



    @SmallTest

    public void testsetServiceUuidFilter() {

        ScanFilter filter = mFilterBuilder.setServiceUuid(

                ParcelUuid.fromString("0000110A-0000-1000-8000-00805F9B34FB")).build();

        assertTrue("uuid filter fails", filter.matches(mScanResult));



        filter = mFilterBuilder.setServiceUuid(

                ParcelUuid.fromString("0000110C-0000-1000-8000-00805F9B34FB")).build();

        assertFalse("uuid filter fails", filter.matches(mScanResult));



        filter = mFilterBuilder

                .setServiceUuid(ParcelUuid.fromString("0000110C-0000-1000-8000-00805F9B34FB"),

                        ParcelUuid.fromString("FFFFFFF0-FFFF-FFFF-FFFF-FFFFFFFFFFFF"))

                .build();

        assertTrue("uuid filter fails", filter.matches(mScanResult));

    }



    @SmallTest

    public void testsetServiceDataFilter() {

        byte[] setServiceData = new byte[] {

                0x50, 0x64 };

        ParcelUuid serviceDataUuid = ParcelUuid.fromString("0000110B-0000-1000-8000-00805F9B34FB");

        ScanFilter filter = mFilterBuilder.setServiceData(serviceDataUuid, setServiceData).build();

        assertTrue("service data filter fails", filter.matches(mScanResult));



        byte[] emptyData = new byte[0];

        filter = mFilterBuilder.setServiceData(serviceDataUuid, emptyData).build();

        assertTrue("service data filter fails", filter.matches(mScanResult));



        byte[] prefixData = new byte[] {

                0x50 };

        filter = mFilterBuilder.setServiceData(serviceDataUuid, prefixData).build();

        assertTrue("service data filter fails", filter.matches(mScanResult));



        byte[] nonMatchData = new byte[] {

                0x51, 0x64 };

        byte[] mask = new byte[] {

                (byte) 0x00, (byte) 0xFF };

        filter = mFilterBuilder.setServiceData(serviceDataUuid, nonMatchData, mask).build();

        assertTrue("partial service data filter fails", filter.matches(mScanResult));



        filter = mFilterBuilder.setServiceData(serviceDataUuid, nonMatchData).build();

        assertFalse("service data filter fails", filter.matches(mScanResult));

    }



    @SmallTest

    public void testManufacturerSpecificData() {

        byte[] setManufacturerData = new byte[] {

                0x02, 0x15 };

        int manufacturerId = 0xE0;

        ScanFilter filter =

                mFilterBuilder.setManufacturerData(manufacturerId, setManufacturerData).build();

        assertTrue("manufacturer data filter fails", filter.matches(mScanResult));



        byte[] emptyData = new byte[0];

        filter = mFilterBuilder.setManufacturerData(manufacturerId, emptyData).build();

        assertTrue("manufacturer data filter fails", filter.matches(mScanResult));



        byte[] prefixData = new byte[] {

                0x02 };

        filter = mFilterBuilder.setManufacturerData(manufacturerId, prefixData).build();

        assertTrue("manufacturer data filter fails", filter.matches(mScanResult));



        // Test data mask

        byte[] nonMatchData = new byte[] {

                0x02, 0x14 };

        filter = mFilterBuilder.setManufacturerData(manufacturerId, nonMatchData).build();

        assertFalse("manufacturer data filter fails", filter.matches(mScanResult));

        byte[] mask = new byte[] {

                (byte) 0xFF, (byte) 0x00

        };

        filter = mFilterBuilder.setManufacturerData(manufacturerId, nonMatchData, mask).build();

        assertTrue("partial setManufacturerData filter fails", filter.matches(mScanResult));

    }



    @SmallTest

    public void testReadWriteParcel() {

        ScanFilter filter = mFilterBuilder.build();

        testReadWriteParcelForFilter(filter);



        filter = mFilterBuilder.setDeviceName("Ped").build();

        testReadWriteParcelForFilter(filter);



        filter = mFilterBuilder.setDeviceAddress("11:22:33:44:55:66").build();

        testReadWriteParcelForFilter(filter);



        filter = mFilterBuilder.setServiceUuid(

                ParcelUuid.fromString("0000110C-0000-1000-8000-00805F9B34FB")).build();

        testReadWriteParcelForFilter(filter);



        filter = mFilterBuilder.setServiceUuid(

                ParcelUuid.fromString("0000110C-0000-1000-8000-00805F9B34FB"),

                ParcelUuid.fromString("FFFFFFF0-FFFF-FFFF-FFFF-FFFFFFFFFFFF")).build();

        testReadWriteParcelForFilter(filter);



        byte[] serviceData = new byte[] {

                0x50, 0x64 };



        ParcelUuid serviceDataUuid = ParcelUuid.fromString("0000110B-0000-1000-8000-00805F9B34FB");

        filter = mFilterBuilder.setServiceData(serviceDataUuid, serviceData).build();

        testReadWriteParcelForFilter(filter);



        filter = mFilterBuilder.setServiceData(serviceDataUuid, new byte[0]).build();

        testReadWriteParcelForFilter(filter);



        byte[] serviceDataMask = new byte[] {

                (byte) 0xFF, (byte) 0xFF };

        filter = mFilterBuilder.setServiceData(serviceDataUuid, serviceData, serviceDataMask)

                .build();

        testReadWriteParcelForFilter(filter);



        byte[] manufacturerData = new byte[] {

                0x02, 0x15 };

        int manufacturerId = 0xE0;

        filter = mFilterBuilder.setManufacturerData(manufacturerId, manufacturerData).build();

        testReadWriteParcelForFilter(filter);



        filter = mFilterBuilder.setServiceData(serviceDataUuid, new byte[0]).build();

        testReadWriteParcelForFilter(filter);



        byte[] manufacturerDataMask = new byte[] {

                (byte) 0xFF, (byte) 0xFF

        };

        filter = mFilterBuilder.setManufacturerData(manufacturerId, manufacturerData,

                manufacturerDataMask).build();

        testReadWriteParcelForFilter(filter);

    }



    private void testReadWriteParcelForFilter(ScanFilter filter) {

        Parcel parcel = Parcel.obtain();

        filter.writeToParcel(parcel, 0);

        parcel.setDataPosition(0);

        ScanFilter filterFromParcel =

                ScanFilter.CREATOR.createFromParcel(parcel);

        assertEquals(filter, filterFromParcel);

    }

}

framework/tests/src/android/bluetooth/le/ScanResultTest.java

deleted100644 → 0
+0 −56
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2014 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 android.bluetooth.le;



import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothDevice;

import android.os.Parcel;

import android.test.suitebuilder.annotation.SmallTest;



import junit.framework.TestCase;



/**

 * Unit test cases for Bluetooth LE scans.

 * <p>

 * To run this test, use adb shell am instrument -e class 'android.bluetooth.ScanResultTest' -w

 * 'com.android.bluetooth.tests/android.bluetooth.BluetoothTestRunner'

 */

public class ScanResultTest extends TestCase {



    /**

     * Test read and write parcel of ScanResult

     */

    @SmallTest

    public void testScanResultParceling() {

        BluetoothDevice device = BluetoothAdapter.getDefaultAdapter().getRemoteDevice(

                "01:02:03:04:05:06");

        byte[] scanRecord = new byte[] {

                1, 2, 3 };

        int rssi = -10;

        long timestampMicros = 10000L;



        ScanResult result = new ScanResult(device, ScanRecord.parseFromBytes(scanRecord), rssi,

                timestampMicros);

        Parcel parcel = Parcel.obtain();

        result.writeToParcel(parcel, 0);

        // Need to reset parcel data position to the beginning.

        parcel.setDataPosition(0);

        ScanResult resultFromParcel = ScanResult.CREATOR.createFromParcel(parcel);

        assertEquals(result, resultFromParcel);

    }



}

framework/tests/Android.bp→framework/tests/stress/Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -21,11 +21,12 @@ android_test { 
        "android.test.base",

    ],

    static_libs: [

        "androidx.test.rules",

        "junit",

        "modules-utils-bytesmatcher",

    ],

    test_suites: [

        "general-tests",

        "mts-bluetooth",

    ],

    certificate: ":com.android.bluetooth.certificate",

}