Index: unittests/tst_canbus.cpp =================================================================== diff -u -r6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5 -r36740a3ee8e7164e70d8627b057624ec0ef1eb8f --- unittests/tst_canbus.cpp (.../tst_canbus.cpp) (revision 6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5) +++ unittests/tst_canbus.cpp (.../tst_canbus.cpp) (revision 36740a3ee8e7164e70d8627b057624ec0ef1eb8f) @@ -84,7 +84,7 @@ void tst_canbus::tst_FrameInterface_ActionTransmit_KeepAlive() { _expected = "A5.01.00.07.00.00.30.00"; - _MessageDispatcher.onActionTransmit(Gui::GuiActionType::idKeepAlive, {}); + _MessageDispatcher.onActionTransmit(Gui::GuiActionType::ID_KeepAlive, {}); QVERIFY(_emited); } @@ -99,23 +99,23 @@ { _expected = "A5.02.00.01.00.01.01.F0"; QVariantList mData {static_cast(Gui::GuiActionData::Accepted)}; - _MessageDispatcher.onActionTransmit(Gui::GuiActionType::idPowerOff, mData); + _MessageDispatcher.onActionTransmit(Gui::GuiActionType::ID_PowerOff, mData); QVERIFY(_emited); } void tst_canbus::tst_FrameInterface_ActionTransmit_PowerOff_Rejected() { _expected = "A5.03.00.01.00.01.02.F4"; QVariantList mData {static_cast(Gui::GuiActionData::Rejected)}; - _MessageDispatcher.onActionTransmit(Gui::GuiActionType::idPowerOff, mData); + _MessageDispatcher.onActionTransmit(Gui::GuiActionType::ID_PowerOff, mData); QVERIFY(_emited); } void tst_canbus::tst_FrameInterface_ActionTransmit_PowerOff() { _expected = "A5.04.00.01.00.01.00.02"; QVariantList mData {static_cast(Gui::GuiActionData::NoData)}; - _MessageDispatcher.onActionTransmit(Gui::GuiActionType::idPowerOff, mData); + _MessageDispatcher.onActionTransmit(Gui::GuiActionType::ID_PowerOff, mData); QVERIFY(_emited); } @@ -126,28 +126,28 @@ _expected = "A5.05.00.FF.FE.01.41.18"; // A QVariantList mData {"A"}; - _MessageDispatcher.onActionTransmit(Gui::GuiActionType::idRawData, mData); + _MessageDispatcher.onActionTransmit(Gui::GuiActionType::ID_RawData, mData); QVERIFY(_emited); } void tst_canbus::tst_FrameInterface_ActionTransmit_ShortPayload() { _expected = "A5.06.00.01.00.00.00.00"; QVariantList mData {}; - _MessageDispatcher.onActionTransmit(Gui::GuiActionType::idPowerOff, mData); + _MessageDispatcher.onActionTransmit(Gui::GuiActionType::ID_PowerOff, mData); QVERIFY(! _emited); // not emitted due to short payload len } void tst_canbus::tst_FrameInterface_ActionTransmit_Unknown() { _expected = ""; - _MessageDispatcher.onActionTransmit(Gui::GuiActionType::idUnknown, {}); + _MessageDispatcher.onActionTransmit(Gui::GuiActionType::ID_Unknown, {}); QVERIFY( ! _emited ); // should not emit the signal due to unknown action } void tst_canbus::tst_FrameInterface_FrameReceived_PowerOff() { - _action = Gui::GuiActionType::idPowerOff; + _action = Gui::GuiActionType::ID_PowerOff; _data = {0}; QCanBusFrame mFrame; QString mPayload; @@ -160,7 +160,7 @@ void tst_canbus::tst_FrameInterface_FrameReceived_PowerOff_Timeout() { - _action = Gui::GuiActionType::idPowerOff; + _action = Gui::GuiActionType::ID_PowerOff; _data = {1}; QCanBusFrame mFrame; QString mPayload; @@ -173,7 +173,7 @@ void tst_canbus::tst_FrameInterface_FrameReceived_Channel_NotListen() { - _action = Gui::GuiActionType::idPowerOff; + _action = Gui::GuiActionType::ID_PowerOff; _data = {1}; QCanBusFrame mFrame; QString mPayload; @@ -186,7 +186,7 @@ void tst_canbus::tst_FrameInterface_FrameReceived_Channel_Incorrect() { - _action = Gui::GuiActionType::idPowerOff; + _action = Gui::GuiActionType::ID_PowerOff; _data = {1}; QCanBusFrame mFrame; QString mPayload; @@ -199,7 +199,7 @@ void tst_canbus::tst_FrameInterface_FrameReceived_CRC_Error() { - _action = Gui::GuiActionType::idPowerOff; + _action = Gui::GuiActionType::ID_PowerOff; _data = {0}; QCanBusFrame mFrame; QString mPayload; @@ -212,7 +212,7 @@ void tst_canbus::tst_FrameInterface_FrameReceived_ShortFrame_Error() { - _action = Gui::GuiActionType::idPowerOff; + _action = Gui::GuiActionType::ID_PowerOff; _data = {0}; QCanBusFrame mFrame; QString mPayload; @@ -225,7 +225,7 @@ void tst_canbus::tst_FrameInterface_FrameReceived_LongFrame_Error() { - _action = Gui::GuiActionType::idPowerOff; + _action = Gui::GuiActionType::ID_PowerOff; _data = {0}; QCanBusFrame mFrame; QString mPayload; @@ -238,7 +238,7 @@ void tst_canbus::tst_FrameInterface_FrameReceived_LongFrame_BloodFlow() { - _action = Gui::GuiActionType::idBloodFlow; + _action = Gui::GuiActionType::ID_BloodFlow; _data = { -400, -397.50f, -26.20f, -2000.00f, -2002.50f, 648.75f, 62.50f }; QCanBusFrame mFrame; mFrame.setFrameId(Can_Id::eChlid_HD_Sync); @@ -258,7 +258,7 @@ void tst_canbus::tst_FrameInterface_FrameReceived_LongFrame_BloodFlow_LessData() { - _action = Gui::GuiActionType::idBloodFlow; + _action = Gui::GuiActionType::ID_BloodFlow; _data = { -400, -397.50f, -26.20f, -2000.00f, -2002.50f, 648.75f, 62.50f }; QCanBusFrame mFrame; mFrame.setFrameId(Can_Id::eChlid_HD_Sync); @@ -277,7 +277,7 @@ void tst_canbus::tst_FrameInterface_FrameReceived_LongFrame_AlarmStatus() { - _action = Gui::GuiActionType::idAlarmStatus; + _action = Gui::GuiActionType::ID_AlarmStatus; _data = { 2, 10, 60, 30, false,true ,false,false, // 0100 true ,false,false,false, // 1000 @@ -301,7 +301,7 @@ void tst_canbus::tst_FrameInterface_FrameReceived_LongFrame_AlarmStatus_LessData() { - _action = Gui::GuiActionType::idAlarmStatus; + _action = Gui::GuiActionType::ID_AlarmStatus; _data = { 2, 10, 60, 30, false,true ,false,false, // 0100 true ,false,false,false, // 1000