diff options
| author | Andre Hartmann <aha_1980@gmx.de> | 2016-09-21 22:35:52 +0200 |
|---|---|---|
| committer | André Hartmann <aha_1980@gmx.de> | 2016-11-01 20:19:43 +0000 |
| commit | a54fd820916caed2fb13b1a38e57deb5d918f74f (patch) | |
| tree | d10a94e2164ce43d2b75f189bc52f7d6c5b2736d /tests | |
| parent | 4516f444809af8a9e3fa7cad9353c2332963fafe (diff) | |
QCanBusFrame: Extend valid check for frame id >= 2^29
All changes to canId have to go through setFrameId,
which marks frames with id >= 2^29 as invalid.
This can then be checked by isValid().
Change-Id: Ie9a80c35608cdb215d8d1ce3cb314bdc77924e05
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qcanbusframe/tst_qcanbusframe.cpp | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/tests/auto/qcanbusframe/tst_qcanbusframe.cpp b/tests/auto/qcanbusframe/tst_qcanbusframe.cpp index f8b3781..56fe064 100644 --- a/tests/auto/qcanbusframe/tst_qcanbusframe.cpp +++ b/tests/auto/qcanbusframe/tst_qcanbusframe.cpp @@ -104,22 +104,32 @@ void tst_QCanBusFrame::id() frame.setExtendedFrameFormat(false); frame.setFrameId(2047u); QCOMPARE(frame.frameId(), 2047u); - QVERIFY(frame.hasExtendedFrameFormat() == false); + QVERIFY(frame.isValid()); + QVERIFY(!frame.hasExtendedFrameFormat()); // id > 2^11 -> extended format frame.setExtendedFrameFormat(false); frame.setFrameId(2048u); QCOMPARE(frame.frameId(), 2048u); - QVERIFY(frame.hasExtendedFrameFormat() == true); + QVERIFY(frame.isValid()); + QVERIFY(frame.hasExtendedFrameFormat()); // id < 2^11 -> no extended format frame.setExtendedFrameFormat(false); frame.setFrameId(512u); QCOMPARE(frame.frameId(), 512u); - QVERIFY(frame.hasExtendedFrameFormat() == false); + QVERIFY(frame.isValid()); + QVERIFY(!frame.hasExtendedFrameFormat()); // id < 2^11 -> keep extended format frame.setExtendedFrameFormat(true); frame.setFrameId(512u); QCOMPARE(frame.frameId(), 512u); - QVERIFY(frame.hasExtendedFrameFormat() == true); + QVERIFY(frame.isValid()); + QVERIFY(frame.hasExtendedFrameFormat()); + // id >= 2^29 -> invalid + frame.setExtendedFrameFormat(false); + frame.setFrameId(536870912u); + QCOMPARE(frame.frameId(), 0u); + QVERIFY(!frame.isValid()); + QVERIFY(!frame.hasExtendedFrameFormat()); } void tst_QCanBusFrame::payload() |