Index: sources/gui/qml/components/UltrafiltrationButton.qml =================================================================== diff -u -r8f71000a841da5e8f18efccbb30a7655d3a211cd -ra9dcbee03acab972b43f696b2f3dbdf99f1eeb97 --- sources/gui/qml/components/UltrafiltrationButton.qml (.../UltrafiltrationButton.qml) (revision 8f71000a841da5e8f18efccbb30a7655d3a211cd) +++ sources/gui/qml/components/UltrafiltrationButton.qml (.../UltrafiltrationButton.qml) (revision a9dcbee03acab972b43f696b2f3dbdf99f1eeb97) @@ -129,7 +129,5 @@ _root.clicked() } } - } - } Index: unittests/tst_messaging.cpp =================================================================== diff -u -rb798668f16ad0967ab97e96f5f9a2cdd821e899f -ra9dcbee03acab972b43f696b2f3dbdf99f1eeb97 --- unittests/tst_messaging.cpp (.../tst_messaging.cpp) (revision b798668f16ad0967ab97e96f5f9a2cdd821e899f) +++ unittests/tst_messaging.cpp (.../tst_messaging.cpp) (revision a9dcbee03acab972b43f696b2f3dbdf99f1eeb97) @@ -422,6 +422,90 @@ } /*! + * \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::Unknown; + msg.data = {}; + QVariantList list; + QVERIFY( ! iMsg.adjustUltrafiltrationStateData(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::AcknowGeneric; + msg.data = {}; + QVariantList list; + QVERIFY( ! iMsg.adjustUltrafiltrationStateData(msg, list)); +} + +/*! + * \brief tst_messaging::tst_MessageInterpreter_adjustUltrafiltrationEditData_isType + * \details Tests MessageInterpreter adjustUltrafiltrationEditData method Message Type check + */ +void tst_messaging::tst_MessageInterpreter_adjustUltrafiltrationEditData_isType() +{ + Can::MessageInterpreter iMsg; + Can::Message msg; + msg.actionId = Gui::GuiActionType::Unknown; + msg.data = {}; + QVariantList list; + QVERIFY( ! iMsg.adjustUltrafiltrationEditData(msg, list)); +} + +/*! + * \brief tst_messaging::tst_MessageInterpreter_adjustUltrafiltrationEditData_payloadLen + * \details Tests MessageInterpreter adjustUltrafiltrationEditData method Message payload length check + */ +void tst_messaging::tst_MessageInterpreter_adjustUltrafiltrationEditData_payloadLen() +{ + Can::MessageInterpreter iMsg; + Can::Message msg; + msg.actionId = Gui::GuiActionType::AdjustUltrafiltrationEditRsp; + msg.data = {}; + QVariantList list; + QVERIFY( ! iMsg.adjustUltrafiltrationEditData(msg, list)); +} + +/*! + * \brief tst_messaging::tst_MessageInterpreter_adjustUltrafiltrationConfirmData_isType + * \details Tests MessageInterpreter adjustUltrafiltrationConfirmData method Message Type check + */ +void tst_messaging::tst_MessageInterpreter_adjustUltrafiltrationConfirmData_isType() +{ + Can::MessageInterpreter iMsg; + Can::Message msg; + msg.actionId = Gui::GuiActionType::Unknown; + msg.data = {}; + QVariantList list; + QVERIFY( ! iMsg.adjustUltrafiltrationConfirmData(msg, list)); +} + +/*! + * \brief tst_messaging::tst_MessageInterpreter_adjustUltrafiltrationConfirmData_payloadLen + * \details Tests MessageInterpreter adjustUltrafiltrationConfirmData method Message payload length check + */ +void tst_messaging::tst_MessageInterpreter_adjustUltrafiltrationConfirmData_payloadLen() +{ + Can::MessageInterpreter iMsg; + Can::Message msg; + msg.actionId = Gui::GuiActionType::AdjustUltrafiltrationConfirmRsp; + msg.data = {}; + QVariantList list; + QVERIFY( ! iMsg.adjustUltrafiltrationConfirmData(msg, list)); +} + +/*! * \brief tst_messaging::tst_MessageInterpreter_treatmentRangesData_isType * \details Tests MessageInterpreter treatmentRangesData method Message Type check */ @@ -450,6 +534,90 @@ } /*! + * \brief tst_messaging::tst_MessageInterpreter_loadCellReadingsData_isType + * \details Tests MessageInterpreter treatmentRangesData method Message Type check + */ +void tst_messaging::tst_MessageInterpreter_loadCellReadingsData_isType() +{ + Can::MessageInterpreter iMsg; + Can::Message msg; + msg.actionId = Gui::GuiActionType::Unknown; + msg.data = {}; + QVariantList list; + QVERIFY( ! iMsg.loadCellReadingsData(msg, list)); +} + +/*! + * \brief tst_messaging::tst_MessageInterpreter_loadCellReadingsData_payloadLen + * \details Tests MessageInterpreter treatmentRangesData method Message payload length check + */ +void tst_messaging::tst_MessageInterpreter_loadCellReadingsData_payloadLen() +{ + Can::MessageInterpreter iMsg; + Can::Message msg; + msg.actionId = Gui::GuiActionType::LoadCellReadings; + msg.data = {}; + QVariantList list; + QVERIFY( ! iMsg.loadCellReadingsData(msg, list)); +} + +/*! + * \brief tst_messaging::tst_MessageInterpreter_temperatureSensorsData_isType + * \details Tests MessageInterpreter treatmentRangesData method Message Type check + */ +void tst_messaging::tst_MessageInterpreter_temperatureSensorsData_isType() +{ + Can::MessageInterpreter iMsg; + Can::Message msg; + msg.actionId = Gui::GuiActionType::Unknown; + msg.data = {}; + QVariantList list; + QVERIFY( ! iMsg.temperatureSensorsData(msg, list)); +} + +/*! + * \brief tst_messaging::tst_MessageInterpreter_temperatureSensorsData_payloadLen + * \details Tests MessageInterpreter temperatureSensorsData method Message payload length check + */ +void tst_messaging::tst_MessageInterpreter_temperatureSensorsData_payloadLen() +{ + Can::MessageInterpreter iMsg; + Can::Message msg; + msg.actionId = Gui::GuiActionType::TemperatureSensors; + msg.data = {}; + QVariantList list; + QVERIFY( ! iMsg.temperatureSensorsData(msg, list)); +} + +/*! + * \brief tst_messaging::tst_MessageInterpreter_temperatureSensorsData_isType + * \details Tests MessageInterpreter canbusFaultCountData method Message Type check + */ +void tst_messaging::tst_MessageInterpreter_canbusFaultCountData_isType() +{ + Can::MessageInterpreter iMsg; + Can::Message msg; + msg.actionId = Gui::GuiActionType::Unknown; + msg.data = {}; + QVariantList list; + QVERIFY( ! iMsg.canbusFaultCountData(msg, list)); +} + +/*! + * \brief tst_messaging::tst_MessageInterpreter_temperatureSensorsData_payloadLen + * \details Tests MessageInterpreter canbusFaultCountData method Message payload length check + */ +void tst_messaging::tst_MessageInterpreter_canbusFaultCountData_payloadLen() +{ + Can::MessageInterpreter iMsg; + Can::Message msg; + msg.actionId = Gui::GuiActionType::CanBUSFaultCount; + msg.data = {}; + QVariantList list; + QVERIFY( ! iMsg.canbusFaultCountData(msg, list)); +} + +/*! * \brief tst_messaging::tst_MessageInterpreter_interpretMessage_String * \details Tests MessageInterpreter interpretMessage to handle String message type * if data is empty (count==0) @@ -489,6 +657,60 @@ } /*! + * \brief tst_messaging::tst_MessageInterpreter_interpretMessage_AdjustUltrafiltrationStateReq + * \details Tests MessageInterpreter interpretMessage to handle AdjustUltrafiltrationStateReq message type + * if data is empty (count==0) + */ +void tst_messaging::tst_MessageInterpreter_interpretMessage_AdjustUltrafiltrationStateReq() +{ + Can::MessageInterpreter iMsg; + QByteArray payload; + QVERIFY(iMsg.interpretMessage(Gui::GuiActionType::AdjustUltrafiltrationStateReq, {}, payload)); + QVERIFY(payload.isEmpty()); +} + +/*! + * \brief tst_messaging::tst_MessageInterpreter_interpretMessage_AdjustUltrafiltrationEditReq + * \details Tests MessageInterpreter interpretMessage to handle AdjustUltrafiltrationEditReq message type + * if data is empty (count==0) + */ +void tst_messaging::tst_MessageInterpreter_interpretMessage_AdjustUltrafiltrationEditReq() +{ + Can::MessageInterpreter iMsg; + QByteArray payload; + QVERIFY(iMsg.interpretMessage(Gui::GuiActionType::AdjustUltrafiltrationEditReq, {}, payload)); + QVERIFY(payload.isEmpty()); +} + +/*! + * \brief tst_messaging::tst_MessageInterpreter_interpretMessage_AdjustUltrafiltrationConfirmReq + * \details Tests MessageInterpreter interpretMessage to handle AdjustUltrafiltrationConfirmReq message type + * if data is empty (count==0) + */ +void tst_messaging::tst_MessageInterpreter_interpretMessage_AdjustUltrafiltrationConfirmReq() +{ + Can::MessageInterpreter iMsg; + QByteArray payload; + QVERIFY(iMsg.interpretMessage(Gui::GuiActionType::AdjustUltrafiltrationConfirmReq, {}, payload)); + QVERIFY(payload.isEmpty()); +} + +/*! + * \brief tst_messaging::tst_MessageInterpreter_interpretMessage_AdjustUltrafiltrationConfirmReq + * \details Tests MessageInterpreter interpretMessage to handle AdjustUltrafiltrationConfirmReq message type + * if data is empty (count==0) + */ +void tst_messaging::tst_MessageInterpreter_interpretMessage_canbusFaultCountData() +{ + Can::MessageInterpreter iMsg; + Can::Message msg; + msg.actionId = Gui::GuiActionType::CanBUSFaultCount; + msg.data = {}; + QVariantList data; + QVERIFY( ! iMsg.canbusFaultCountData(msg, data)); +} + +/*! * \brief tst_messaging::tst_MessageBuilder_addActionId * \details Tests addActionId() method usage of MessageBuilder */ Index: unittests/tst_messaging.h =================================================================== diff -u -rb798668f16ad0967ab97e96f5f9a2cdd821e899f -ra9dcbee03acab972b43f696b2f3dbdf99f1eeb97 --- unittests/tst_messaging.h (.../tst_messaging.h) (revision b798668f16ad0967ab97e96f5f9a2cdd821e899f) +++ unittests/tst_messaging.h (.../tst_messaging.h) (revision a9dcbee03acab972b43f696b2f3dbdf99f1eeb97) @@ -62,13 +62,40 @@ void tst_MessageInterpreter_adjustDurationData_isType(); void tst_MessageInterpreter_adjustDurationData_payloadLen(); + void tst_MessageInterpreter_adjustUltrafiltrationStateData_isType(); + void tst_MessageInterpreter_adjustUltrafiltrationStateData_payloadLen(); + + void tst_MessageInterpreter_adjustUltrafiltrationEditData_isType(); + void tst_MessageInterpreter_adjustUltrafiltrationEditData_payloadLen(); + + void tst_MessageInterpreter_adjustUltrafiltrationConfirmData_isType(); + void tst_MessageInterpreter_adjustUltrafiltrationConfirmData_payloadLen(); + void tst_MessageInterpreter_treatmentRangesData_isType(); void tst_MessageInterpreter_treatmentRangesData_payloadLen(); - void tst_MessageInterpreter_interpretMessage_String(); + void tst_MessageInterpreter_loadCellReadingsData_isType(); + void tst_MessageInterpreter_loadCellReadingsData_payloadLen(); + + void tst_MessageInterpreter_temperatureSensorsData_isType(); + void tst_MessageInterpreter_temperatureSensorsData_payloadLen(); + + void tst_MessageInterpreter_canbusFaultCountData_isType(); + void tst_MessageInterpreter_canbusFaultCountData_payloadLen(); + + + void tst_MessageInterpreter_interpretMessage_AdjustBloodDialysateReq(); void tst_MessageInterpreter_interpretMessage_AdjustDurationReq(); + void tst_MessageInterpreter_interpretMessage_AdjustUltrafiltrationStateReq(); + void tst_MessageInterpreter_interpretMessage_AdjustUltrafiltrationEditReq(); + void tst_MessageInterpreter_interpretMessage_AdjustUltrafiltrationConfirmReq(); + void tst_MessageInterpreter_interpretMessage_canbusFaultCountData(); + + + void tst_MessageInterpreter_interpretMessage_String(); + void tst_MessageBuilder_addActionId(); void tst_MessageBuilder_addData_shorterLen(); void tst_MessageBuilder_addData_LongerThanMax(); Index: unittests/tst_models.cpp =================================================================== diff -u -rb798668f16ad0967ab97e96f5f9a2cdd821e899f -ra9dcbee03acab972b43f696b2f3dbdf99f1eeb97 --- unittests/tst_models.cpp (.../tst_models.cpp) (revision b798668f16ad0967ab97e96f5f9a2cdd821e899f) +++ unittests/tst_models.cpp (.../tst_models.cpp) (revision a9dcbee03acab972b43f696b2f3dbdf99f1eeb97) @@ -62,9 +62,9 @@ int startIndex = 0; int index = errorIndex - 1; - bool ok = mData.fromByteArray(data, &startIndex); #ifdef CONSOLEOUT + bool ok = mData.fromByteArray(data, &startIndex); qDebug() << index << errorIndex << startIndex << ok << data ; #endif @@ -120,9 +120,9 @@ int startIndex = 0; int index = errorIndex - 1; - bool ok = mData.fromByteArray(data, &startIndex); #ifdef CONSOLEOUT + bool ok = mData.fromByteArray(data, &startIndex); qDebug() << index << errorIndex << startIndex << ok << data ; #endif @@ -173,9 +173,9 @@ int startIndex = 0; int index = errorIndex - 1; - bool ok = mData.fromByteArray(data, &startIndex); #ifdef CONSOLEOUT + bool ok = mData.fromByteArray(data, &startIndex); qDebug() << index << errorIndex << startIndex << ok << data ; #endif Index: unittests/tst_models.h =================================================================== diff -u -rb798668f16ad0967ab97e96f5f9a2cdd821e899f -ra9dcbee03acab972b43f696b2f3dbdf99f1eeb97 --- unittests/tst_models.h (.../tst_models.h) (revision b798668f16ad0967ab97e96f5f9a2cdd821e899f) +++ unittests/tst_models.h (.../tst_models.h) (revision a9dcbee03acab972b43f696b2f3dbdf99f1eeb97) @@ -36,6 +36,5 @@ void tst_MTreatmentRanges_data (); void tst_MTreatmentRanges (); - };