diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-05-22 03:20:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-22 03:20:57 +0000 |
| commit | 75b4e46523c68393b86409281ad8be0a8cde49f7 (patch) | |
| tree | 347dc40d49a32fb3e1f09c0f6d05c096ba1b0149 | |
| parent | dbb42cb1b4a14caad6f0383ca701a1f53a0a29cb (diff) | |
| parent | af1d789e08d30843dec3ad1d5a38b2ee50812240 (diff) | |
| download | platform_tools_test_connectivity-75b4e46523c68393b86409281ad8be0a8cde49f7.tar.gz platform_tools_test_connectivity-75b4e46523c68393b86409281ad8be0a8cde49f7.tar.bz2 platform_tools_test_connectivity-75b4e46523c68393b86409281ad8be0a8cde49f7.zip | |
Merge "Enable location for Bluetooth SL4A test" into pi-dev
4 files changed, 28 insertions, 0 deletions
diff --git a/acts/tests/google/ble/scan/BleBackgroundScanTest.py b/acts/tests/google/ble/scan/BleBackgroundScanTest.py index 9a20ed6658..cf6afc1029 100644 --- a/acts/tests/google/ble/scan/BleBackgroundScanTest.py +++ b/acts/tests/google/ble/scan/BleBackgroundScanTest.py @@ -19,6 +19,7 @@ This test script exercises background scan test scenarios. from queue import Empty +from acts import utils from acts.test_decorators import test_tracker_info from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest from acts.test_utils.bt.bt_test_utils import bluetooth_off @@ -50,6 +51,12 @@ class BleBackgroundScanTest(BluetoothBaseTest): self.scn_ad = self.android_devices[0] self.adv_ad = self.android_devices[1] + def setup_class(self): + super(BluetoothBaseTest, self).setup_class() + utils.set_location_service(self.scn_ad, True) + utils.set_location_service(self.adv_ad, True) + return True + def setup_test(self): # Always start tests with Bluetooth enabled and BLE disabled. enable_bluetooth(self.scn_ad.droid, self.scn_ad.ed) diff --git a/acts/tests/google/ble/scan/BleOnLostOnFoundTest.py b/acts/tests/google/ble/scan/BleOnLostOnFoundTest.py index 37f7e07b1e..0896c6d594 100644 --- a/acts/tests/google/ble/scan/BleOnLostOnFoundTest.py +++ b/acts/tests/google/ble/scan/BleOnLostOnFoundTest.py @@ -18,6 +18,7 @@ This test script exercises different onLost/onFound scenarios. """ from queue import Empty +from acts import utils from acts.test_decorators import test_tracker_info from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest from acts.test_utils.bt.bt_constants import ble_advertise_settings_modes @@ -44,6 +45,12 @@ class BleOnLostOnFoundTest(BluetoothBaseTest): self.scn_ad = self.android_devices[0] self.adv_ad = self.android_devices[1] + def setup_class(self): + super(BluetoothBaseTest, self).setup_class() + utils.set_location_service(self.scn_ad, True) + utils.set_location_service(self.adv_ad, True) + return True + def teardown_test(self): cleanup_scanners_and_advertisers( self.scn_ad, self.active_adv_callback_list, self.adv_ad, diff --git a/acts/tests/google/ble/scan/BleOpportunisticScanTest.py b/acts/tests/google/ble/scan/BleOpportunisticScanTest.py index 514116ac1d..d407723400 100644 --- a/acts/tests/google/ble/scan/BleOpportunisticScanTest.py +++ b/acts/tests/google/ble/scan/BleOpportunisticScanTest.py @@ -23,6 +23,7 @@ Shield box one: Android Device, Android Device from queue import Empty +from acts import utils from acts.test_decorators import test_tracker_info from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest from acts.test_utils.bt.bt_constants import ble_scan_settings_modes @@ -49,6 +50,12 @@ class BleOpportunisticScanTest(BluetoothBaseTest): self.scn_ad = self.android_devices[0] self.adv_ad = self.android_devices[1] + def setup_class(self): + super(BluetoothBaseTest, self).setup_class() + utils.set_location_service(self.scn_ad, True) + utils.set_location_service(self.adv_ad, True) + return True + def teardown_test(self): cleanup_scanners_and_advertisers( self.scn_ad, self.active_scan_callback_list, self.adv_ad, diff --git a/acts/tests/google/ble/scan/BleScanScreenStateTest.py b/acts/tests/google/ble/scan/BleScanScreenStateTest.py index b6c17f62b8..33cc758291 100644 --- a/acts/tests/google/ble/scan/BleScanScreenStateTest.py +++ b/acts/tests/google/ble/scan/BleScanScreenStateTest.py @@ -23,6 +23,7 @@ import pprint import time from queue import Empty +from acts import utils from acts.test_decorators import test_tracker_info from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest from acts.test_utils.bt.bt_constants import adv_succ @@ -47,6 +48,12 @@ class BleScanScreenStateTest(BluetoothBaseTest): self.scn_ad = self.android_devices[0] self.adv_ad = self.android_devices[1] + def setup_class(self): + super(BluetoothBaseTest, self).setup_class() + utils.set_location_service(self.scn_ad, True) + utils.set_location_service(self.adv_ad, True) + return True + def _setup_generic_advertisement(self): self.adv_ad.droid.bleSetAdvertiseSettingsAdvertiseMode( ble_advertise_settings_modes['low_latency']) |