diff options
| author | Andre Hartmann <aha_1980@gmx.de> | 2017-11-16 21:19:59 +0100 |
|---|---|---|
| committer | André Hartmann <aha_1980@gmx.de> | 2017-11-23 05:39:19 +0000 |
| commit | 48325e7e0b1094d96d32c39ad4df6d1c816c5c1e (patch) | |
| tree | d170a7f456867542b90c3dd5ba5110a583cc47e6 /tests/auto/qcanbusframe/tst_qcanbusframe.cpp | |
| parent | 2caa6e1ca0094b2e2a4cd6005836d46a7ddfdf6a (diff) | |
CAN: Cleanup and modernize tests
* Adopt includes to common style
* Use member inits
* Use Qt5 connect style
* Replace QVERIFY by QCOMPARE where applicaple and vice versa
* Prettify comments
* Replace QString::fromLatin1 with QStringLiteral
Change-Id: I9d838d12062a8fa3312105f8f9110e1ba65616ee
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'tests/auto/qcanbusframe/tst_qcanbusframe.cpp')
| -rw-r--r-- | tests/auto/qcanbusframe/tst_qcanbusframe.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/auto/qcanbusframe/tst_qcanbusframe.cpp b/tests/auto/qcanbusframe/tst_qcanbusframe.cpp index 1771325..96ebee1 100644 --- a/tests/auto/qcanbusframe/tst_qcanbusframe.cpp +++ b/tests/auto/qcanbusframe/tst_qcanbusframe.cpp @@ -34,8 +34,10 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> -#include <QtSerialBus/QCanBusFrame> +#include <QtSerialBus/qcanbusframe.h> + +#include <QtCore/qdatastream.h> +#include <QtTest/qtest.h> class tst_QCanBusFrame : public QObject { @@ -610,7 +612,7 @@ void tst_QCanBusFrame::tst_error() QCOMPARE(frame.frameId(), 0u); //id of Error frame always 0 QCOMPARE(frame.error(), QCanBusFrame::TransmissionTimeoutError); - frame.setError(QCanBusFrame::FrameErrors(QCanBusFrame::ControllerError|QCanBusFrame::ProtocolViolationError)); + frame.setError(QCanBusFrame::FrameErrors(QCanBusFrame::ControllerError | QCanBusFrame::ProtocolViolationError)); QCOMPARE(frame.frameType(), QCanBusFrame::ErrorFrame); QCOMPARE(frame.frameId(), 0u); //id of Error frame always 0 QCOMPARE(frame.error(), @@ -618,7 +620,7 @@ void tst_QCanBusFrame::tst_error() frame.setFrameType(QCanBusFrame::RemoteRequestFrame); QCOMPARE(frame.frameType(), QCanBusFrame::RemoteRequestFrame); - QCOMPARE(frame.frameId(), (uint)(QCanBusFrame::ControllerError|QCanBusFrame::ProtocolViolationError)); + QCOMPARE(frame.frameId(), uint(QCanBusFrame::ControllerError | QCanBusFrame::ProtocolViolationError)); QCOMPARE(frame.error(), QCanBusFrame::NoError); } |