Rename QKnxTunnel{Frame|FrameFactory} to QKnxLinkLayer{Frame|FrameFactory}

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

1 files changed, 16 insertions, 16 deletions

diff --git a/tests/auto/qknxtunnelframefactory/tst_qknxtunnelframefactory.cpp b/tests/auto/qknxtunnelframefactory/tst_qknxtunnelframefactory.cpp
index bcb966f..b0b13c6 100644
--- a/tests/auto/qknxtunnelframefactory/tst_qknxtunnelframefactory.cpp
+++ b/tests/auto/qknxtunnelframefactory/tst_qknxtunnelframefactory.cpp
@@ -30,7 +30,7 @@
 #include <QtKnx/qknxextendedcontrolfield.h>
 #include <QtTest/qtest.h>
 
-class tst_QKnxTunnelFrameFactory : public QObject
+class tst_QKnxLinkLayerFrameFactory : public QObject
 {
     Q_OBJECT
 
@@ -40,76 +40,76 @@ private Q_SLOTS:
     void testGroupValueWrite();
 };
 
-void tst_QKnxTunnelFrameFactory::testGroupValueRead()
+void tst_QKnxLinkLayerFrameFactory::testGroupValueRead()
 {
     QKnxAddress source { QKnxAddress::Type::Individual, 0 };
     QKnxAddress destination { QKnxAddress::Type::Group, QString("0/0/2") };
-    auto frame = QKnxTunnelFrameFactory::GroupValue::createReadRequest(source, destination);
+    auto frame = QKnxLinkLayerFrameFactory::GroupValue::createReadRequest(source, destination);
     QCOMPARE(frame.bytes(), QByteArray::fromHex("1100b4e000000002010000"));
     QCOMPARE(frame.extendedControlField().destinationAddressType(), QKnxAddress::Type::Group);
     QCOMPARE(frame.controlField().frameType(), QKnxControlField::FrameType::Standard);
 
     QKnxAddress destinationWrong = { QKnxAddress::Type::Group, QString("0.0.2") };
-    frame = QKnxTunnelFrameFactory::GroupValue::createReadRequest(source, destinationWrong);
-    QCOMPARE(frame.bytes(), QKnxTunnelFrame().bytes());
+    frame = QKnxLinkLayerFrameFactory::GroupValue::createReadRequest(source, destinationWrong);
+    QCOMPARE(frame.bytes(), QKnxLinkLayerFrame().bytes());
 
     source = { QKnxAddress::Type::Individual, QString("1.1.2") };
-    frame = QKnxTunnelFrameFactory::GroupValue::createReadConfirmation(source, destination,
+    frame = QKnxLinkLayerFrameFactory::GroupValue::createReadConfirmation(source, destination,
         QKnxControlField::Confirm::NoError);
     QCOMPARE(frame.bytes(), QByteArray::fromHex("2e00b4e011020002010000"));
     QCOMPARE(frame.controlField().frameType(), QKnxControlField::FrameType::Standard);
 
-    frame = QKnxTunnelFrameFactory::GroupValue::createReadIndication(source, destination);
+    frame = QKnxLinkLayerFrameFactory::GroupValue::createReadIndication(source, destination);
     QCOMPARE(frame.bytes(), QByteArray::fromHex("2900b4e011020002010000"));
     QCOMPARE(frame.controlField().frameType(), QKnxControlField::FrameType::Standard);
 }
 
-void tst_QKnxTunnelFrameFactory::testGroupValueResponse()
+void tst_QKnxLinkLayerFrameFactory::testGroupValueResponse()
 {
     QKnxAddress src { QKnxAddress::Type::Individual, QString("1.1.1") };
     QKnxAddress destination { QKnxAddress::Type::Group, QString("0/0/2") };
-    auto frame = QKnxTunnelFrameFactory::GroupValue::createResponseIndication(src, destination,
+    auto frame = QKnxLinkLayerFrameFactory::GroupValue::createResponseIndication(src, destination,
         QVector<quint8>(1, 0x01));
     QCOMPARE(frame.bytes(), QByteArray::fromHex("2900b4e011010002010041"));
     QCOMPARE(frame.extendedControlField().destinationAddressType(), QKnxAddress::Type::Group);
     QCOMPARE(frame.controlField().frameType(), QKnxControlField::FrameType::Standard);
 
-    frame = QKnxTunnelFrameFactory::GroupValue::createResponseRequest(src, destination,
+    frame = QKnxLinkLayerFrameFactory::GroupValue::createResponseRequest(src, destination,
         QVector<quint8>(1, 0x01));
     QCOMPARE(frame.bytes(), QByteArray::fromHex("1100b4e011010002010041"));
     QCOMPARE(frame.extendedControlField().destinationAddressType(), QKnxAddress::Type::Group);
     QCOMPARE(frame.controlField().frameType(), QKnxControlField::FrameType::Standard);
 
-    frame = QKnxTunnelFrameFactory::GroupValue::createResponseConfirmation(src, destination,
+    frame = QKnxLinkLayerFrameFactory::GroupValue::createResponseConfirmation(src, destination,
         QVector<quint8>(1, 0x01));
     QCOMPARE(frame.bytes(), QByteArray::fromHex("2e00b4e011010002010041"));
     QCOMPARE(frame.extendedControlField().destinationAddressType(), QKnxAddress::Type::Group);
     QCOMPARE(frame.controlField().frameType(), QKnxControlField::FrameType::Standard);
 }
 
-void tst_QKnxTunnelFrameFactory::testGroupValueWrite()
+void tst_QKnxLinkLayerFrameFactory::testGroupValueWrite()
 {
     QKnxAddress source { QKnxAddress::Type::Individual, QString("1.1.1") };
     QKnxAddress destination { QKnxAddress::Type::Group, QString("0/0/2") };
-    auto frame = QKnxTunnelFrameFactory::GroupValue::createWriteIndication(source, destination,
+    auto frame = QKnxLinkLayerFrameFactory::GroupValue::createWriteIndication(source, destination,
         QVector<quint8>(1, 0x01));
     QCOMPARE(frame.bytes(), QByteArray::fromHex("2900b4e011010002010081"));
     QCOMPARE(frame.extendedControlField().destinationAddressType(), QKnxAddress::Type::Group);
     QCOMPARE(frame.controlField().frameType(), QKnxControlField::FrameType::Standard);
 
-    frame = QKnxTunnelFrameFactory::GroupValue::createWriteRequest(source, destination,
+    frame = QKnxLinkLayerFrameFactory::GroupValue::createWriteRequest(source, destination,
         QVector<quint8>(1, 0x01));
     QCOMPARE(frame.bytes(), QByteArray::fromHex("1100b4e011010002010081"));
     QCOMPARE(frame.extendedControlField().destinationAddressType(), QKnxAddress::Type::Group);
     QCOMPARE(frame.controlField().frameType(), QKnxControlField::FrameType::Standard);
 
-    frame = QKnxTunnelFrameFactory::GroupValue::createWriteConfirmation(source, destination,
+    frame = QKnxLinkLayerFrameFactory::GroupValue::createWriteConfirmation(source, destination,
         QVector<quint8>(1, 0x01));
     QCOMPARE(frame.bytes(), QByteArray::fromHex("2e00b4e011010002010081"));
     QCOMPARE(frame.extendedControlField().destinationAddressType(), QKnxAddress::Type::Group);
     QCOMPARE(frame.controlField().frameType(), QKnxControlField::FrameType::Standard);
 }
 
-QTEST_APPLESS_MAIN(tst_QKnxTunnelFrameFactory)
+QTEST_APPLESS_MAIN(tst_QKnxLinkLayerFrameFactory)
 
 #include "tst_qknxtunnelframefactory.moc"