ACTS: Use byte array instead of comma separated strings
Bug: b/31621927
Change-Id: Idfbdd17eac7011d84af68868f314499f1eb3e966
(cherry picked from commit c3a8b6c41f96e08649e93c55f20a6937ef2c1983)
diff --git a/acts/tests/google/ble/api/BleAdvertiseApiTest.py b/acts/tests/google/ble/api/BleAdvertiseApiTest.py
index 207f877..4153079 100644
--- a/acts/tests/google/ble/api/BleAdvertiseApiTest.py
+++ b/acts/tests/google/ble/api/BleAdvertiseApiTest.py
@@ -636,7 +636,7 @@
self.log.debug("Step 1: Setup environment.")
droid = self.droid
exp_service_data_uuid = "00000000-0000-1000-8000-00805f9b34fb"
- exp_service_data = "1,2,3"
+ exp_service_data = [1,2,3]
self.log.debug(
"Step 2: Set the filtering data object's service data uuid to: {}, "
"service data: {}".format(exp_service_data_uuid, exp_service_data))
@@ -735,7 +735,7 @@
self.log.debug("Step 1: Setup environment.")
droid = self.droid
exp_manu_id = 0
- exp_manu_specific_data = "1,2,3"
+ exp_manu_specific_data = [1,2,3]
self.log.debug(
"Step 2: Set the filtering data object's service data manu id: {}"
", manu specific data: {}".format(exp_manu_id,
@@ -768,7 +768,7 @@
self.log.debug("Step 1: Setup environment.")
droid = self.droid
exp_manu_id = -1
- exp_manu_specific_data = "1,2,3"
+ exp_manu_specific_data = [1,2,3]
self.log.debug(
"Step 2: Set the filtering data object's service data manu id: {}"
", manu specific data: {}".format(exp_manu_id,
@@ -801,7 +801,7 @@
self.log.debug("Step 1: Setup environment.")
droid = self.droid
exp_manu_id = 0
- exp_manu_specific_data = "helloworld"
+ exp_manu_specific_data = ['helloworld']
self.log.debug(
"Step 2: Set the filtering data object's service data manu id: {}"
", manu specific data: {}".format(exp_manu_id,
@@ -835,7 +835,7 @@
self.log.debug("Step 1: Setup environment.")
droid = self.droid
exp_manu_id = JavaInteger.MAX.value
- exp_manu_specific_data = "1,2,3"
+ exp_manu_specific_data = [1,2,3]
self.log.debug(
"Step 2: Set the filtering data object's service data manu id: {}"
", manu specific data: {}".format(exp_manu_id,
@@ -1002,7 +1002,7 @@
service_data.append(i)
droid.bleAddAdvertiseDataServiceData(
"0000110D-0000-1000-8000-00805F9B34FB",
- ','.join(map(str, service_data)))
+ service_data)
advcallback, adv_data, adv_settings = generate_ble_advertise_objects(
droid)
droid.bleStartBleAdvertising(advcallback, adv_data, adv_settings)
diff --git a/acts/tests/google/ble/api/BleScanApiTest.py b/acts/tests/google/ble/api/BleScanApiTest.py
index bb93cd8..8348c56 100644
--- a/acts/tests/google/ble/api/BleScanApiTest.py
+++ b/acts/tests/google/ble/api/BleScanApiTest.py
@@ -68,7 +68,7 @@
if 'ScanFilterDeviceAddress' not in input.keys():
input['ScanFilterDeviceAddress'] = None
if 'ScanFilterManufacturerData' not in input.keys():
- input['ScanFilterManufacturerData'] = ""
+ input['ScanFilterManufacturerData'] = None
return input
def validate_scan_settings_helper(self, input, droid):
@@ -919,7 +919,7 @@
Priority: 1
"""
expected_manufacturer_id = 0
- expected_manufacturer_data = "1,2,1,3,4,5,6"
+ expected_manufacturer_data = [1,2,1,3,4,5,6]
input = {}
input['ScanFilterManufacturerDataId'] = expected_manufacturer_id
input['ScanFilterManufacturerData'] = expected_manufacturer_data
@@ -946,8 +946,8 @@
Priority: 1
"""
expected_manufacturer_id = 1
- expected_manufacturer_data = "1"
- expected_manufacturer_data_mask = "1,2,1,3,4,5,6"
+ expected_manufacturer_data = [1]
+ expected_manufacturer_data_mask = [1,2,1,3,4,5,6]
input = {}
input['ScanFilterManufacturerDataId'] = expected_manufacturer_id
input['ScanFilterManufacturerData'] = expected_manufacturer_data
@@ -976,7 +976,7 @@
Priority: 2
"""
expected_manufacturer_id = 2147483647
- expected_manufacturer_data = "1,2,1,3,4,5,6"
+ expected_manufacturer_data = [1,2,1,3,4,5,6]
input = {}
input['ScanFilterManufacturerDataId'] = expected_manufacturer_id
input['ScanFilterManufacturerData'] = expected_manufacturer_data
@@ -1003,7 +1003,7 @@
Priority: 2
"""
expected_manufacturer_id = 1
- expected_manufacturer_data = ""
+ expected_manufacturer_data = []
input = {}
input['ScanFilterManufacturerDataId'] = expected_manufacturer_id
input['ScanFilterManufacturerData'] = expected_manufacturer_data
@@ -1030,8 +1030,8 @@
Priority: 1
"""
expected_manufacturer_id = 1
- expected_manufacturer_data = "1,2,1,3,4,5,6"
- expected_manufacturer_data_mask = ""
+ expected_manufacturer_data = [1,2,1,3,4,5,6]
+ expected_manufacturer_data_mask = []
input = {}
input['ScanFilterManufacturerDataId'] = expected_manufacturer_id
input['ScanFilterManufacturerData'] = expected_manufacturer_data
@@ -1060,7 +1060,7 @@
Priority: 2
"""
expected_manufacturer_id = -1
- expected_manufacturer_data = "1,2,1,3,4,5,6"
+ expected_manufacturer_data = [1,2,1,3,4,5,6]
input = {}
input['ScanFilterManufacturerDataId'] = expected_manufacturer_id
input['ScanFilterManufacturerData'] = expected_manufacturer_data
diff --git a/acts/tests/google/ble/concurrency/ConcurrentBleAdvertisingTest.py b/acts/tests/google/ble/concurrency/ConcurrentBleAdvertisingTest.py
index efc4393..ddd2a62 100644
--- a/acts/tests/google/ble/concurrency/ConcurrentBleAdvertisingTest.py
+++ b/acts/tests/google/ble/concurrency/ConcurrentBleAdvertisingTest.py
@@ -183,8 +183,8 @@
TAGS: LE, Advertising, Concurrency
Priority: 2
"""
- self.scn_ad.droid.bleSetScanFilterManufacturerData(1, "1")
- self.adv_ad.droid.bleAddAdvertiseDataManufacturerId(1, "1")
+ self.scn_ad.droid.bleSetScanFilterManufacturerData(1, [1])
+ self.adv_ad.droid.bleAddAdvertiseDataManufacturerId(1, [1])
return self._verify_n_advertisements(self.max_advertisements)
@BluetoothBaseTest.bt_test_wrap
@@ -213,8 +213,8 @@
TAGS: LE, Advertising, Concurrency
Priority: 2
"""
- self.scn_ad.droid.bleSetScanFilterManufacturerData(1, "1", "1")
- self.adv_ad.droid.bleAddAdvertiseDataManufacturerId(1, "1")
+ self.scn_ad.droid.bleSetScanFilterManufacturerData(1, [1], [1])
+ self.adv_ad.droid.bleAddAdvertiseDataManufacturerId(1, [1])
return self._verify_n_advertisements(self.max_advertisements)
@BluetoothBaseTest.bt_test_wrap
@@ -246,9 +246,9 @@
test_result = True
filter_list = self.scn_ad.droid.bleGenFilterList()
self.scn_ad.droid.bleSetScanFilterServiceData(
- "0000110A-0000-1000-8000-00805F9B34FB", "11,17,80")
+ "0000110A-0000-1000-8000-00805F9B34FB", [11,17,80])
self.adv_ad.droid.bleAddAdvertiseDataServiceData(
- "0000110A-0000-1000-8000-00805F9B34FB", "11,17,80")
+ "0000110A-0000-1000-8000-00805F9B34FB", [11,17,80])
return self._verify_n_advertisements(self.max_advertisements)
@BluetoothBaseTest.bt_test_wrap
@@ -281,8 +281,8 @@
self.adv_ad.droid.bleSetAdvertiseDataIncludeDeviceName(True)
self.scn_ad.droid.bleSetScanFilterDeviceName(
self.adv_ad.droid.bluetoothGetLocalName())
- self.scn_ad.droid.bleSetScanFilterManufacturerData(1, "1", "1")
- self.adv_ad.droid.bleAddAdvertiseDataManufacturerId(1, "1")
+ self.scn_ad.droid.bleSetScanFilterManufacturerData(1, [1], [1])
+ self.adv_ad.droid.bleAddAdvertiseDataManufacturerId(1, [1])
return self._verify_n_advertisements(self.max_advertisements)
@BluetoothBaseTest.bt_test_wrap
diff --git a/acts/tests/google/ble/filtering/FilteringTest.py b/acts/tests/google/ble/filtering/FilteringTest.py
index 2980a6f..89bc9be 100644
--- a/acts/tests/google/ble/filtering/FilteringTest.py
+++ b/acts/tests/google/ble/filtering/FilteringTest.py
@@ -44,57 +44,57 @@
},
{
'manufacturer_specific_data_id': 1,
- 'manufacturer_specific_data': "1"
+ 'manufacturer_specific_data': [1]
},
{
'manufacturer_specific_data_id': 1,
- 'manufacturer_specific_data': "14,0,54,0,0,0,0,0"
+ 'manufacturer_specific_data': [14,0,54,0,0,0,0,0]
},
{
'manufacturer_specific_data_id': 1,
- 'manufacturer_specific_data': "1",
- 'manufacturer_specific_data_mask': "1"
+ 'manufacturer_specific_data': [1],
+ 'manufacturer_specific_data_mask': [1]
},
{
'service_data_uuid': "0000110A-0000-1000-8000-00805F9B34FB",
- 'service_data': "1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,26,17,18,19,"
- "20,21,22,23,24"
+ 'service_data': [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,26,17,18,19,
+ 20,21,22,23,24]
},
{
'service_data_uuid': "0000110B-0000-1000-8000-00805F9B34FB",
- 'service_data': "13"
+ 'service_data': [13]
},
{
'service_data_uuid': "0000110C-0000-1000-8000-00805F9B34FB",
- 'service_data': "11,14,50"
+ 'service_data': [11,14,50]
},
{
'service_data_uuid': "0000110D-0000-1000-8000-00805F9B34FB",
- 'service_data': "16,22,11"
+ 'service_data': [16,22,11]
},
{
'service_data_uuid': "0000110E-0000-1000-8000-00805F9B34FB",
- 'service_data': "2,9,54"
+ 'service_data': [2,9,54]
},
{
'service_data_uuid': "0000110F-0000-1000-8000-00805F9B34FB",
- 'service_data': "69,11,50"
+ 'service_data': [69,11,50]
},
{
'service_data_uuid': "00001101-0000-1000-8000-00805F9B34FB",
- 'service_data': "12,11,21"
+ 'service_data': [12,11,21]
},
{
'service_data_uuid': "00001102-0000-1000-8000-00805F9B34FB",
- 'service_data': "12,12,44"
+ 'service_data': [12,12,44]
},
{
'service_data_uuid': "00001103-0000-1000-8000-00805F9B34FB",
- 'service_data': "4,54,1"
+ 'service_data': [4,54,1]
},
{
'service_data_uuid': "00001104-0000-1000-8000-00805F9B34FB",
- 'service_data': "33,22,44"
+ 'service_data': [33,22,44]
},
{
'service_uuid': "00000000-0000-1000-8000-00805f9b34fb",
@@ -116,15 +116,15 @@
valid_filter_variants = {
'include_tx_power_level': [True, False],
'manufacturer_specific_data_id': [1, 2, 65535],
- 'manufacturer_specific_data': ["1", "1,2", "127"],
+ 'manufacturer_specific_data': [[1], [1,2], [127]],
'service_data_uuid': ["00000000-0000-1000-8000-00805f9b34fb"],
- 'service_data': ["1,2,3", "1", "127"],
+ 'service_data': [[1,2,3], [1], [127]],
'include_device_name': [False, True],
}
multi_manufacturer_specific_data_suite = {
- 'manufacturer_specific_data_list': [[(1, "1"), (2, "2"),
- (65535, "127")]],
+ 'manufacturer_specific_data_list': [[(1, [1]), (2, [2]),
+ (65535, [127])]],
}
settings_in_effect_variants = {
@@ -622,8 +622,8 @@
settings = {'is_connectable': False}
filters = {
'service_data_uuid': "0000110A-0000-1000-8000-00805F9B34FB",
- 'service_data': "1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,26,17,18,19,"
- "20,21,22,23,24,25,26,27",
+ 'service_data': [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,26,17,18,19,
+ 20,21,22,23,24,25,26,27],
}
params = (filters, settings)
return self._magic(params)
diff --git a/acts/tests/google/ble/filtering/UniqueFilteringTest.py b/acts/tests/google/ble/filtering/UniqueFilteringTest.py
index 53fa0ea..d091102 100644
--- a/acts/tests/google/ble/filtering/UniqueFilteringTest.py
+++ b/acts/tests/google/ble/filtering/UniqueFilteringTest.py
@@ -358,15 +358,15 @@
the full manufacturer data in the second advertisement.
Steps:
- 1. Setup up an advertisement with manufacturer data "1,2,3".
+ 1. Setup up an advertisement with manufacturer data [1,2,3].
2. Setup a second advertisement with manufacturer data
- "1,2,3,4,5,6,7,8".
+ [1,2,3,4,5,6,7,8].
3. Start advertising on each advertisement.
- 4. Create a scan filter that includes manufacturer data "1,2,3".
+ 4. Create a scan filter that includes manufacturer data [1,2,3].
Expected Result:
TBD. Right now Shamu finds only the first advertisement with
- manufacturer data "1,2,3".
+ manufacturer data [1,2,3].
Returns:
Pass if True
@@ -378,13 +378,13 @@
test_result = True
self.adv_ad.droid.bleSetAdvertiseSettingsAdvertiseMode(
AdvertiseSettingsAdvertiseMode.ADVERTISE_MODE_LOW_LATENCY.value)
- self.adv_ad.droid.bleAddAdvertiseDataManufacturerId(117, "1,2,3")
+ self.adv_ad.droid.bleAddAdvertiseDataManufacturerId(117, [1,2,3])
advertise_callback, advertise_data, advertise_settings = (
generate_ble_advertise_objects(self.adv_ad.droid))
self.adv_ad.droid.bleSetAdvertiseSettingsAdvertiseMode(
AdvertiseSettingsAdvertiseMode.ADVERTISE_MODE_LOW_LATENCY.value)
self.adv_ad.droid.bleAddAdvertiseDataManufacturerId(117,
- "1,2,3,4,5,6,7,8")
+ [1,2,3,4,5,6,7,8])
advertise_callback1, advertise_data1, advertise_settings1 = (
generate_ble_advertise_objects(self.adv_ad.droid))
self.adv_ad.droid.bleStartBleAdvertising(
@@ -397,8 +397,8 @@
ScanSettingsScanMode.SCAN_MODE_LOW_LATENCY.value)
scan_settings = self.scn_ad.droid.bleBuildScanSetting()
scan_callback = self.scn_ad.droid.bleGenScanCallback()
- self.scn_ad.droid.bleSetScanFilterManufacturerData(117, "1,2,3",
- "127,127,127")
+ self.scn_ad.droid.bleSetScanFilterManufacturerData(117, [1,2,3],
+ [127,127,127])
self.scn_ad.droid.bleBuildScanFilter(filter_list)
self.scn_ad.droid.bleStartBleScan(filter_list, scan_settings,
scan_callback)
