commit b5d052a6bf0158a75f838569568b01da1220e9d2
author Zach Johnson <zachoverflow@google.com> Sat Nov 14 15:12:41 2020 -0800
committer Zach Johnson <zachoverflow@google.com> Wed Nov 18 14:14:19 2020 -0800
tree d1b654e020f151cdf87884e6bc2a2c717d43baaf
parent 19e1bc3f70d5aef1bca8bbb2f43e886980fc0e45

Simplify scan parameters & start/stop

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --host
Change-Id: I9ffbe874bf84e338bd1d38873fbecac6f83fa9b5

system/gd/cert/py_hal.py

diff --git a/system/gd/cert/py_hal.py b/system/gd/cert/py_hal.py
index 47034ad..749b138 100644
--- a/system/gd/cert/py_hal.py
+++ b/system/gd/cert/py_hal.py
@@ -150,6 +150,27 @@
     def set_random_le_address(self, addr):
         self.send_hci_command(hci_packets.LeSetRandomAddressBuilder(addr))
 
+    def set_scan_parameters(self):
+        phy_scan_params = hci_packets.PhyScanParameters()
+        phy_scan_params.le_scan_interval = 6553
+        phy_scan_params.le_scan_window = 6553
+        phy_scan_params.le_scan_type = hci_packets.LeScanType.ACTIVE
+
+        self.send_hci_command(
+            hci_packets.LeSetExtendedScanParametersBuilder(hci_packets.OwnAddressType.RANDOM_DEVICE_ADDRESS,
+                                                           hci_packets.LeScanningFilterPolicy.ACCEPT_ALL, 1,
+                                                           [phy_scan_params]))
+
+    def start_scanning(self):
+        self.send_hci_command(
+            hci_packets.LeSetExtendedScanEnableBuilder(hci_packets.Enable.ENABLED,
+                                                       hci_packets.FilterDuplicates.DISABLED, 0, 0))
+
+    def stop_scanning(self):
+        self.send_hci_command(
+            hci_packets.LeSetExtendedScanEnableBuilder(hci_packets.Enable.DISABLED,
+                                                       hci_packets.FilterDuplicates.DISABLED, 0, 0))
+
     def reset(self):
         self.send_hci_command(hci_packets.ResetBuilder())
         assertThat(self.hci_event_stream).emits(HciMatchers.CommandComplete(OpCode.RESET))

system/gd/hal/cert/simple_hal_test.py

diff --git a/system/gd/hal/cert/simple_hal_test.py b/system/gd/hal/cert/simple_hal_test.py
index 7a08bfe..81c4e5f 100644
--- a/system/gd/hal/cert/simple_hal_test.py
+++ b/system/gd/hal/cert/simple_hal_test.py
@@ -81,19 +81,9 @@
 
     def test_le_ad_scan_cert_advertises(self):
         self.dut_hal.set_random_le_address('0D:05:04:03:02:01')
-        # DUT scans
-        phy_scan_params = hci_packets.PhyScanParameters()
-        phy_scan_params.le_scan_interval = 6553
-        phy_scan_params.le_scan_window = 6553
-        phy_scan_params.le_scan_type = hci_packets.LeScanType.ACTIVE
 
-        self.dut_hal.send_hci_command(
-            hci_packets.LeSetExtendedScanParametersBuilder(hci_packets.OwnAddressType.RANDOM_DEVICE_ADDRESS,
-                                                           hci_packets.LeScanningFilterPolicy.ACCEPT_ALL, 1,
-                                                           [phy_scan_params]))
-        self.dut_hal.send_hci_command(
-            hci_packets.LeSetExtendedScanEnableBuilder(hci_packets.Enable.ENABLED,
-                                                       hci_packets.FilterDuplicates.DISABLED, 0, 0))
+        self.dut_hal.set_scan_parameters()
+        self.dut_hal.start_scanning()
 
         advertisement = self.cert_hal.create_advertisement(
             0,
@@ -109,10 +99,8 @@
         assertThat(self.dut_hal.get_hci_event_stream()).emits(lambda packet: b'Im_A_Cert' in packet.payload)
 
         advertisement.stop()
-        # Disable Scanning
-        self.dut_hal.send_hci_command(
-            hci_packets.LeSetExtendedScanEnableBuilder(hci_packets.Enable.ENABLED,
-                                                       hci_packets.FilterDuplicates.DISABLED, 0, 0))
+
+        self.dut_hal.stop_scanning()
 
     def test_le_connection_dut_advertises(self):
         # Cert Connects