Add UUIDs to new tests
Test: n/a
Bug: 62268532
Change-Id: I294e8985aedbd8b96e66d4dbf5af0f655e0c557d
diff --git a/acts/tests/google/ble/bt5/AdvertisingSetTest.py b/acts/tests/google/ble/bt5/AdvertisingSetTest.py
index 580520b..ccf2bb0 100644
--- a/acts/tests/google/ble/bt5/AdvertisingSetTest.py
+++ b/acts/tests/google/ble/bt5/AdvertisingSetTest.py
@@ -51,13 +51,16 @@
big_adv_data = {
"includeDeviceName": True,
"manufacturerData": [0x0123, "00112233445566778899AABBCCDDEE"],
- "manufacturerData2": [0x2540, [0x00, 0x11, 0x22, 0x33, 0x44, 0x55,
- 0x66, 0x77, 0x88, 0xFF]],
- "serviceData": ["b19d42dc-58ba-4b20-b6c1-6628e7d21de4",
- "00112233445566778899AABBCCDDEE"],
- "serviceData2":
- ["000042dc-58ba-4b20-b6c1-6628e7d21de4",
- [0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0xFF]]
+ "manufacturerData2":
+ [0x2540, [0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0xFF]],
+ "serviceData": [
+ "b19d42dc-58ba-4b20-b6c1-6628e7d21de4",
+ "00112233445566778899AABBCCDDEE"
+ ],
+ "serviceData2": [
+ "000042dc-58ba-4b20-b6c1-6628e7d21de4",
+ [0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0xFF]
+ ]
}
def __init__(self, controllers):
@@ -76,15 +79,35 @@
reset_bluetooth(self.android_devices)
@BluetoothBaseTest.bt_test_wrap
+ @test_tracker_info(uuid='58182f7e-443f-47fb-b718-1be3ac850287')
def test_reenabling(self):
+ """Test re-enabling an Advertising Set
+
+ Test GATT notify characteristic value.
+
+ Steps:
+ 1. Start an advertising set that only lasts for a few seconds
+ 2. Restart advertising set
+ 3. Repeat steps 1-2
+
+ Expected Result:
+ Verify that advertising set re-enables
+
+ Returns:
+ Pass if True
+ Fail if False
+
+ TAGS: LE, GATT, Characteristic
+ Priority: 1
+ """
adv_callback = self.adv_ad.droid.bleAdvSetGenCallback()
- self.adv_ad.droid.bleAdvSetStartAdvertisingSet(
- {"connectable": False,
- "legacyMode": False,
- "primaryPhy": "PHY_LE_1M",
- "secondaryPhy": "PHY_LE_1M",
- "interval": 320}, self.big_adv_data, None, None, None,
- adv_callback)
+ self.adv_ad.droid.bleAdvSetStartAdvertisingSet({
+ "connectable": False,
+ "legacyMode": False,
+ "primaryPhy": "PHY_LE_1M",
+ "secondaryPhy": "PHY_LE_1M",
+ "interval": 320
+ }, self.big_adv_data, None, None, None, adv_callback)
set_started_evt = self.adv_ad.ed.pop_event(
advertising_set_started.format(adv_callback), self.default_timeout)
diff --git a/acts/tests/google/ble/bt5/Bt5ScanTest.py b/acts/tests/google/ble/bt5/Bt5ScanTest.py
index 3d71ebc..22a5461 100644
--- a/acts/tests/google/ble/bt5/Bt5ScanTest.py
+++ b/acts/tests/google/ble/bt5/Bt5ScanTest.py
@@ -49,13 +49,16 @@
big_adv_data = {
"includeDeviceName": True,
"manufacturerData": [0x0123, "00112233445566778899AABBCCDDEE"],
- "manufacturerData2": [0x2540, [0x00, 0x11, 0x22, 0x33, 0x44, 0x55,
- 0x66, 0x77, 0x88, 0xFF]],
- "serviceData": ["b19d42dc-58ba-4b20-b6c1-6628e7d21de4",
- "00112233445566778899AABBCCDDEE"],
- "serviceData2":
- ["000042dc-58ba-4b20-b6c1-6628e7d21de4",
- [0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0xFF]]
+ "manufacturerData2":
+ [0x2540, [0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0xFF]],
+ "serviceData": [
+ "b19d42dc-58ba-4b20-b6c1-6628e7d21de4",
+ "00112233445566778899AABBCCDDEE"
+ ],
+ "serviceData2": [
+ "000042dc-58ba-4b20-b6c1-6628e7d21de4",
+ [0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0xFF]
+ ]
}
def __init__(self, controllers):
@@ -83,7 +86,25 @@
# This one does not relly test anything, but display very helpful
# information that might help with debugging.
@BluetoothBaseTest.bt_test_wrap
+ @test_tracker_info(uuid='787e0877-269f-4b9b-acb0-b98a8bb3770a')
def test_capabilities(self):
+ """Test capabilities
+
+ Test BT 5.0 scan scapabilities
+
+ Steps:
+ 1. Test various vapabilities.
+
+ Expected Result:
+ Pass
+
+ Returns:
+ Pass if True
+ Fail if False
+
+ TAGS: BT5.0, Scanning
+ Priority: 2
+ """
d = self.scn_ad.droid
sup2M = d.bluetoothIsLe2MPhySupported()
supCoded = d.bluetoothIsLeCodedPhySupported()
@@ -91,9 +112,9 @@
supPeriodic = d.bluetoothIsLePeriodicAdvertisingSupported()
maxDataLen = d.bluetoothGetLeMaximumAdvertisingDataLength()
self.log.info("Scanner capabilities:")
- self.log.info("LE 2M: " + str(sup2M) + ", LE Coded: " + str(supCoded) +
- ", LE Extended Advertising: " + str(supExt) +
- ", LE Periodic Advertising: " + str(supPeriodic) +
+ self.log.info("LE 2M: " + str(sup2M) + ", LE Coded: " + str(
+ supCoded) + ", LE Extended Advertising: " + str(
+ supExt) + ", LE Periodic Advertising: " + str(supPeriodic) +
", maximum advertising data length: " + str(maxDataLen))
d = self.adv_ad.droid
sup2M = d.bluetoothIsLe2MPhySupported()
@@ -102,12 +123,14 @@
supPeriodic = d.bluetoothIsLePeriodicAdvertisingSupported()
maxDataLen = d.bluetoothGetLeMaximumAdvertisingDataLength()
self.log.info("Advertiser capabilities:")
- self.log.info("LE 2M: " + str(sup2M) + ", LE Coded: " + str(supCoded) +
- ", LE Extended Advertising: " + str(supExt) +
- ", LE Periodic Advertising: " + str(supPeriodic) +
+ self.log.info("LE 2M: " + str(sup2M) + ", LE Coded: " + str(
+ supCoded) + ", LE Extended Advertising: " + str(
+ supExt) + ", LE Periodic Advertising: " + str(supPeriodic) +
", maximum advertising data length: " + str(maxDataLen))
return True
+ @BluetoothBaseTest.bt_test_wrap
+ @test_tracker_info(uuid='62d36679-bb91-465e-897f-2635433aac2f')
def test_1m_1m_extended_scan(self):
"""Test scan on LE 1M PHY using LE 1M PHY as secondary.
@@ -131,13 +154,13 @@
Priority: 1
"""
adv_callback = self.adv_ad.droid.bleAdvSetGenCallback()
- self.adv_ad.droid.bleAdvSetStartAdvertisingSet(
- {"connectable": True,
- "legacyMode": False,
- "primaryPhy": "PHY_LE_1M",
- "secondaryPhy": "PHY_LE_1M",
- "interval": 320}, self.big_adv_data, None, None, None, 0, 0,
- adv_callback)
+ self.adv_ad.droid.bleAdvSetStartAdvertisingSet({
+ "connectable": True,
+ "legacyMode": False,
+ "primaryPhy": "PHY_LE_1M",
+ "secondaryPhy": "PHY_LE_1M",
+ "interval": 320
+ }, self.big_adv_data, None, None, None, 0, 0, adv_callback)
self.scn_ad.droid.bleSetScanSettingsLegacy(False)
self.scn_ad.droid.bleSetScanSettingsPhy(
@@ -164,6 +187,8 @@
self.adv_ad.droid.bleAdvSetStopAdvertisingSet(adv_callback)
return True
+ @BluetoothBaseTest.bt_test_wrap
+ @test_tracker_info(uuid='3e3c9757-f7b6-4d1d-a2d6-8e2330d1a18e')
def test_1m_2m_extended_scan(self):
"""Test scan on LE 1M PHY using LE 2M PHY as secondary.
@@ -187,13 +212,13 @@
Priority: 1
"""
adv_callback = self.adv_ad.droid.bleAdvSetGenCallback()
- self.adv_ad.droid.bleAdvSetStartAdvertisingSet(
- {"connectable": True,
- "legacyMode": False,
- "primaryPhy": "PHY_LE_1M",
- "secondaryPhy": "PHY_LE_2M",
- "interval": 320}, self.big_adv_data, None, None, None, 0, 0,
- adv_callback)
+ self.adv_ad.droid.bleAdvSetStartAdvertisingSet({
+ "connectable": True,
+ "legacyMode": False,
+ "primaryPhy": "PHY_LE_1M",
+ "secondaryPhy": "PHY_LE_2M",
+ "interval": 320
+ }, self.big_adv_data, None, None, None, 0, 0, adv_callback)
self.scn_ad.droid.bleSetScanSettingsLegacy(False)
self.scn_ad.droid.bleSetScanSettingsPhy(
@@ -220,9 +245,13 @@
self.adv_ad.droid.bleAdvSetStopAdvertisingSet(adv_callback)
return True
-
+ @BluetoothBaseTest.bt_test_wrap
+ @test_tracker_info(uuid='236e9e5b-3853-4762-81ae-e88db03d74f3')
def test_legacy_scan_result_raw_length(self):
- """Test that raw scan record data in legacy scan is 62 bytes long. This is required for compability with older apps that make this assumption.
+ """Test that raw scan record data in legacy scan is 62 bytes long.
+
+ This is required for compability with older apps that make this
+ assumption.
Steps:
1. Start legacy advertising set on dut1
@@ -241,12 +270,12 @@
Priority: 1
"""
adv_callback = self.adv_ad.droid.bleAdvSetGenCallback()
- self.adv_ad.droid.bleAdvSetStartAdvertisingSet(
- {"connectable": True,
- "scannable": True,
- "legacyMode": True,
- "interval": 320}, {"includeDeviceName": True}, None, None, None, 0, 0,
- adv_callback)
+ self.adv_ad.droid.bleAdvSetStartAdvertisingSet({
+ "connectable": True,
+ "scannable": True,
+ "legacyMode": True,
+ "interval": 320
+ }, {"includeDeviceName": True}, None, None, None, 0, 0, adv_callback)
self.scn_ad.droid.bleSetScanSettingsLegacy(True)
self.scn_ad.droid.bleSetScanSettingsPhy(
@@ -266,9 +295,8 @@
evt = self.scn_ad.ed.pop_event(
scan_result.format(scan_callback), self.default_timeout)
rawData = evt['data']['Result']['scanRecord']
- asserts.assert_true(
- 62 == len(rawData.split(",")),
- "Raw data should be 62 bytes long.")
+ asserts.assert_true(62 == len(rawData.split(",")),
+ "Raw data should be 62 bytes long.")
except Empty:
self.log.error("Scan result not found")
self.adv_ad.droid.bleAdvSetStopAdvertisingSet(adv_callback)
@@ -277,16 +305,36 @@
self.adv_ad.droid.bleAdvSetStopAdvertisingSet(adv_callback)
return True
-
+ @BluetoothBaseTest.bt_test_wrap
+ @test_tracker_info(uuid='04632d8d-4303-476f-8f83-52c16be3713a')
def test_duration(self):
+ """Test scanning duration
+
+ Tests BT5.0 scanning duration
+
+ Steps:
+ 1. Start advertising set
+ 2. Start 5.0 scan
+ 3. Scan for advertisement event
+
+ Expected Result:
+ Scan finds a legacy advertisement of proper size
+
+ Returns:
+ Pass if True
+ Fail if False
+
+ TAGS: BT5.0, LE, Advertising, Scanning
+ Priority: 1
+ """
adv_callback = self.adv_ad.droid.bleAdvSetGenCallback()
- self.adv_ad.droid.bleAdvSetStartAdvertisingSet(
- {"connectable": True,
- "legacyMode": False,
- "primaryPhy": "PHY_LE_1M",
- "secondaryPhy": "PHY_LE_2M",
- "interval": 320}, self.big_adv_data, None, None, None, 0, 0,
- adv_callback)
+ self.adv_ad.droid.bleAdvSetStartAdvertisingSet({
+ "connectable": True,
+ "legacyMode": False,
+ "primaryPhy": "PHY_LE_1M",
+ "secondaryPhy": "PHY_LE_2M",
+ "interval": 320
+ }, self.big_adv_data, None, None, None, 0, 0, adv_callback)
self.scn_ad.droid.bleSetScanSettingsLegacy(False)
self.scn_ad.droid.bleSetScanSettingsPhy(
@@ -313,7 +361,8 @@
self.adv_ad.droid.bleAdvSetStopAdvertisingSet(adv_callback)
return True
-
+ @BluetoothBaseTest.bt_test_wrap
+ @test_tracker_info(uuid='a3704083-0f5c-4a46-b979-32ebc594d6ee')
def test_anonymous_advertising(self):
"""Test anonymous advertising.
@@ -337,14 +386,14 @@
Priority: 1
"""
adv_callback = self.adv_ad.droid.bleAdvSetGenCallback()
- self.adv_ad.droid.bleAdvSetStartAdvertisingSet(
- {"connectable": False,
- "anonymous": True,
- "legacyMode": False,
- "primaryPhy": "PHY_LE_1M",
- "secondaryPhy": "PHY_LE_2M",
- "interval": 320}, self.big_adv_data, None, None, None, 0, 0,
- adv_callback)
+ self.adv_ad.droid.bleAdvSetStartAdvertisingSet({
+ "connectable": False,
+ "anonymous": True,
+ "legacyMode": False,
+ "primaryPhy": "PHY_LE_1M",
+ "secondaryPhy": "PHY_LE_2M",
+ "interval": 320
+ }, self.big_adv_data, None, None, None, 0, 0, adv_callback)
self.scn_ad.droid.bleSetScanSettingsLegacy(False)
self.scn_ad.droid.bleSetScanSettingsPhy(
@@ -366,7 +415,8 @@
address = evt['data']['Result']['deviceInfo']['address']
asserts.assert_true(
'00:00:00:00:00:00' == address,
- "Anonymous address should be 00:00:00:00:00:00, but was " + str(address))
+ "Anonymous address should be 00:00:00:00:00:00, but was " +
+ str(address))
except Empty:
self.log.error("Scan result not found")
self.adv_ad.droid.bleAdvSetStopAdvertisingSet(adv_callback)
@@ -376,9 +426,12 @@
return True
@BluetoothBaseTest.bt_test_wrap
+ @test_tracker_info(uuid='e3277355-eebf-4760-9502-e49a9289f6ab')
def test_get_own_address(self):
"""Test obtaining own address for PTS.
+ Test obtaining own address.
+
Steps:
1. Start advertising set dut1
2. Grab address
@@ -395,20 +448,21 @@
Priority: 1
"""
adv_callback = self.adv_ad.droid.bleAdvSetGenCallback()
- self.adv_ad.droid.bleAdvSetStartAdvertisingSet(
- {"connectable": False,
- "anonymous": True,
- "legacyMode": False,
- "primaryPhy": "PHY_LE_1M",
- "secondaryPhy": "PHY_LE_2M",
- "interval": 320}, self.big_adv_data, None, None, None, 0, 0,
- adv_callback)
+ self.adv_ad.droid.bleAdvSetStartAdvertisingSet({
+ "connectable": False,
+ "anonymous": True,
+ "legacyMode": False,
+ "primaryPhy": "PHY_LE_1M",
+ "secondaryPhy": "PHY_LE_2M",
+ "interval": 320
+ }, self.big_adv_data, None, None, None, 0, 0, adv_callback)
set_id = -1
try:
evt = self.adv_ad.ed.pop_event(
- advertising_set_started.format(adv_callback), self.default_timeout)
+ advertising_set_started.format(adv_callback),
+ self.default_timeout)
self.log.info("data: " + str(evt['data']))
set_id = evt['data']['setId']
except Empty:
@@ -420,7 +474,8 @@
try:
evt = self.adv_ad.ed.pop_event(
- advertising_set_on_own_address_read.format(set_id), self.default_timeout)
+ advertising_set_on_own_address_read.format(set_id),
+ self.default_timeout)
address = evt['data']['address']
self.log.info("Advertiser address is: " + str(address))
except Empty:
@@ -428,6 +483,5 @@
self.adv_ad.droid.bleAdvSetStopAdvertisingSet(adv_callback)
return False
-
self.adv_ad.droid.bleAdvSetStopAdvertisingSet(adv_callback)
return True
diff --git a/acts/tests/google/ble/bt5/PhyTest.py b/acts/tests/google/ble/bt5/PhyTest.py
index 4046318..b1bb21f 100644
--- a/acts/tests/google/ble/bt5/PhyTest.py
+++ b/acts/tests/google/ble/bt5/PhyTest.py
@@ -105,6 +105,7 @@
return (event['data']['TxPhy'], event['data']['RxPhy'])
@BluetoothBaseTest.bt_test_wrap
+ @test_tracker_info(uuid='edb95ae1-97e5-4337-9a60-1e113aa43a4d')
def test_phy_read(self):
"""Test LE read PHY.
@@ -159,6 +160,7 @@
return True
@BluetoothBaseTest.bt_test_wrap
+ @test_tracker_info(uuid='6b66af0a-35eb-42af-acd5-9634684f275d')
def test_phy_change_20_times(self):
"""Test PHY update.
@@ -195,12 +197,13 @@
rxPhy = (i & 1) and rxPhyB or rxPhyA
self.log.info("Will try to set PHY to: " + lfmt(txPhy, rxPhy))
- self.cen_ad.droid.gattClientSetPreferredPhy(
- self.bluetooth_gatt, txPhy, rxPhy, 0)
+ self.cen_ad.droid.gattClientSetPreferredPhy(self.bluetooth_gatt,
+ txPhy, rxPhy, 0)
self.ensure_both_updated_phy(txPhy, rxPhy)
return True
@BluetoothBaseTest.bt_test_wrap
+ @test_tracker_info(uuid='13f28de4-07f4-458c-a3e5-3ba95318616f')
def test_phy_change_asym(self):
"""Test PHY update with asymetric rx and tx PHY.
diff --git a/acts/tests/google/ble/system_tests/GattLongevityTest.py b/acts/tests/google/ble/system_tests/GattLongevityTest.py
index 8784910..fe853b3 100644
--- a/acts/tests/google/ble/system_tests/GattLongevityTest.py
+++ b/acts/tests/google/ble/system_tests/GattLongevityTest.py
@@ -17,6 +17,7 @@
This test script for GATT longevity tests.
"""
+from acts.test_decorators import test_tracker_info
from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
from acts.test_utils.bt.GattConnectedBaseTest import GattConnectedBaseTest
from acts.test_utils.bt.GattEnum import GattCharacteristic
@@ -32,6 +33,7 @@
class GattLongevityTest(GattConnectedBaseTest):
longevity_iterations = 1100000
+ @test_tracker_info(uuid='d7d378f4-89d8-4330-bb80-0054b92020bb')
def test_write_characteristic_no_resp_longevity(self):
"""Longevity test write characteristic value
diff --git a/acts/tests/google/bt/system_tests/RfcommLongevityTest.py b/acts/tests/google/bt/system_tests/RfcommLongevityTest.py
index a6ce8a7..2b81ad3 100644
--- a/acts/tests/google/bt/system_tests/RfcommLongevityTest.py
+++ b/acts/tests/google/bt/system_tests/RfcommLongevityTest.py
@@ -22,6 +22,7 @@
from random import randint
from queue import Empty
+from acts.test_decorators import test_tracker_info
from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
from acts.test_utils.bt.bt_test_utils import orchestrate_rfcomm_connection
@@ -43,6 +44,7 @@
self.client_ad = self.android_devices[0]
self.server_ad = self.android_devices[1]
+ @test_tracker_info(uuid='2790acad-1f6e-4216-aadf-83561dddcfa3')
def test_rfcomm_longev_read_write_message(self):
"""Longevity test an RFCOMM connection's I/O with a generic message
@@ -71,7 +73,7 @@
"""
for i in range(self.longev_iterations):
- self.log.info("iteration {} connection".format(i+1))
+ self.log.info("iteration {} connection".format(i + 1))
if not orchestrate_rfcomm_connection(self.client_ad,
self.server_ad):
return False
@@ -86,6 +88,7 @@
self.server_ad.droid.bluetoothRfcommStop()
return True
+ @test_tracker_info(uuid='01c420b8-845a-4539-90bf-8d7747f471ca')
def test_rfcomm_longev_read_write_small_message(self):
"""Longevity test an RFCOMM connection's I/O with a small message
@@ -115,7 +118,7 @@
"""
message = "x"
for i in range(self.longev_iterations):
- self.log.info("iteration {} connection".format(i+1))
+ self.log.info("iteration {} connection".format(i + 1))
if not orchestrate_rfcomm_connection(self.client_ad,
self.server_ad):
return False
@@ -130,6 +133,7 @@
self.server_ad.droid.bluetoothRfcommStop()
return True
+ @test_tracker_info(uuid='8a92772a-511e-4f15-8e8b-194e499a46eb')
def test_rfcomm_longev_read_write_binary_message(self):
"""Longevity test an RFCOMM connection's I/O with a binary message
@@ -159,7 +163,7 @@
"""
binary_message = "11010101"
for i in range(self.longev_iterations):
- self.log.info("iteration {} connection".format(i+1))
+ self.log.info("iteration {} connection".format(i + 1))
if not orchestrate_rfcomm_connection(self.client_ad,
self.server_ad):
return False
@@ -174,6 +178,7 @@
self.server_ad.droid.bluetoothRfcommStop()
return True
+ @test_tracker_info(uuid='ff0ab2e4-2a7d-45b9-b034-4cd32c0fa139')
def test_rfcomm_longev_read_write_large_message(self):
"""Longevity test an RFCOMM connection's I/O with a large message
@@ -201,9 +206,9 @@
TAGS: Classic, Longevity, RFCOMM
Priority: 2
"""
- message = "x" * 990 #largest message size till sl4a fixed
+ message = "x" * 990 # largest message size till sl4a fixed
for i in range(self.longev_iterations):
- self.log.info("iteration {} connection".format(i+1))
+ self.log.info("iteration {} connection".format(i + 1))
if not orchestrate_rfcomm_connection(self.client_ad,
self.server_ad):
return False
@@ -218,6 +223,7 @@
self.server_ad.droid.bluetoothRfcommStop()
return True
+ @test_tracker_info(uuid='950924b7-d893-4a33-ba09-d80d53dc7d13')
def test_rfcomm_longev_connection_interuption(self):
"""Longevity test an RFCOMM connection's with socket interuptions
@@ -250,7 +256,7 @@
"""
for i in range(self.longev_iterations):
try:
- self.log.info("iteration {} connection".format(i+1))
+ self.log.info("iteration {} connection".format(i + 1))
if not orchestrate_rfcomm_connection(self.client_ad,
self.server_ad):
return False
@@ -283,6 +289,7 @@
return False
return True
+ @test_tracker_info(uuid='155a25be-3e6c-4462-a78f-f6a161b90953')
def test_rfcomm_longev_data_elasticity(self):
"""Longevity test an RFCOMM connection's I/O with changing data size
@@ -318,7 +325,7 @@
resize_toggle = 1
for i in range(self.longev_iterations):
try:
- self.log.info("iteration {} connection".format(i+1))
+ self.log.info("iteration {} connection".format(i + 1))
if not orchestrate_rfcomm_connection(self.client_ad,
self.server_ad):
return False