Index: unittests/tst_messaging.cpp =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -rc8b2c06141831ba2908323138d94dec0ccc0d402 --- unittests/tst_messaging.cpp (.../tst_messaging.cpp) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ unittests/tst_messaging.cpp (.../tst_messaging.cpp) (revision c8b2c06141831ba2908323138d94dec0ccc0d402) @@ -6,8 +6,8 @@ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file tst_messaging.cpp - * \author (last) Behrouz NematiPour - * \date (last) 23-Aug-2020 + * \author (last) Peter Lucia + * \date (last) 15-Oct-2020 * \author (original) Behrouz NematiPour * \date (original) 21-Apr-2020 * @@ -436,34 +436,6 @@ } /*! - * \brief tst_messaging::tst_MessageInterpreter_adjustUltrafiltrationStateData_isType - * \details Tests MessageInterpreter adjustUltrafiltrationStateData method Message Type check - */ -void tst_messaging::tst_MessageInterpreter_adjustUltrafiltrationStateData_isType() -{ - Can::MessageInterpreter iMsg; - Can::Message msg; - msg.actionId = Gui::GuiActionType::ID_Unknown; - msg.data = {}; - QVariantList list; - QVERIFY( ! iMsg.adjustUltrafiltrationState(msg, list)); -} - -/*! - * \brief tst_messaging::tst_MessageInterpreter_adjustUltrafiltrationStateData_payloadLen - * \details Tests MessageInterpreter adjustUltrafiltrationStateData method Message payload length check - */ -void tst_messaging::tst_MessageInterpreter_adjustUltrafiltrationStateData_payloadLen() -{ - Can::MessageInterpreter iMsg; - Can::Message msg; - msg.actionId = Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq; - msg.data = {}; - QVariantList list; - QVERIFY( ! iMsg.adjustUltrafiltrationState(msg, list)); -} - -/*! * \brief tst_messaging::tst_MessageInterpreter_adjustUltrafiltrationEditData_isType * \details Tests MessageInterpreter adjustUltrafiltrationEditData method Message Type check */ @@ -794,6 +766,15 @@ QVERIFY(payload.isEmpty()); } +void tst_messaging::tst_MessageInterpreter_interpretMessage_AdjustPressuresReq() +{ + Can::MessageInterpreter iMsg; + QByteArray payload; + // if the payload is empty the len is not valid and should return false and empty payload + QVERIFY( ! iMsg.interpretMessage(Gui::GuiActionType::ID_AdjustPressuresLimitsReq, {}, payload)); + QVERIFY(payload.isEmpty()); +} + /*! * \brief tst_messaging::tst_MessageInterpreter_interpretMessage_CANBusFaultCount * \details Tests MessageInterpreter interpretMessage to handle ID_CANBusFaultCount message type @@ -810,6 +791,31 @@ } /*! + * \brief tst_messaging::tst_MessageInterpreter_createTreatmentResp + * Tests that an invalid response message is detected properly + */ +void tst_messaging::tst_MessageInterpreter_createTreatmentResp() +{ + Can::MessageInterpreter interpreter; + Can::Message msg; + msg.actionId = Gui::GuiActionType::ID_CreateTreatmentRsp; + msg.data = {}; + QVariantList data; + QVERIFY(! interpreter.createTreatmentRespData(msg, data)); + + msg.actionId = Gui::GuiActionType::ID_CreateTreatmentReq; + QVERIFY(! interpreter.createTreatmentRespData(msg, data)); + + QVariantList variantList = QVariantList() << 0 << 0 << 0 << 0 << 0 << 0 << 0 << 0 << 0 << 0 << 0 << 0 << 0 << 0 << 0 + << 0 << 0 << 0; + QByteArray byteArray; + QVERIFY(interpreter.interpretMessage(msg.actionId, variantList, byteArray)); + + QVERIFY(!interpreter.interpretMessage(msg.actionId, QVariantList(), byteArray)); + +} + +/*! * \brief tst_messaging::tst_MessageBuilder_addActionId * \details Tests addActionId() method usage of MessageBuilder */