Index: unittests/tst_canbus.cpp =================================================================== diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -r0d3114203575d6725576f8bdc8299ad772d55fd5 --- unittests/tst_canbus.cpp (.../tst_canbus.cpp) (revision 64d87d540594252e8039ab2595016d98f1e3cc28) +++ unittests/tst_canbus.cpp (.../tst_canbus.cpp) (revision 0d3114203575d6725576f8bdc8299ad772d55fd5) @@ -276,30 +276,6 @@ QVERIFY( ! _emited ); // Should not emit due to - ERROR : "Incorrect data for Message ID (HD) '0x0500'" } -void tst_canbus::tst_FrameInterface_FrameReceived_LongFrame_AlarmStatus() -{ - _action = Gui::GuiActionType::ID_AlarmStatus; - _data = { 2, 10, 60, 30, - false,true ,false,false, // 0100 - true ,false,false,false, // 1000 - true ,true ,false,false, // 1100 - false,false,false,false, // 0000 - }; - QCanBusFrame mFrame; - mFrame.setFrameId(Can_Id::eChlid_HD_Alarm); - QStringList mPayloadList { - "a5.0b.00.02.00.12.02.00" , - "00.00.0a.00.00.00.3c.00" , - "00.00.1e.00.00.00.12.03" , - "20.00.00.00.00.00.00.00" , - }; - for ( QString payload : mPayloadList ) { - mFrame.setPayload(QByteArray::fromHex(payload.remove(QLatin1Char('.')).toLatin1())); - emit _CanInterface.didFrameReceive(mFrame); - } - QVERIFY(_emited); -} - void tst_canbus::tst_FrameInterface_FrameReceived_LongFrame_AlarmStatus_LessData() { _action = Gui::GuiActionType::ID_AlarmStatus; @@ -317,6 +293,7 @@ }; for ( QString payload : mPayloadList ) { mFrame.setPayload(QByteArray::fromHex(payload.remove(QLatin1Char('.')).toLatin1())); + qDebug() << " ~ @ ~ : " << mFrame.payload(); emit _CanInterface.didFrameReceive(mFrame); } QVERIFY( ! _emited ); // Should not emit due to - ERROR : "Incorrect data for Message ID (HD) '0x0200'" @@ -354,13 +331,14 @@ { _emited = true; QVERIFY(vAction == _action); + qDebug() << " ~ @ ~ : " << vData; for (int i = 0; i < vData.length(); i++) { if (! strcmp(vData[i].typeName(), "float")) { float f1 = vData[i].toFloat(); float f2 = _data[i].toFloat(); QVERIFY(Types::floatCompare(f1, f2)); } else { - QVERIFY(vData[i] == _data[i]); + QCOMPARE(vData, _data); } } } Index: unittests/tst_canbus.h =================================================================== diff -u -r95a840fc93f1a2cd65732d835fad2aca0f03f28e -r0d3114203575d6725576f8bdc8299ad772d55fd5 --- unittests/tst_canbus.h (.../tst_canbus.h) (revision 95a840fc93f1a2cd65732d835fad2aca0f03f28e) +++ unittests/tst_canbus.h (.../tst_canbus.h) (revision 0d3114203575d6725576f8bdc8299ad772d55fd5) @@ -69,7 +69,6 @@ void tst_FrameInterface_FrameReceived_LongFrame_BloodFlow(); void tst_FrameInterface_FrameReceived_LongFrame_BloodFlow_LessData(); - void tst_FrameInterface_FrameReceived_LongFrame_AlarmStatus(); void tst_FrameInterface_FrameReceived_LongFrame_AlarmStatus_LessData(); void tst_FrameInterface_FrameReceived_removeHead_EmptyList(); Index: unittests/tst_messaging.cpp =================================================================== diff -u -rdf0c8b4fa51d4f5ef0216eb2c3f6f5dfc97bf12e -r0d3114203575d6725576f8bdc8299ad772d55fd5 --- unittests/tst_messaging.cpp (.../tst_messaging.cpp) (revision df0c8b4fa51d4f5ef0216eb2c3f6f5dfc97bf12e) +++ unittests/tst_messaging.cpp (.../tst_messaging.cpp) (revision 0d3114203575d6725576f8bdc8299ad772d55fd5) @@ -66,36 +66,6 @@ } /*! - * \brief tst_messaging::tst_MessageInterpreter_getPowerOffData_isType - * \details Tests MessageInterpreter getPowerOffData method Message Type checking - */ -void tst_messaging::tst_MessageInterpreter_getPowerOffData_isType() -{ - Can::MessageInterpreter iMsg; - Can::Message msg; - msg.actionId = Gui::GuiActionType::ID_Unknown; - msg.data = {}; - Model::MPowerOff data; - data.fromByteArray(msg.data); - // QVERIFY( ! iMsg.interpretMessage(msg, data)); -} - -/*! - * \brief tst_messaging::tst_MessageInterpreter_getPowerOffData_payloadLen - * \details Tests MessageInterpreter getPowerOffData method Message payload length check - */ -void tst_messaging::tst_MessageInterpreter_getPowerOffData_payloadLen() -{ - Can::MessageInterpreter iMsg; - Can::Message msg; - msg.actionId = Gui::GuiActionType::ID_PowerOff; - msg.data = {}; - Model::MPowerOff data; - data.fromByteArray(msg.data); - // QVERIFY( ! iMsg.interpretMessage(msg, data)); -} - -/*! * \brief tst_messaging::tst_MessageInterpreter_powerOffData * \details Tests MessageInterpreter powerOffData method Message payload length check */ @@ -110,36 +80,6 @@ } /*! - * \brief tst_messaging::tst_MessageInterpreter_getBloodFlowData_isType - * \details Tests MessageInterpreter getBloodFlowData method Message Type checking - */ -void tst_messaging::tst_MessageInterpreter_getBloodFlowData_isType() -{ - Can::MessageInterpreter iMsg; - Can::Message msg; - msg.actionId = Gui::GuiActionType::ID_Unknown; - msg.data = {}; - Model::MBloodFlow data; - data.fromByteArray(msg.data); - //QVERIFY( ! iMsg.interpretMessage(msg, data)); -} - -/*! - * \brief tst_messaging::tst_MessageInterpreter_getBloodFlowData_payloadLen - * \details Tests MessageInterpreter getBloodFlowData method Message payload length check - */ -void tst_messaging::tst_MessageInterpreter_getBloodFlowData_payloadLen() -{ - Can::MessageInterpreter iMsg; - Can::Message msg; - msg.actionId = Gui::GuiActionType::ID_BloodFlow; - msg.data = {}; - Model::MBloodFlow data; - data.fromByteArray(msg.data); - //QVERIFY( ! iMsg.interpretMessage(msg, data)); -} - -/*! * \brief tst_messaging::tst_MessageInterpreter_bloodFlowData * \details Tests MessageInterpreter bloodFlowData method Message payload length check */ @@ -155,36 +95,6 @@ } /*! - * \brief tst_messaging::tst_MessageInterpreter_getDialysateInletFlowData_isType - * \details Tests MessageInterpreter getDialysateInletFlowData method Message Type checking - */ -void tst_messaging::tst_MessageInterpreter_getDialysateInletFlowData_isType() -{ - Can::MessageInterpreter iMsg; - Can::Message msg; - msg.actionId = Gui::GuiActionType::ID_Unknown; - msg.data = {}; - Model::MDialysateFlow data; - data.fromByteArray(msg.data); - //QVERIFY( ! iMsg.interpretMessage(msg, data)); -} - -/*! - * \brief tst_messaging::tst_MessageInterpreter_getDialysateInletFlowData_payloadLen - * \details Tests MessageInterpreter getDialysateInletFlowData method Message payload length check - */ -void tst_messaging::tst_MessageInterpreter_getDialysateInletFlowData_payloadLen() -{ - Can::MessageInterpreter iMsg; - Can::Message msg; - msg.actionId = Gui::GuiActionType::ID_DialysateInletFlow; - msg.data = {}; - Model::MDialysateFlow data; - data.fromByteArray(msg.data); - //QVERIFY( ! iMsg.interpretMessage(msg, data)); -} - -/*! * \brief tst_messaging::tst_MessageInterpreter_dialysateInletFlowData * \details Tests MessageInterpreter dialysateInletFlowData method Message payload length check */ @@ -200,36 +110,6 @@ } /*! - * \brief tst_messaging::tst_MessageInterpreter_getDialysateOutletFlowData_isType - * \details Tests MessageInterpreter getDialysateOutletFlowData method Message Type checking - */ -void tst_messaging::tst_MessageInterpreter_getDialysateOutletFlowData_isType() -{ - Can::MessageInterpreter iMsg; - Can::Message msg; - msg.actionId = Gui::GuiActionType::ID_Unknown; - msg.data = {}; - Model::MOutletFlow data; - data.fromByteArray(msg.data); - //QVERIFY( ! iMsg.interpretMessage(msg, data)); -} - -/*! - * \brief tst_messaging::tst_MessageInterpreter_getDialysateOutletFlowData_payloadLen - * \details Tests MessageInterpreter getDialysateOutletFlowData method Message payload length check - */ -void tst_messaging::tst_MessageInterpreter_getDialysateOutletFlowData_payloadLen() -{ - Can::MessageInterpreter iMsg; - Can::Message msg; - msg.actionId = Gui::GuiActionType::ID_DialysateOutletFlow; - msg.data = {}; - Model::MOutletFlow data; - data.fromByteArray(msg.data); - //QVERIFY( ! iMsg.interpretMessage(msg, data)); -} - -/*! * \brief tst_messaging::tst_MessageInterpreter_dialysateOutletFlowData * \details Tests MessageInterpreter dialysateOutletFlowData method Message payload length check */ @@ -245,36 +125,6 @@ } /*! - * \brief tst_messaging::tst_MessageInterpreter_getTreatmentTime_isType - * \details Tests MessageInterpreter getTreatmentTime method Message Type checking - */ -void tst_messaging::tst_MessageInterpreter_getTreatmentTime_isType() -{ - Can::MessageInterpreter iMsg; - Can::Message msg; - msg.actionId = Gui::GuiActionType::ID_Unknown; - msg.data = {}; - Model::MTreatmentTime data; - data.fromByteArray(msg.data); - //QVERIFY( ! iMsg.interpretMessage(msg, data)); -} - -/*! - * \brief tst_messaging::tst_MessageInterpreter_getTreatmentTime_payloadLen - * \details Tests MessageInterpreter getTreatmentTime method Message payload length check - */ -void tst_messaging::tst_MessageInterpreter_getTreatmentTime_payloadLen() -{ - Can::MessageInterpreter iMsg; - Can::Message msg; - msg.actionId = Gui::GuiActionType::ID_TreatmentTime; - msg.data = {}; - Model::MTreatmentTime data; - data.fromByteArray(msg.data); - //QVERIFY( ! iMsg.getTreatmentTime(msg, data)); -} - -/*! * \brief tst_messaging::tst_MessageInterpreter_treatmentTime * \details Tests MessageInterpreter treatmentTime method Message payload length check */ @@ -290,81 +140,6 @@ } /*! - * \brief tst_messaging::tst_MessageInterpreter_getAlarmStatus_isType - * \details Tests MessageInterpreter getAlarmStatus method Message Type check - */ -void tst_messaging::tst_MessageInterpreter_getAlarmStatus_isType() -{ - Can::MessageInterpreter iMsg; - Can::Message msg; - msg.actionId = Gui::GuiActionType::ID_Unknown; - msg.data = {}; - Model::MAlarmStatus data; - data.fromByteArray(msg.data); - //QVERIFY( ! iMsg.getAlarmStatus(msg, data)); -} - -/*! - * \brief tst_messaging::tst_MessageInterpreter_getAlarmStatus_payloadLen - * \details Test MessageInterpreter getAlarmStatus method Message payload length check - */ -void tst_messaging::tst_MessageInterpreter_getAlarmStatus_payloadLen() -{ - Can::MessageInterpreter iMsg; - Can::Message msg; - msg.actionId = Gui::GuiActionType::ID_AlarmStatus; - msg.data = {}; - Model::MAlarmStatus data; - data.fromByteArray(msg.data); - //QVERIFY( ! iMsg.getAlarmStatus(msg, data)); -} - -/*! - * \brief tst_messaging::tst_MessageInterpreter_alarmStatus - * \details Tests MessageInterpreter alarmStatus method Message payload length check - */ -void tst_messaging::tst_MessageInterpreter_alarmStatus() -{ - Can::MessageInterpreter iMsg; - Can::Message msg; - msg.actionId = Gui::GuiActionType::ID_AlarmStatus; - msg.data = {}; - QVariantList data; - QVERIFY( ! iMsg.alarmStatus(msg, data)); - QVERIFY( data.isEmpty()); -} - -/*! - * \brief tst_messaging::tst_MessageInterpreter_getPressureOcclusionData_isType - * \details Tests MessageInterpreter getPressureOcclusionData method Message Type check - */ -void tst_messaging::tst_MessageInterpreter_getPressureOcclusionData_isType() -{ - Can::MessageInterpreter iMsg; - Can::Message msg; - msg.actionId = Gui::GuiActionType::ID_Unknown; - msg.data = {}; - Model::MPressureOcclusion data; - data.fromByteArray(msg.data); - //QVERIFY( ! iMsg.getPressureOcclusionData(msg, data)); -} - -/*! - * \brief tst_messaging::tst_MessageInterpreter_getPressureOcclusionData_payloadLen - * \details Tests MessageInterpreter getPressureOcclusionData method Message payload length check - */ -void tst_messaging::tst_MessageInterpreter_getPressureOcclusionData_payloadLen() -{ - Can::MessageInterpreter iMsg; - Can::Message msg; - msg.actionId = Gui::GuiActionType::ID_PressureOcclusion; - msg.data = {}; - Model::MPressureOcclusion data; - data.fromByteArray(msg.data); - //QVERIFY( ! iMsg.getPressureOcclusionData(msg, data)); -} - -/*! * \brief tst_messaging::tst_MessageInterpreter_pressureOcclusionData * \details Tests MessageInterpreter pressureOcclusionData method Message payload length check */ Index: unittests/tst_messaging.h =================================================================== diff -u -rdf0c8b4fa51d4f5ef0216eb2c3f6f5dfc97bf12e -r0d3114203575d6725576f8bdc8299ad772d55fd5 --- unittests/tst_messaging.h (.../tst_messaging.h) (revision df0c8b4fa51d4f5ef0216eb2c3f6f5dfc97bf12e) +++ unittests/tst_messaging.h (.../tst_messaging.h) (revision 0d3114203575d6725576f8bdc8299ad772d55fd5) @@ -30,32 +30,16 @@ void tst_MessageInterpreter_isPayloadLenValid(); void tst_MessageInterpreter_isPayloadLenValid_undefined(); - void tst_MessageInterpreter_getPowerOffData_isType(); - void tst_MessageInterpreter_getPowerOffData_payloadLen(); void tst_MessageInterpreter_powerOffData(); - void tst_MessageInterpreter_getBloodFlowData_isType(); - void tst_MessageInterpreter_getBloodFlowData_payloadLen(); void tst_MessageInterpreter_bloodFlowData(); - void tst_MessageInterpreter_getDialysateInletFlowData_isType(); - void tst_MessageInterpreter_getDialysateInletFlowData_payloadLen(); void tst_MessageInterpreter_dialysateInletFlowData(); - void tst_MessageInterpreter_getDialysateOutletFlowData_isType(); - void tst_MessageInterpreter_getDialysateOutletFlowData_payloadLen(); void tst_MessageInterpreter_dialysateOutletFlowData(); - void tst_MessageInterpreter_getTreatmentTime_isType(); - void tst_MessageInterpreter_getTreatmentTime_payloadLen(); void tst_MessageInterpreter_treatmentTime(); - void tst_MessageInterpreter_getAlarmStatus_isType(); - void tst_MessageInterpreter_getAlarmStatus_payloadLen(); - void tst_MessageInterpreter_alarmStatus(); - - void tst_MessageInterpreter_getPressureOcclusionData_isType(); - void tst_MessageInterpreter_getPressureOcclusionData_payloadLen(); void tst_MessageInterpreter_pressureOcclusionData(); void tst_MessageInterpreter_adjustBloodDialysateData_isType(); Index: unittests/tst_models.cpp =================================================================== diff -u -rdf0c8b4fa51d4f5ef0216eb2c3f6f5dfc97bf12e -r0d3114203575d6725576f8bdc8299ad772d55fd5 --- unittests/tst_models.cpp (.../tst_models.cpp) (revision df0c8b4fa51d4f5ef0216eb2c3f6f5dfc97bf12e) +++ unittests/tst_models.cpp (.../tst_models.cpp) (revision 0d3114203575d6725576f8bdc8299ad772d55fd5) @@ -1908,7 +1908,7 @@ MessageInterpreter interpreter; QVariantList vData; QByteArray payload; - QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_AlarmUserAckReq, vData, payload)); + QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_AlarmUserActionReq, vData, payload)); } void tst_models::tst_MStartTreatmentRequest()