diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-05 09:02:02 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-05 09:02:03 +0200 |
| commit | e4edadd2dcb0a7a20cdcfa7d4b4b2a2415227245 (patch) | |
| tree | cd2adefedba016885a44f50ceaac4eeadab7aaef /tests | |
| parent | 0e4c4e4ddc707384e44e68c3a77479ba11bf61b1 (diff) | |
| parent | df0ba9b97c26901f52769381df3c4cbf1fae9ca6 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I573251c84151c29558c1edbbb8c394661f577b63
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qknxnetipcri/tst_qknxnetipcri.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qknxnetiprouter/tst_qknxnetiprouter.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qknxtunnelframefactory/tst_qknxtunnelframefactory.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qknxnetipcri/tst_qknxnetipcri.cpp b/tests/auto/qknxnetipcri/tst_qknxnetipcri.cpp index c86c3af..2deae37 100644 --- a/tests/auto/qknxnetipcri/tst_qknxnetipcri.cpp +++ b/tests/auto/qknxnetipcri/tst_qknxnetipcri.cpp @@ -200,7 +200,7 @@ void tst_QKnxNetIpCri::testAdditionalData() .create(); frame2 = QKnxNetIpCriProxy::builder() .setConnectionType(QKnxNetIp::ConnectionType::Tunnel) - .setAdditionalData(QKnxByteArray{ quint8(QKnxNetIp::TunnelLayer::Link), 0x00 } + .setAdditionalData(QKnxByteArray { quint8(QKnxNetIp::TunnelLayer::Link), 0x00 } + address.bytes()) .create(); QCOMPARE(frame, frame2); diff --git a/tests/auto/qknxnetiprouter/tst_qknxnetiprouter.cpp b/tests/auto/qknxnetiprouter/tst_qknxnetiprouter.cpp index 3474b61..47a002b 100644 --- a/tests/auto/qknxnetiprouter/tst_qknxnetiprouter.cpp +++ b/tests/auto/qknxnetiprouter/tst_qknxnetiprouter.cpp @@ -327,7 +327,7 @@ QKnxNetIpFrame dummyRoutingIndication(QKnxAddress dst, quint8 hopCount = 6) .setMedium(QKnx::MediumType::NetIP) .createFrame(); return QKnxNetIpRoutingIndicationProxy::builder() - .setLinkLayerFrame(frame) + .setCemi(frame) .create(); } diff --git a/tests/auto/qknxtunnelframefactory/tst_qknxtunnelframefactory.cpp b/tests/auto/qknxtunnelframefactory/tst_qknxtunnelframefactory.cpp index 6a42544..af06c8f 100644 --- a/tests/auto/qknxtunnelframefactory/tst_qknxtunnelframefactory.cpp +++ b/tests/auto/qknxtunnelframefactory/tst_qknxtunnelframefactory.cpp @@ -300,7 +300,7 @@ void tst_QKnxLinkLayerFrameBuilder::testMemoryRead() .create(); QCOMPARE(extctr.destinationAddressType(), QKnxAddress::Type::Individual); auto byts = extctr.bytes(); - QCOMPARE(extctr.bytes(), QKnxByteArray{0x60}); + QCOMPARE(extctr.bytes(), QKnxByteArray { 0x60 }); auto frame = QKnxLinkLayerFrame::builder().setControlField(ctrl).setExtendedControlField(extctr) .setTpdu(tpdu).setDestinationAddress(destination).setSourceAddress(source) |