Index: denali.pro.user =================================================================== diff -u -r73b965e55528619f22a12ae3b3408c9dcecc9144 -r3fbbe01bfd05d1d1344caf7bedea98394c04dbbe --- denali.pro.user (.../denali.pro.user) (revision 73b965e55528619f22a12ae3b3408c9dcecc9144) +++ denali.pro.user (.../denali.pro.user) (revision 3fbbe01bfd05d1d1344caf7bedea98394c04dbbe) @@ -1,6 +1,6 @@ - + EnvironmentId @@ -81,7 +81,7 @@ Desktop Qt 5.12.5 GCC 64bit Desktop Qt 5.12.5 GCC 64bit qt.qt5.5125.gcc_64_kit - 0 + 11 0 0 @@ -150,7 +150,7 @@ QtProjectManager.QMakeBuildStep false - true + false false false @@ -1177,7 +1177,7 @@ false true - /home/denali/Project/tmp/build/denali-Desktop_Qt_5_12_5_GCC_64bit-Debug + /home/denali/Project/tmp/build/unittest/tst_messaging 1 Index: sources/canbus/messagedispatcher.cpp =================================================================== diff -u -rcbea4224ad67eecc2e7c4c66df9a7db711c72832 -r3fbbe01bfd05d1d1344caf7bedea98394c04dbbe --- sources/canbus/messagedispatcher.cpp (.../messagedispatcher.cpp) (revision cbea4224ad67eecc2e7c4c66df9a7db711c72832) +++ sources/canbus/messagedispatcher.cpp (.../messagedispatcher.cpp) (revision 3fbbe01bfd05d1d1344caf7bedea98394c04dbbe) @@ -381,7 +381,9 @@ bool ok = false; QVariantList mData; Sequence mSequence = vMessage.sequence; + // coco begin validated: if (_interpreter.interpretMessage(vMessage, mData)) { + // coco end ok = true; GuiActionType mActionId = vMessage.actionId; switch (mActionId) { Index: sources/canbus/messageinterpreter.cpp =================================================================== diff -u -rcbea4224ad67eecc2e7c4c66df9a7db711c72832 -r3fbbe01bfd05d1d1344caf7bedea98394c04dbbe --- sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision cbea4224ad67eecc2e7c4c66df9a7db711c72832) +++ sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision 3fbbe01bfd05d1d1344caf7bedea98394c04dbbe) @@ -115,11 +115,13 @@ } break; + // coco begin validated: Placeholder until AlarmSilenceReq case Gui::GuiActionType::AlarmSilenceReq: if (count) { vPayload = Format::fromVariant(vData); } break; + // coco end case Gui::GuiActionType::AdjustUltrafiltrationStateReq: if (count) { Index: sources/gui/guiview.h =================================================================== diff -u -rcbea4224ad67eecc2e7c4c66df9a7db711c72832 -r3fbbe01bfd05d1d1344caf7bedea98394c04dbbe --- sources/gui/guiview.h (.../guiview.h) (revision cbea4224ad67eecc2e7c4c66df9a7db711c72832) +++ sources/gui/guiview.h (.../guiview.h) (revision 3fbbe01bfd05d1d1344caf7bedea98394c04dbbe) @@ -18,9 +18,7 @@ // Project #include "guiglobals.h" -#include "messageglobals.h" -using namespace Can; // define // ... Index: sources/view/valarmstatus.cpp =================================================================== diff -u -reedecdb4324b51307e4cf94f782d05591d6ceba9 -r3fbbe01bfd05d1d1344caf7bedea98394c04dbbe --- sources/view/valarmstatus.cpp (.../valarmstatus.cpp) (revision eedecdb4324b51307e4cf94f782d05591d6ceba9) +++ sources/view/valarmstatus.cpp (.../valarmstatus.cpp) (revision 3fbbe01bfd05d1d1344caf7bedea98394c04dbbe) @@ -122,7 +122,9 @@ */ QString VAlarmStatus::id() { + // coco begin validated: return QString("%0").arg(static_cast(alarm_AlarmID())); + // coco end } /*! Index: sources/view/valarmstatus.h =================================================================== diff -u -reedecdb4324b51307e4cf94f782d05591d6ceba9 -r3fbbe01bfd05d1d1344caf7bedea98394c04dbbe --- sources/view/valarmstatus.h (.../valarmstatus.h) (revision eedecdb4324b51307e4cf94f782d05591d6ceba9) +++ sources/view/valarmstatus.h (.../valarmstatus.h) (revision 3fbbe01bfd05d1d1344caf7bedea98394c04dbbe) @@ -36,13 +36,11 @@ VAlarmStatus(QObject *parent = NULL); private: + // coco begin validated: PROPERTY( quint32 , alarm_Priority , 0) PROPERTY( quint32 , alarm_AlarmID , 0) - // coco begin validated: PROPERTY( quint32 , alarm_EscalateIn , 0) - // coco end PROPERTY( quint32 , alarm_MuteTimeout , 0) - // coco begin validated: PROPERTY( bool , alarm_Flag_systemFault , false) PROPERTY( bool , alarm_Flag_stop , false) PROPERTY( bool , alarm_Flag_noClear , false) Index: unittests/tst_messaging.cpp =================================================================== diff -u -r7d3062c841b788ced31d939dec990afe0de1442d -r3fbbe01bfd05d1d1344caf7bedea98394c04dbbe --- unittests/tst_messaging.cpp (.../tst_messaging.cpp) (revision 7d3062c841b788ced31d939dec990afe0de1442d) +++ unittests/tst_messaging.cpp (.../tst_messaging.cpp) (revision 3fbbe01bfd05d1d1344caf7bedea98394c04dbbe) @@ -519,6 +519,35 @@ } /*! + * \brief tst_MessageInterpreter_Alarms + * \details Tests the message interpreter handling of empty alarm messages. + */ +void tst_messaging::tst_MessageInterpreter_Alarms() +{ + Can::MessageInterpreter interpreter; + Can::Message msg; + msg.actionId = Gui::GuiActionType::AlarmTriggered; + msg.data = {}; + QVariantList list; + + QList actionTypes = { + Gui::GuiActionType::AlarmTriggered, + Gui::GuiActionType::AlarmCleared, + Gui::GuiActionType::AlarmSilenceRsp, + }; + + foreach (const Gui::GuiActionType &each, actionTypes) { + msg.actionId = each; + QVERIFY(interpreter.interpretMessage_HD(msg, list)); + + } + + msg.actionId = Gui::GuiActionType::String; + QVERIFY(!interpreter.interpretMessage_HD(msg, list)); + +} + +/*! * \brief tst_messaging::tst_MessageInterpreter_treatmentRangesData_isType * \details Tests MessageInterpreter treatmentRangesData method Message Type check */ @@ -682,6 +711,19 @@ } /*! + * \brief tst_messaging::tst_MessageInterpreter_interpretMessage_AlarmSilenceReq + * \details Tests MessageInterpreter interpretMessage to handle AlarmSilenceReq message type + * if data is empty (count==0) + */ +void tst_messaging::tst_MessageInterpreter_interpretMessage_AlarmSilenceReq() +{ + Can::MessageInterpreter iMsg; + QByteArray payload; + QVERIFY(iMsg.interpretMessage(Gui::GuiActionType::AlarmSilenceReq, {}, payload)); + QVERIFY(payload.isEmpty()); +} + +/*! * \brief tst_messaging::tst_MessageInterpreter_interpretMessage_AdjustUltrafiltrationStateReq * \details Tests MessageInterpreter interpretMessage to handle AdjustUltrafiltrationStateReq message type * if data is empty (count==0) Index: unittests/tst_messaging.h =================================================================== diff -u -r4578edcba291c0ffe718f31fb3077a1c931aaa46 -r3fbbe01bfd05d1d1344caf7bedea98394c04dbbe --- unittests/tst_messaging.h (.../tst_messaging.h) (revision 4578edcba291c0ffe718f31fb3077a1c931aaa46) +++ unittests/tst_messaging.h (.../tst_messaging.h) (revision 3fbbe01bfd05d1d1344caf7bedea98394c04dbbe) @@ -71,6 +71,7 @@ void tst_MessageInterpreter_adjustUltrafiltrationConfirmData_isType(); void tst_MessageInterpreter_adjustUltrafiltrationConfirmData_payloadLen(); + void tst_MessageInterpreter_Alarms(); void tst_MessageInterpreter_treatmentRangesData_isType(); void tst_MessageInterpreter_treatmentRangesData_payloadLen(); @@ -86,6 +87,7 @@ void tst_MessageInterpreter_interpretMessage_AdjustBloodDialysateReq(); void tst_MessageInterpreter_interpretMessage_AdjustDurationReq(); + void tst_MessageInterpreter_interpretMessage_AlarmSilenceReq(); void tst_MessageInterpreter_interpretMessage_AdjustUltrafiltrationStateReq(); void tst_MessageInterpreter_interpretMessage_AdjustUltrafiltrationEditReq(); void tst_MessageInterpreter_interpretMessage_AdjustUltrafiltrationConfirmReq();