diff options
| author | Andre Hartmann <aha_1980@gmx.de> | 2017-04-03 20:21:05 +0200 |
|---|---|---|
| committer | André Hartmann <aha_1980@gmx.de> | 2017-04-04 07:04:58 +0000 |
| commit | 86ae5181f462c923f2ef792db8f67f8228da0b25 (patch) | |
| tree | af0262ac977d47ff9e89e422d5f8eb5c5e5673a1 /tests | |
| parent | 81dad1f3acf46e60deae52f7e880f17a51b4e7f2 (diff) | |
QCanBusFrame: Add missing Error State Indicator streaming tests
Amends commit 19d4d81e8dd7ccb9831bea725989d2a08d258207
Change-Id: Icd9e64c0b480b627e22b3d4fce4fff68a87ab410
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Rolf Eike Beer <eb@emlix.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qcanbusframe/tst_qcanbusframe.cpp | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/tests/auto/qcanbusframe/tst_qcanbusframe.cpp b/tests/auto/qcanbusframe/tst_qcanbusframe.cpp index b67b6f8..043d89e 100644 --- a/tests/auto/qcanbusframe/tst_qcanbusframe.cpp +++ b/tests/auto/qcanbusframe/tst_qcanbusframe.cpp @@ -431,36 +431,40 @@ void tst_QCanBusFrame::streaming_data() QTest::addColumn<bool>("isExtended"); QTest::addColumn<bool>("isFlexibleDataRate"); QTest::addColumn<bool>("isBitrateSwitch"); + QTest::addColumn<bool>("isErrorStateIndicator"); QTest::addColumn<QCanBusFrame::FrameType>("frameType"); QTest::newRow("emptyFrame") << quint32(0) << QByteArray() << qint64(0) << qint64(0) - << false << false << false << QCanBusFrame::DataFrame; + << false << false << false << false << QCanBusFrame::DataFrame; QTest::newRow("fullFrame1") << quint32(123) << QByteArray("abcde1") << qint64(456) << qint64(784) - << true << false << false << QCanBusFrame::DataFrame; + << true << false << false << false << QCanBusFrame::DataFrame; QTest::newRow("fullFrame2") << quint32(123) << QByteArray("abcde2") << qint64(457) << qint64(785) - << false << false << false << QCanBusFrame::DataFrame; + << false << false << false << false << QCanBusFrame::DataFrame; QTest::newRow("fullFrameFD") << quint32(123) << QByteArray("abcdfd") << qint64(457) << qint64(785) - << false << true << false << QCanBusFrame::DataFrame; + << false << true << false << false << QCanBusFrame::DataFrame; QTest::newRow("fullFrameBRS") << quint32(123) << QByteArray("abcdfd") << qint64(457) << qint64(785) - << false << true << true << QCanBusFrame::DataFrame; + << false << true << true << false << QCanBusFrame::DataFrame; + QTest::newRow("fullFrameESI") << quint32(123) << QByteArray("abcdfd") + << qint64(457) << qint64(785) + << false << true << false << true << QCanBusFrame::DataFrame; QTest::newRow("fullFrame3") << quint32(123) << QByteArray("abcde3") << qint64(458) << qint64(786) - << true << false << false << QCanBusFrame::RemoteRequestFrame; + << true << false << false << false << QCanBusFrame::RemoteRequestFrame; QTest::newRow("fullFrame4") << quint32(123) << QByteArray("abcde4") << qint64(459) << qint64(787) - << false << false << false << QCanBusFrame::RemoteRequestFrame; + << false << false << false << false << QCanBusFrame::RemoteRequestFrame; QTest::newRow("fullFrame5") << quint32(123) << QByteArray("abcde5") << qint64(460) << qint64(789) - << true << false << false << QCanBusFrame::ErrorFrame; + << true << false << false << false << QCanBusFrame::ErrorFrame; QTest::newRow("fullFrame6") << quint32(123) << QByteArray("abcde6") << qint64(453) << qint64(788) - << false << false << false << QCanBusFrame::ErrorFrame; + << false << false << false << false << QCanBusFrame::ErrorFrame; } void tst_QCanBusFrame::streaming() @@ -472,6 +476,7 @@ void tst_QCanBusFrame::streaming() QFETCH(bool, isExtended); QFETCH(bool, isFlexibleDataRate); QFETCH(bool, isBitrateSwitch); + QFETCH(bool, isErrorStateIndicator); QFETCH(QCanBusFrame::FrameType, frameType); QCanBusFrame originalFrame(frameId, payload); @@ -481,6 +486,7 @@ void tst_QCanBusFrame::streaming() originalFrame.setExtendedFrameFormat(isExtended); originalFrame.setFlexibleDataRateFormat(isFlexibleDataRate); originalFrame.setBitrateSwitch(isBitrateSwitch); + originalFrame.setErrorStateIndicator(isErrorStateIndicator); originalFrame.setFrameType(frameType); QByteArray buffer; @@ -505,6 +511,8 @@ void tst_QCanBusFrame::streaming() originalFrame.hasFlexibleDataRateFormat()); QCOMPARE(restoredFrame.hasBitrateSwitch(), originalFrame.hasBitrateSwitch()); + QCOMPARE(restoredFrame.hasErrorStateIndicator(), + originalFrame.hasErrorStateIndicator()); } void tst_QCanBusFrame::tst_error() |