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

Commit b88cfdd5 authored by Zach Johnson's avatar Zach Johnson
Browse files

Simplify advertisement in SimpleHalTest 

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --host
Change-Id: I297cfeac69b143d5783122f1ec103fd67af11446
parent be9cc98f

system/gd/hal/cert/simple_hal_test.py

+14 −79
Original line number Diff line number Diff line
@@ -131,50 +131,10 @@ class SimpleHalTest(GdBaseTestClass): 
                hci_packets.AddressType.RANDOM_DEVICE_ADDRESS, '0D:05:04:03:02:01', 1, [phy_scan_params]))



        # DUT Advertises

        advertising_handle = 0

        self.dut_hal.send_hci_command(

            hci_packets.LeSetExtendedAdvertisingLegacyParametersBuilder(

                advertising_handle,

                hci_packets.LegacyAdvertisingProperties.ADV_IND,

                400,

                450,

                7,

                hci_packets.OwnAddressType.RANDOM_DEVICE_ADDRESS,

                hci_packets.PeerAddressType.PUBLIC_DEVICE_OR_IDENTITY_ADDRESS,

                '00:00:00:00:00:00',

                hci_packets.AdvertisingFilterPolicy.ALL_DEVICES,

                0xF8,

                1,  #SID

                hci_packets.Enable.DISABLED  # Scan request notification

            ))



        self.dut_hal.send_hci_command(

            hci_packets.LeSetExtendedAdvertisingRandomAddressBuilder(advertising_handle, '0D:05:04:03:02:01'))



        gap_name = hci_packets.GapData()

        gap_name.data_type = hci_packets.GapDataType.COMPLETE_LOCAL_NAME

        gap_name.data = list(bytes(b'Im_The_DUT'))



        self.dut_hal.send_hci_command(

            hci_packets.LeSetExtendedAdvertisingDataBuilder(

                advertising_handle, hci_packets.Operation.COMPLETE_ADVERTISEMENT,

                hci_packets.FragmentPreference.CONTROLLER_SHOULD_NOT, [gap_name]))



        gap_short_name = hci_packets.GapData()

        gap_short_name.data_type = hci_packets.GapDataType.SHORTENED_LOCAL_NAME

        gap_short_name.data = list(bytes(b'Im_The_D'))



        self.dut_hal.send_hci_command(

            hci_packets.LeSetExtendedAdvertisingScanResponseBuilder(

                advertising_handle, hci_packets.Operation.COMPLETE_ADVERTISEMENT,

                hci_packets.FragmentPreference.CONTROLLER_SHOULD_NOT, [gap_short_name]))



        enabled_set = hci_packets.EnabledSet()

        enabled_set.advertising_handle = advertising_handle

        enabled_set.duration = 0

        enabled_set.max_extended_advertising_events = 0

        self.dut_hal.send_hci_command(

            hci_packets.LeSetExtendedAdvertisingEnableBuilder(hci_packets.Enable.ENABLED, [enabled_set]))

        advertisement = self.dut_hal.create_advertisement(0, '0D:05:04:03:02:01')

        advertisement.set_data(b'Im_The_DUT')

        advertisement.set_scan_response(b'Im_The_D')

        advertisement.start()



        conn_handle = 0xfff
@@ -221,41 +181,16 @@ class SimpleHalTest(GdBaseTestClass): 
                hci_packets.InitiatorFilterPolicy.USE_CONNECT_LIST, hci_packets.OwnAddressType.RANDOM_DEVICE_ADDRESS,

                hci_packets.AddressType.RANDOM_DEVICE_ADDRESS, 'BA:D5:A4:A3:A2:A1', 1, [phy_scan_params]))



        # CERT Advertises

        advertising_handle = 1

        self.cert_hal.send_hci_command(

            hci_packets.LeSetExtendedAdvertisingLegacyParametersBuilder(

                advertising_handle,

                hci_packets.LegacyAdvertisingProperties.ADV_IND,

                512,

                768,

                7,

                hci_packets.OwnAddressType.RANDOM_DEVICE_ADDRESS,

                hci_packets.PeerAddressType.PUBLIC_DEVICE_OR_IDENTITY_ADDRESS,

                'A6:A5:A4:A3:A2:A1',

                hci_packets.AdvertisingFilterPolicy.ALL_DEVICES,

                0x7F,

                0,  # SID

                hci_packets.Enable.DISABLED  # Scan request notification

            ))



        self.cert_hal.send_hci_command(

            hci_packets.LeSetExtendedAdvertisingRandomAddressBuilder(advertising_handle, '0C:05:04:03:02:01'))



        gap_name = hci_packets.GapData()

        gap_name.data_type = hci_packets.GapDataType.COMPLETE_LOCAL_NAME

        gap_name.data = list(bytes(b'Im_A_Cert'))



        self.cert_hal.send_hci_command(

            hci_packets.LeSetExtendedAdvertisingDataBuilder(

                advertising_handle, hci_packets.Operation.COMPLETE_ADVERTISEMENT,

                hci_packets.FragmentPreference.CONTROLLER_SHOULD_NOT, [gap_name]))

        enabled_set = hci_packets.EnabledSet()

        enabled_set.advertising_handle = 1

        enabled_set.duration = 0

        enabled_set.max_extended_advertising_events = 0

        self.cert_hal.send_hci_command(

            hci_packets.LeSetExtendedAdvertisingEnableBuilder(hci_packets.Enable.ENABLED, [enabled_set]))

        advertisement = self.cert_hal.create_advertisement(

            1,

            '0C:05:04:03:02:01',

            min_interval=512,

            max_interval=768,

            peer_address='A6:A5:A4:A3:A2:A1',

            tx_power=0x7F,

            sid=0)

        advertisement.set_data(b'Im_A_Cert')

        advertisement.start()



        # LeConnectionComplete

        assertThat(self.cert_hal.get_hci_event_stream()).emits(