Provide means of translating descriptor types to user strings

Also, this patch fixes the uninitialised m_type member in the
QLowEnergyDescriptorInfo private implementation

Change-Id: I6736d5f38738490bc4f0f53908f925361f1843bd
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>

1 files changed, 8 insertions, 3 deletions

diff --git a/tests/auto/qlowenergydescriptorinfo/tst_qlowenergydescriptorinfo.cpp b/tests/auto/qlowenergydescriptorinfo/tst_qlowenergydescriptorinfo.cpp
index e53523a1..e10d248e 100644
--- a/tests/auto/qlowenergydescriptorinfo/tst_qlowenergydescriptorinfo.cpp
+++ b/tests/auto/qlowenergydescriptorinfo/tst_qlowenergydescriptorinfo.cpp
@@ -96,7 +96,10 @@ void tst_QLowEnergyDescriptorInfo::tst_construction()
         QCOMPARE(descriptorInfo.uuid(), QBluetoothUuid());
         QCOMPARE(descriptorInfo.value(), QByteArray());
         QCOMPARE(descriptorInfo.handle(), QString("0x0000"));
-        QCOMPARE(descriptorInfo.name(), QString(""));
+        QCOMPARE(descriptorInfo.name(),
+                 QBluetoothUuid::descriptorToString(descriptorInfo.type()));
+        QCOMPARE(descriptorInfo.type(),
+                 QBluetoothUuid::ClientCharacteristicConfiguration);
     }
 
     {
@@ -106,7 +109,8 @@ void tst_QLowEnergyDescriptorInfo::tst_construction()
 
         QLowEnergyDescriptorInfo copyInfo = descriptorInfo;
         QCOMPARE(copyInfo.uuid().toString(), descriptorUuid.toString());
-        QCOMPARE(copyInfo.name(), QString(""));
+        QCOMPARE(copyInfo.name(),
+                 QBluetoothUuid::descriptorToString(copyInfo.type()));
         copyInfo.setValue(QByteArray("test"));
         QCOMPARE(copyInfo.value(), QByteArray("test"));
 
@@ -121,7 +125,8 @@ void tst_QLowEnergyDescriptorInfo::tst_construction()
         QCOMPARE(copyInfo.uuid(), alternateDescriptorUuid);
         QCOMPARE(copyInfo.value(), QByteArray());
         QCOMPARE(copyInfo.handle(), QString("0x0000"));
-        QCOMPARE(copyInfo.name(), QString(""));
+        QCOMPARE(copyInfo.name(),
+                 QBluetoothUuid::descriptorToString(copyInfo.type()));
     }
 }