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

Commit 642cdba2 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Automerger Merge Worker
Browse files

Merge "Tests to verify matching of Eddystone E2EE-EID beacons." am: 0e8f01bf am: 6e684f08 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2062915



Change-Id: Iff23f0e9ac05ca595ce93787037b7fef5b3e13bb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4375344b 6e684f08

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

+18 −0
Original line number Diff line number Diff line
@@ -44,6 +44,11 @@ public class ScanRecordTest extends TestCase { 
    private static final String RECORD_TLM = "0201060303AAFE1116AAFE20000BF017000008874803FB93540916802069080EFE13551109426C7565436861726D5F313639363835000000000000000000";

    private static final String RECORD_IBEACON = "0201061AFF4C000215426C7565436861726D426561636F6E730EFE1355C509168020691E0EFE13551109426C7565436861726D5F31363936383500000000";



    /**

     * Example Eddystone E2EE-EID beacon from design doc

     */

    private static final String RECORD_E2EE_EID = "0201061816AAFE400000000000000000000000000000000000000000";



    @SmallTest

    public void testMatchesAnyField_Eddystone_Parser() {

        final List<String> found = new ArrayList<>();
@@ -68,6 +73,18 @@ public class ScanRecordTest extends TestCase { 
        assertMatchesAnyField(RECORD_URL, matcher);

        assertMatchesAnyField(RECORD_UUID, matcher);

        assertMatchesAnyField(RECORD_TLM, matcher);

        assertMatchesAnyField(RECORD_E2EE_EID, matcher);

        assertNotMatchesAnyField(RECORD_IBEACON, matcher);

    }



    @SmallTest

    public void testMatchesAnyField_Eddystone_ExceptE2eeEid() {

        final BytesMatcher matcher = BytesMatcher

                .decode("⊈0016AAFE40/00FFFFFFFF,⊆0016AAFE/00FFFFFF");

        assertMatchesAnyField(RECORD_URL, matcher);

        assertMatchesAnyField(RECORD_UUID, matcher);

        assertMatchesAnyField(RECORD_TLM, matcher);

        assertNotMatchesAnyField(RECORD_E2EE_EID, matcher);

        assertNotMatchesAnyField(RECORD_IBEACON, matcher);

    }
@@ -94,6 +111,7 @@ public class ScanRecordTest extends TestCase { 
        assertNotMatchesAnyField(RECORD_URL, matcher);

        assertNotMatchesAnyField(RECORD_UUID, matcher);

        assertNotMatchesAnyField(RECORD_TLM, matcher);

        assertNotMatchesAnyField(RECORD_E2EE_EID, matcher);

        assertMatchesAnyField(RECORD_IBEACON, matcher);

    }