Index: unittests/tst_acknow.cpp =================================================================== diff -u -rb798668f16ad0967ab97e96f5f9a2cdd821e899f -r36740a3ee8e7164e70d8627b057624ec0ef1eb8f --- unittests/tst_acknow.cpp (.../tst_acknow.cpp) (revision b798668f16ad0967ab97e96f5f9a2cdd821e899f) +++ unittests/tst_acknow.cpp (.../tst_acknow.cpp) (revision 36740a3ee8e7164e70d8627b057624ec0ef1eb8f) @@ -22,8 +22,8 @@ using namespace Can; -tst_acknow::tst_acknow(QObject *parent) -{ +tst_acknow::tst_acknow(QObject *parent) { + Q_UNUSED(parent) } /*! @@ -69,7 +69,7 @@ */ void tst_acknow::tst_AcknowModel_Receive_Normal() { - _action = Gui::GuiActionType::PowerOff; + _action = Gui::GuiActionType::ID_PowerOff; _data = {0}; QCanBusFrame mFrame; QString mPayload; @@ -88,7 +88,7 @@ void tst_acknow::tst_AcknowModel_Receive_Acknow() { _expected = "A5.01.00.FF.FF.00.19.00"; - _action = Gui::GuiActionType::PowerOff; + _action = Gui::GuiActionType::ID_PowerOff; _data = {0}; QCanBusFrame mFrame; QString mPayload; @@ -106,7 +106,7 @@ void tst_acknow::tst_AcknowModel_Transmit_Normal() { _expected = "A5.02.00.07.00.00.74.00"; - _MessageDispatcher.onActionTransmit(Gui::GuiActionType::KeepAlive, {}); + _MessageDispatcher.onActionTransmit(Gui::GuiActionType::ID_KeepAlive, {}); QVERIFY(_emited); } @@ -117,13 +117,13 @@ void tst_acknow::tst_AcknowModel_Transmit_Acknow() { QCOMPARE( _MessageAcknowModel._acknowList.count(), 0 ); - _MessageDispatcher._needsAcknow.append(Gui::GuiActionType::KeepAlive); + _MessageDispatcher._needsAcknow.append(Gui::GuiActionType::ID_KeepAlive); _expected = "A5.FD.FF.07.00.00.30.00"; Sequence sequence = 3; - _MessageDispatcher.actionTransmit(Gui::GuiActionType::KeepAlive, {}, sequence); + _MessageDispatcher.actionTransmit(Gui::GuiActionType::ID_KeepAlive, {}, sequence); QCOMPARE( _MessageAcknowModel._acknowList.count(), 1 ); QVERIFY(_emited); - _MessageDispatcher._needsAcknow.removeOne(Gui::GuiActionType::KeepAlive); + _MessageDispatcher._needsAcknow.removeOne(Gui::GuiActionType::ID_KeepAlive); } /*! @@ -133,7 +133,7 @@ void tst_acknow::tst_AcknowModel_onAcknowReceive_Correct() { QCOMPARE( _MessageAcknowModel._acknowList.count(), 1 ); - _action = Gui::GuiActionType::KeepAlive; + _action = Gui::GuiActionType::ID_KeepAlive; _data = {0}; QCanBusFrame mFrame; QString mPayload; @@ -191,7 +191,7 @@ void tst_acknow::onFramesTransmit(Can_Id vCan_Id, Sequence vSequence, const FrameList &vFrameList) { - qDebug() << vCan_Id << vSequence << vFrameList; + qDebug() << quint16(vCan_Id) << vSequence << vFrameList; } void tst_acknow::onFailedTransmit(Sequence)