Compile module without the overwhelming template and QByteArray support

Change-Id: If3760d4793e84919445f84bbcd93f82d22730f6c
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>

1 files changed, 46 insertions, 46 deletions

diff --git a/tests/auto/qknxtunnelframefactory/tst_qknxtunnelframefactory.cpp b/tests/auto/qknxtunnelframefactory/tst_qknxtunnelframefactory.cpp
index 4b5a636..c22ee6e 100644
--- a/tests/auto/qknxtunnelframefactory/tst_qknxtunnelframefactory.cpp
+++ b/tests/auto/qknxtunnelframefactory/tst_qknxtunnelframefactory.cpp
@@ -50,7 +50,7 @@ void tst_QKnxLinkLayerFrameFactory::testGroupValueRead()
     QKnxAddress source { QKnxAddress::Type::Individual, 0 };
     QKnxAddress destination { QKnxAddress::Type::Group, QString("0/0/2") };
     auto frame = QKnxLinkLayerFrameFactory::GroupValue::createReadRequest(source, destination);
-    QCOMPARE(frame.bytes(), QByteArray::fromHex("1100b4e000000002010000"));
+    QCOMPARE(frame.bytes(), QKnxByteArray::fromHex("1100b4e000000002010000"));
     QCOMPARE(frame.extendedControlField().destinationAddressType(), QKnxAddress::Type::Group);
     QCOMPARE(frame.controlField().frameType(), QKnxControlField::FrameType::Standard);
 
@@ -61,11 +61,11 @@ void tst_QKnxLinkLayerFrameFactory::testGroupValueRead()
     source = { QKnxAddress::Type::Individual, QString("1.1.2") };
     frame = QKnxLinkLayerFrameFactory::GroupValue::createReadConfirmation(source, destination,
         QKnxControlField::Confirm::NoError);
-    QCOMPARE(frame.bytes(), QByteArray::fromHex("2e00b4e011020002010000"));
+    QCOMPARE(frame.bytes(), QKnxByteArray::fromHex("2e00b4e011020002010000"));
     QCOMPARE(frame.controlField().frameType(), QKnxControlField::FrameType::Standard);
 
     frame = QKnxLinkLayerFrameFactory::GroupValue::createReadIndication(source, destination);
-    QCOMPARE(frame.bytes(), QByteArray::fromHex("2900b4e011020002010000"));
+    QCOMPARE(frame.bytes(), QKnxByteArray::fromHex("2900b4e011020002010000"));
     QCOMPARE(frame.controlField().frameType(), QKnxControlField::FrameType::Standard);
 }
 
@@ -74,20 +74,20 @@ void tst_QKnxLinkLayerFrameFactory::testGroupValueResponse()
     QKnxAddress src { QKnxAddress::Type::Individual, QString("1.1.1") };
     QKnxAddress destination { QKnxAddress::Type::Group, QString("0/0/2") };
     auto frame = QKnxLinkLayerFrameFactory::GroupValue::createResponseIndication(src, destination,
-        QVector<quint8>(1, 0x01));
-    QCOMPARE(frame.bytes(), QByteArray::fromHex("2900b4e011010002010041"));
+        { 0x01});
+    QCOMPARE(frame.bytes(), QKnxByteArray::fromHex("2900b4e011010002010041"));
     QCOMPARE(frame.extendedControlField().destinationAddressType(), QKnxAddress::Type::Group);
     QCOMPARE(frame.controlField().frameType(), QKnxControlField::FrameType::Standard);
 
     frame = QKnxLinkLayerFrameFactory::GroupValue::createResponseRequest(src, destination,
-        QVector<quint8>(1, 0x01));
-    QCOMPARE(frame.bytes(), QByteArray::fromHex("1100b4e011010002010041"));
+        { 0x01 });
+    QCOMPARE(frame.bytes(), QKnxByteArray::fromHex("1100b4e011010002010041"));
     QCOMPARE(frame.extendedControlField().destinationAddressType(), QKnxAddress::Type::Group);
     QCOMPARE(frame.controlField().frameType(), QKnxControlField::FrameType::Standard);
 
     frame = QKnxLinkLayerFrameFactory::GroupValue::createResponseConfirmation(src, destination,
-        QVector<quint8>(1, 0x01));
-    QCOMPARE(frame.bytes(), QByteArray::fromHex("2e00b4e011010002010041"));
+        { 0x01 });
+    QCOMPARE(frame.bytes(), QKnxByteArray::fromHex("2e00b4e011010002010041"));
     QCOMPARE(frame.extendedControlField().destinationAddressType(), QKnxAddress::Type::Group);
     QCOMPARE(frame.controlField().frameType(), QKnxControlField::FrameType::Standard);
 }
@@ -97,20 +97,20 @@ void tst_QKnxLinkLayerFrameFactory::testGroupValueWrite()
     QKnxAddress source { QKnxAddress::Type::Individual, QString("1.1.1") };
     QKnxAddress destination { QKnxAddress::Type::Group, QString("0/0/2") };
     auto frame = QKnxLinkLayerFrameFactory::GroupValue::createWriteIndication(source, destination,
-        QVector<quint8>(1, 0x01));
-    QCOMPARE(frame.bytes(), QByteArray::fromHex("2900b4e011010002010081"));
+        { 0x01 });
+    QCOMPARE(frame.bytes(), QKnxByteArray::fromHex("2900b4e011010002010081"));
     QCOMPARE(frame.extendedControlField().destinationAddressType(), QKnxAddress::Type::Group);
     QCOMPARE(frame.controlField().frameType(), QKnxControlField::FrameType::Standard);
 
     frame = QKnxLinkLayerFrameFactory::GroupValue::createWriteRequest(source, destination,
-        QVector<quint8>(1, 0x01));
-    QCOMPARE(frame.bytes(), QByteArray::fromHex("1100b4e011010002010081"));
+        { 0x01 });
+    QCOMPARE(frame.bytes(), QKnxByteArray::fromHex("1100b4e011010002010081"));
     QCOMPARE(frame.extendedControlField().destinationAddressType(), QKnxAddress::Type::Group);
     QCOMPARE(frame.controlField().frameType(), QKnxControlField::FrameType::Standard);
 
     frame = QKnxLinkLayerFrameFactory::GroupValue::createWriteConfirmation(source, destination,
-        QVector<quint8>(1, 0x01));
-    QCOMPARE(frame.bytes(), QByteArray::fromHex("2e00b4e011010002010081"));
+        { 0x01 });
+    QCOMPARE(frame.bytes(), QKnxByteArray::fromHex("2e00b4e011010002010081"));
     QCOMPARE(frame.extendedControlField().destinationAddressType(), QKnxAddress::Type::Group);
     QCOMPARE(frame.controlField().frameType(), QKnxControlField::FrameType::Standard);
 }
@@ -121,9 +121,9 @@ void tst_QKnxLinkLayerFrameFactory::testMemoryRead()
     QKnxAddress destination { QKnxAddress::Type::Individual, QString("1.2.3") };
     auto frame = QKnxLinkLayerFrameFactory::Memory::createReadRequest(source, destination, 52, 3);
     QCOMPARE(frame.extendedControlField().destinationAddressType(), QKnxAddress::Type::Individual);
-    QCOMPARE(frame.extendedControlField().bytes(), quint8(96));
-    QCOMPARE(frame.tpdu().bytes(), QVector<quint8>({ 0x42, 0x03, 0x00, 0x34 }));
-    QCOMPARE(frame.bytes(), QByteArray::fromHex("1100b460000012030342030034"));
+    QCOMPARE(frame.extendedControlField().bytes()[0], quint8(96));
+    QCOMPARE(frame.tpdu().bytes(), QKnxByteArray({ 0x42, 0x03, 0x00, 0x34 }));
+    QCOMPARE(frame.bytes(), QKnxByteArray::fromHex("1100b460000012030342030034"));
     QCOMPARE(frame.controlField().frameType(), QKnxControlField::FrameType::Standard);
 
     QKnxAddress destinationWrong = { QKnxAddress::Type::Group, QString("0.0.2") };
@@ -133,25 +133,25 @@ void tst_QKnxLinkLayerFrameFactory::testMemoryRead()
     source = { QKnxAddress::Type::Individual, QString("1.1.2") };
     frame = QKnxLinkLayerFrameFactory::Memory::createReadConfirmation(source, destination, 52, 3, 0,
         QKnxControlField::Confirm::NoError);
-    QCOMPARE(frame.bytes(), QByteArray::fromHex("2e00b460110212030342030034"));
+    QCOMPARE(frame.bytes(), QKnxByteArray::fromHex("2e00b460110212030342030034"));
     QCOMPARE(frame.controlField().frameType(), QKnxControlField::FrameType::Standard);
 
     frame = QKnxLinkLayerFrameFactory::Memory::createReadIndication(source, destination, 52, 3);
-    QCOMPARE(frame.bytes(), QByteArray::fromHex("2900b460110212030342030034"));
+    QCOMPARE(frame.bytes(), QKnxByteArray::fromHex("2900b460110212030342030034"));
     QCOMPARE(frame.controlField().frameType(), QKnxControlField::FrameType::Standard);
 }
 
 void tst_QKnxLinkLayerFrameFactory::testMemoryResponse()
 {
-    QVector<quint8> data({ 0x01, 0x02, 0x03 });
+    QKnxByteArray data { 0x01, 0x02, 0x03 };
     QKnxAddress source { QKnxAddress::Type::Individual, 0 };
     QKnxAddress destination { QKnxAddress::Type::Individual, QString("1.2.3") };
     auto frame = QKnxLinkLayerFrameFactory::Memory::createResponseRequest(source, destination, 52, 3,
         data);
     QCOMPARE(frame.extendedControlField().destinationAddressType(), QKnxAddress::Type::Individual);
-    QCOMPARE(frame.extendedControlField().bytes(), quint8(96));
-    QCOMPARE(frame.tpdu().bytes(), QVector<quint8>({ 0x42, 0x43, 0x00, 0x34, 0x01, 0x02, 0x03 }));
-    QCOMPARE(frame.bytes(), QByteArray::fromHex("1100b460000012030642430034010203"));
+    QCOMPARE(frame.extendedControlField().bytes()[0], quint8(96));
+    QCOMPARE(frame.tpdu().bytes(), QKnxByteArray({ 0x42, 0x43, 0x00, 0x34, 0x01, 0x02, 0x03 }));
+    QCOMPARE(frame.bytes(), QKnxByteArray::fromHex("1100b460000012030642430034010203"));
     QCOMPARE(frame.controlField().frameType(), QKnxControlField::FrameType::Standard);
 
     QKnxAddress destinationWrong = { QKnxAddress::Type::Group, QString("0.0.2") };
@@ -162,26 +162,26 @@ void tst_QKnxLinkLayerFrameFactory::testMemoryResponse()
     source = { QKnxAddress::Type::Individual, QString("1.1.2") };
     frame = QKnxLinkLayerFrameFactory::Memory::createResponseConfirmation(source, destination, 52, 3,
         data, 0, QKnxControlField::Confirm::NoError);
-    QCOMPARE(frame.bytes(), QByteArray::fromHex("2e00b460110212030642430034010203"));
+    QCOMPARE(frame.bytes(), QKnxByteArray::fromHex("2e00b460110212030642430034010203"));
     QCOMPARE(frame.controlField().frameType(), QKnxControlField::FrameType::Standard);
 
     frame = QKnxLinkLayerFrameFactory::Memory::createResponseIndication(source, destination, 52, 3,
         data);
-    QCOMPARE(frame.bytes(), QByteArray::fromHex("2900b460110212030642430034010203"));
+    QCOMPARE(frame.bytes(), QKnxByteArray::fromHex("2900b460110212030642430034010203"));
     QCOMPARE(frame.controlField().frameType(), QKnxControlField::FrameType::Standard);
 }
 
 void tst_QKnxLinkLayerFrameFactory::testMemoryWrite()
 {
-    QVector<quint8> data({ 0x01, 0x02, 0x03 });
+    QKnxByteArray data { 0x01, 0x02, 0x03 };
     QKnxAddress source { QKnxAddress::Type::Individual, 0 };
     QKnxAddress destination { QKnxAddress::Type::Individual, QString("1.2.3") };
     auto frame = QKnxLinkLayerFrameFactory::Memory::createWriteRequest(source, destination, 52, 3,
         data);
     QCOMPARE(frame.extendedControlField().destinationAddressType(), QKnxAddress::Type::Individual);
-    QCOMPARE(frame.extendedControlField().bytes(), quint8(96));
-    QCOMPARE(frame.tpdu().bytes(), QVector<quint8>({ 0x42, 0x83, 0x00, 0x34, 0x01, 0x02, 0x03 }));
-    QCOMPARE(frame.bytes(), QByteArray::fromHex("1100b460000012030642830034010203"));
+    QCOMPARE(frame.extendedControlField().bytes()[0], quint8(96));
+    QCOMPARE(frame.tpdu().bytes(), QKnxByteArray({ 0x42, 0x83, 0x00, 0x34, 0x01, 0x02, 0x03 }));
+    QCOMPARE(frame.bytes(), QKnxByteArray::fromHex("1100b460000012030642830034010203"));
     QCOMPARE(frame.controlField().frameType(), QKnxControlField::FrameType::Standard);
 
     QKnxAddress destinationWrong = { QKnxAddress::Type::Group, QString("0.0.2") };
@@ -192,12 +192,12 @@ void tst_QKnxLinkLayerFrameFactory::testMemoryWrite()
     source = { QKnxAddress::Type::Individual, QString("1.1.2") };
     frame = QKnxLinkLayerFrameFactory::Memory::createWriteConfirmation(source, destination, 52, 3,
         data, 0, QKnxControlField::Confirm::NoError);
-    QCOMPARE(frame.bytes(), QByteArray::fromHex("2e00b460110212030642830034010203"));
+    QCOMPARE(frame.bytes(), QKnxByteArray::fromHex("2e00b460110212030642830034010203"));
     QCOMPARE(frame.controlField().frameType(), QKnxControlField::FrameType::Standard);
 
     frame = QKnxLinkLayerFrameFactory::Memory::createWriteIndication(source, destination, 52, 3,
         data);
-    QCOMPARE(frame.bytes(), QByteArray::fromHex("2900b460110212030642830034010203"));
+    QCOMPARE(frame.bytes(), QKnxByteArray::fromHex("2900b460110212030642830034010203"));
     QCOMPARE(frame.controlField().frameType(), QKnxControlField::FrameType::Standard);
 }
 
@@ -210,9 +210,9 @@ void tst_QKnxLinkLayerFrameFactory::testDeviceDescriptorRead()
     auto frame = QKnxLinkLayerFrameFactory::DeviceDescriptor::createReadRequest(source, destination, 3,
         mode);
     QCOMPARE(frame.extendedControlField().destinationAddressType(), QKnxAddress::Type::Individual);
-    QCOMPARE(frame.extendedControlField().bytes(), quint8(96));
-    QCOMPARE(frame.tpdu().bytes(), QVector<quint8>({ 0x43, 0x03 }));
-    QCOMPARE(frame.bytes(), QByteArray::fromHex("1100b46000001203014303"));
+    QCOMPARE(frame.extendedControlField().bytes()[0], quint8(96));
+    QCOMPARE(frame.tpdu().bytes(), QKnxByteArray({ 0x43, 0x03 }));
+    QCOMPARE(frame.bytes(), QKnxByteArray::fromHex("1100b46000001203014303"));
     QCOMPARE(frame.controlField().frameType(), QKnxControlField::FrameType::Standard);
 
     QKnxAddress destinationWrong = { QKnxAddress::Type::Group, QString("0.0.2") };
@@ -223,18 +223,18 @@ void tst_QKnxLinkLayerFrameFactory::testDeviceDescriptorRead()
     source = { QKnxAddress::Type::Individual, QString("1.1.2") };
     frame = QKnxLinkLayerFrameFactory::DeviceDescriptor::createReadConfirmation(source, destination, 3,
         mode, 0, QKnxControlField::Confirm::NoError);
-    QCOMPARE(frame.bytes(), QByteArray::fromHex("2e00b46011021203014303"));
+    QCOMPARE(frame.bytes(), QKnxByteArray::fromHex("2e00b46011021203014303"));
     QCOMPARE(frame.controlField().frameType(), QKnxControlField::FrameType::Standard);
 
     frame = QKnxLinkLayerFrameFactory::DeviceDescriptor::createReadIndication(source, destination, 3,
         mode);
-    QCOMPARE(frame.bytes(), QByteArray::fromHex("2900b46011021203014303"));
+    QCOMPARE(frame.bytes(), QKnxByteArray::fromHex("2900b46011021203014303"));
     QCOMPARE(frame.controlField().frameType(), QKnxControlField::FrameType::Standard);
 }
 
 void tst_QKnxLinkLayerFrameFactory::testDeviceDescriptorResponse()
 {
-    QVector<quint8> data({ 0x01, 0x02, 0x03 });
+    QKnxByteArray data { 0x01, 0x02, 0x03 };
     QKnxAddress source { QKnxAddress::Type::Individual, 0 };
     QKnxAddress destination { QKnxAddress::Type::Individual, QString("1.2.3") };
     QKnxTpduFactory::PointToPoint::Mode mode =
@@ -242,9 +242,9 @@ void tst_QKnxLinkLayerFrameFactory::testDeviceDescriptorResponse()
     auto frame = QKnxLinkLayerFrameFactory::DeviceDescriptor::createResponseRequest(source,
         destination, 3, data, mode);
     QCOMPARE(frame.extendedControlField().destinationAddressType(), QKnxAddress::Type::Individual);
-    QCOMPARE(frame.extendedControlField().bytes(), quint8(96));
-    QCOMPARE(frame.tpdu().bytes(), QVector<quint8>({ 0x43, 0x43, 0x01, 0x02, 0x03 }));
-    QCOMPARE(frame.bytes(), QByteArray::fromHex("1100b46000001203044343010203"));
+    QCOMPARE(frame.extendedControlField().bytes()[0], quint8(96));
+    QCOMPARE(frame.tpdu().bytes(), QKnxByteArray({ 0x43, 0x43, 0x01, 0x02, 0x03 }));
+    QCOMPARE(frame.bytes(), QKnxByteArray::fromHex("1100b46000001203044343010203"));
     QCOMPARE(frame.controlField().frameType(), QKnxControlField::FrameType::Standard);
 
     QKnxAddress destinationWrong = { QKnxAddress::Type::Group, QString("0.0.2") };
@@ -255,20 +255,20 @@ void tst_QKnxLinkLayerFrameFactory::testDeviceDescriptorResponse()
     source = { QKnxAddress::Type::Individual, QString("1.1.2") };
     frame = QKnxLinkLayerFrameFactory::DeviceDescriptor::createResponseConfirmation(source,
         destination, 3, data, mode, 0, QKnxControlField::Confirm::NoError);
-    QCOMPARE(frame.bytes(), QByteArray::fromHex("2e00b46011021203044343010203"));
+    QCOMPARE(frame.bytes(), QKnxByteArray::fromHex("2e00b46011021203044343010203"));
     QCOMPARE(frame.controlField().frameType(), QKnxControlField::FrameType::Standard);
 
     frame = QKnxLinkLayerFrameFactory::DeviceDescriptor::createResponseIndication(source, destination,
         3, data, mode);
-    QCOMPARE(frame.bytes(), QByteArray::fromHex("2900b46011021203044343010203"));
+    QCOMPARE(frame.bytes(), QKnxByteArray::fromHex("2900b46011021203044343010203"));
     QCOMPARE(frame.controlField().frameType(), QKnxControlField::FrameType::Standard);
 
-    QVector<quint8> dataLong({ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x10, 0x11,
-        0x12, 0x13, 0x14, 0x15, 0x16 });
+    QKnxByteArray dataLong { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x10, 0x11,
+        0x12, 0x13, 0x14, 0x15, 0x16 };
     frame = QKnxLinkLayerFrameFactory::DeviceDescriptor::createResponseIndication(source, destination,
         3, dataLong, mode);
     QCOMPARE(frame.bytes(),
-        QByteArray::fromHex("29003c601102120311434301020304050607080910111213141516"));
+        QKnxByteArray::fromHex("29003c601102120311434301020304050607080910111213141516"));
     QCOMPARE(frame.controlField().frameType(), QKnxControlField::FrameType::Extended);
 }