From 691450c7de69d9e714897f153455469f99837557 Mon Sep 17 00:00:00 2001 From: Abel Lucas Date: Tue, 29 Nov 2022 16:43:47 +0000 Subject: [PATCH] gatt: fix `CharacteristicDeclaration.__str__` and associated test --- bumble/gatt.py | 3 ++- tests/gatt_test.py | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bumble/gatt.py b/bumble/gatt.py index f59e7bed..3ba7e23a 100644 --- a/bumble/gatt.py +++ b/bumble/gatt.py @@ -295,10 +295,11 @@ class CharacteristicDeclaration(Attribute): value_handle ) + characteristic.uuid.to_pdu_bytes() super().__init__(GATT_CHARACTERISTIC_ATTRIBUTE_TYPE, Attribute.READABLE, declaration_bytes) + self.value_handle = value_handle self.characteristic = characteristic def __str__(self): - return f'CharacteristicDeclaration(handle=0x{self.handle:04X}, value_handle=0x{self.value_handle:04X}, uuid={self.uuid}, properties={Characteristic.properties_as_string(self.properties)})' + return f'CharacteristicDeclaration(handle=0x{self.handle:04X}, value_handle=0x{self.value_handle:04X}, uuid={self.characteristic.uuid}, properties={Characteristic.properties_as_string(self.characteristic.properties)})' # ----------------------------------------------------------------------------- class CharacteristicValue: diff --git a/tests/gatt_test.py b/tests/gatt_test.py index b5bfdbc2..9630fde1 100644 --- a/tests/gatt_test.py +++ b/tests/gatt_test.py @@ -777,12 +777,12 @@ async def test_server_string(): server.add_service(service) assert str(server.gatt_server) == """Service(handle=0x0001, end=0x0005, uuid=UUID-16:1800 (Generic Access)) -Attribute(handle=0x0002, type=UUID-16:2803 (Characteristic), permissions=1, value=020300002a) +CharacteristicDeclaration(handle=0x0002, value_handle=0x0003, uuid=UUID-16:2A00 (Device Name), properties=READ) Characteristic(handle=0x0003, end=0x0003, uuid=UUID-16:2A00 (Device Name), properties=READ) -Attribute(handle=0x0004, type=UUID-16:2803 (Characteristic), permissions=1, value=020500012a) +CharacteristicDeclaration(handle=0x0004, value_handle=0x0005, uuid=UUID-16:2A01 (Appearance), properties=READ) Characteristic(handle=0x0005, end=0x0005, uuid=UUID-16:2A01 (Appearance), properties=READ) Service(handle=0x0006, end=0x0009, uuid=3A657F47-D34F-46B3-B1EC-698E29B6B829) -Attribute(handle=0x0007, type=UUID-16:2803 (Characteristic), permissions=1, value=1a0800060875ac2563dbb3e3496c03db59b1fd) +CharacteristicDeclaration(handle=0x0007, value_handle=0x0008, uuid=FDB159DB-036C-49E3-B3DB-6325AC750806, properties=READ,WRITE,NOTIFY) Characteristic(handle=0x0008, end=0x0009, uuid=FDB159DB-036C-49E3-B3DB-6325AC750806, properties=READ,WRITE,NOTIFY) Descriptor(handle=0x0009, type=UUID-16:2902 (Client Characteristic Configuration), value=0000)"""