diff options
| author | Rolf Eike Beer <eb@emlix.com> | 2015-12-10 12:13:45 +0100 |
|---|---|---|
| committer | Rolf Eike Beer <eb@emlix.com> | 2015-12-16 08:53:52 +0000 |
| commit | 23e54b294d3e96a669fff16f2f5343373fb6010a (patch) | |
| tree | 79e3513d5042a6d5d47ab5509f8a5c6caf6be8f4 /tests | |
| parent | f1ad6d53feccca6b9e3b5a534d0377bc3852229b (diff) | |
QCanBusFrame: automatically set extended frame format by frame id
If a frame id is set that requires the extended frame format then also
set this flag. This makes it harder to accidentially construct an
invalid frame.
Change-Id: Ie65b5441fcad98efc8dbea59252b8057b36ddc69
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qcanbusframe/tst_qcanbusframe.cpp | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/tests/auto/qcanbusframe/tst_qcanbusframe.cpp b/tests/auto/qcanbusframe/tst_qcanbusframe.cpp index 61748a7..899dd98 100644 --- a/tests/auto/qcanbusframe/tst_qcanbusframe.cpp +++ b/tests/auto/qcanbusframe/tst_qcanbusframe.cpp @@ -66,6 +66,7 @@ void tst_QCanBusFrame::constructors() { QCanBusFrame frame1; QCanBusFrame frame2(123, "tst"); + QCanBusFrame frame3(123456, "tst"); QCanBusFrame::TimeStamp timeStamp1; QCanBusFrame::TimeStamp timeStamp2(5, 5); @@ -75,25 +76,39 @@ void tst_QCanBusFrame::constructors() QVERIFY(!frame2.payload().isEmpty()); QVERIFY(frame2.frameId()); + QVERIFY(!frame3.payload().isEmpty()); + QVERIFY(frame3.frameId()); + QVERIFY(!timeStamp1.seconds()); QVERIFY(!timeStamp1.microSeconds()); QVERIFY(timeStamp2.seconds()); QVERIFY(timeStamp2.microSeconds()); - QVERIFY(frame1.hasExtendedFrameFormat() == true); - QVERIFY(frame2.hasExtendedFrameFormat() == true); + QVERIFY(frame1.hasExtendedFrameFormat() == false); + QVERIFY(frame2.hasExtendedFrameFormat() == false); + QVERIFY(frame3.hasExtendedFrameFormat() == true); QCOMPARE(frame1.frameType(), QCanBusFrame::DataFrame); QCOMPARE(frame2.frameType(), QCanBusFrame::DataFrame); + QCOMPARE(frame3.frameType(), QCanBusFrame::DataFrame); } void tst_QCanBusFrame::id() { QCanBusFrame frame; QVERIFY(!frame.frameId()); + frame.setFrameId(2047u); + QCOMPARE(frame.frameId(), 2047u); + QVERIFY(frame.hasExtendedFrameFormat() == false); + // id > 2^11 -> extended format + frame.setFrameId(2048u); + QCOMPARE(frame.frameId(), 2048u); + QVERIFY(frame.hasExtendedFrameFormat() == true); + // id < 2^11 -> no extended format frame.setFrameId(512u); QCOMPARE(frame.frameId(), 512u); + QVERIFY(frame.hasExtendedFrameFormat() == false); } void tst_QCanBusFrame::payload() |