Index: unittests/tst_models.cpp =================================================================== diff -u -r7cf0f527887db611c2c7db88f88932e35fdd0785 -rbab02bba94e43d8af860c206bdf27956aee3857a --- unittests/tst_models.cpp (.../tst_models.cpp) (revision 7cf0f527887db611c2c7db88f88932e35fdd0785) +++ unittests/tst_models.cpp (.../tst_models.cpp) (revision bab02bba94e43d8af860c206bdf27956aee3857a) @@ -53,6 +53,7 @@ #include "MAlarmStatusData.h" #include "MAlarmTriggered.h" #include "MAlarmCleared.h" +#include "MAlarmClearedCondition.h" #include "MPreTreatmentAdjustParametersValidationResponse.h" #include "MPreTreatmentAdjustInitTreatmentResponse.h" @@ -1708,14 +1709,11 @@ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MAlarmTriggered ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MAlarmTriggered data definition ~~~~~~~~~~~~~~~~~~~~~~~~ // -// TODO need to re-evaluate to fix void tst_models::tst_MAlarmTriggered_data () { QTest::addColumn("errorIndex"); QTest::addColumn("data"); QTest::addColumn("expectedIndex"); - - // The first 20Bytes of the data is for MAbstractDynamic before getting to the alarm triggered data const QByteArray front20Bytes = QByteArray("00" "00" "00" "01" "00" "00" "00" "02" @@ -1728,12 +1726,13 @@ for(int i=0; i< 4; i++) { - QTest::newRow("mPriority ") << 1 << QByteArray::fromHex(QByteArray().append(front20Bytes).append(HelperFunctions_tstModel::createByteDataArray(i ))) << 20; - QTest::newRow("mRank ") << 2 << QByteArray::fromHex(QByteArray().append(front20Bytes).append(HelperFunctions_tstModel::createByteDataArray(i+4))) << 24; - QTest::newRow("mClearTop ") << 3 << QByteArray::fromHex(QByteArray().append(front20Bytes).append(HelperFunctions_tstModel::createByteDataArray(i+8))) << 28; + QTest::newRow("mPriority ") << 21 << QByteArray::fromHex(QByteArray().append(front20Bytes).append(HelperFunctions_tstModel::createByteDataArray(i ))) << 20; + QTest::newRow("mRank ") << 22 << QByteArray::fromHex(QByteArray().append(front20Bytes).append(HelperFunctions_tstModel::createByteDataArray(i+4))) << 24; + QTest::newRow("mClearTop ") << 23 << QByteArray::fromHex(QByteArray().append(front20Bytes).append(HelperFunctions_tstModel::createByteDataArray(i+8))) << 28; } } // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MAlarmTriggered test definition ~~~~~~~~~~~~~~~~~~~~~~~~ // +// This will also test the MAbstractDynamic class' void tst_models::tst_MAlarmTriggered() { Model::MAlarmTriggered mData; @@ -1751,9 +1750,9 @@ switch (errorIndex) { case 0: { index = 0 ; QVERIFY ( mData.fromByteArray(data)); QCOMPARE( expectedIndex, startIndex ); } break; - case 1: { index = index * sizeof mData._xata.mPriority ; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( expectedIndex, startIndex ); } break; - case 2: { index = index * sizeof mData._xata.mRank ; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( expectedIndex, startIndex ); } break; - case 3: { index = index * sizeof mData._xata.mPriority ; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( expectedIndex, startIndex ); } break; + case 21: { index = index * sizeof mData._xata.mPriority ; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( expectedIndex, startIndex ); } break; + case 22: { index = index * sizeof mData._xata.mRank ; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( expectedIndex, startIndex ); } break; + case 23: { index = index * sizeof mData._xata.mPriority ; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( expectedIndex, startIndex ); } break; default: QVERIFY2(false, "Incorrect Test"); @@ -1762,6 +1761,64 @@ } // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MAbstractDynamic ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // +// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MAbstractDynamic data definition ~~~~~~~~~~~~~~~~~~~~~~~~ // +void tst_models::tst_MAbstractDynamic_data () { + QTest::addColumn("errorIndex"); + QTest::addColumn("data"); + QTest::addColumn("expectedIndex"); + + // The first 20Bytes of the data is for MAbstractDynamic before getting to the alarm triggered data + const QByteArray front20Bytes = QByteArray("00" "00" "00" "01" + "00" "00" "00" "02" + "00" "00" "00" "03" + "00" "00" "00" "04" + "00" "00" "00" "05" + ); + // 20 front bytes + 3 parameters * 4 bytes + 1 byte ending = 20 + 3*4 + 1 bytes + QTest::newRow("msg complete") << 0 << QByteArray::fromHex(HelperFunctions_tstModel::createByteDataArray(20 + 3*4 + 1))<<0; + + QTest::newRow("msg incomplete mID") << 1 << QByteArray::fromHex(HelperFunctions_tstModel::createByteDataArray(1))<<0; + QTest::newRow("msg incomplete mFieldDescriptor1") << 2 << QByteArray::fromHex(HelperFunctions_tstModel::createByteDataArray(5))<<0; + +} +// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MAbstractDynamic test definition ~~~~~~~~~~~~~~~~~~~~~~~~ // +// Will be testing MAbstractDynamic using MAlarmTriggered since MAlarmTriggered derives from MAbstractDynamic +void tst_models::tst_MAbstractDynamic() { + Model::MAlarmTriggered mData; + + QFETCH(int , errorIndex ); + QFETCH(QByteArray, data ); + QFETCH(int , expectedIndex ); + + int startIndex = 0; +// int index = errorIndex - 1; + bool ok = mData.fromByteArray(data, &startIndex); + Q_UNUSED(ok) +#ifdef CONSOLEOUT + qDebug() << index << errorIndex << startIndex << ok << data ; +#endif + + switch (errorIndex) { + case 0: { QVERIFY ( mData.fromByteArray(data)); QCOMPARE( expectedIndex, startIndex ); } break; + + // incomplete case + case 1: // fall-through - incomplete mID + case 2: // fall-through - incomplete mFieldDescriptor1 + QVERIFY ( !mData.fromByteArray(data)); + QCOMPARE( expectedIndex, startIndex ); + break; + + case 3: + QVERIFY ( mData.fromByteArray(data)); + QCOMPARE( expectedIndex, startIndex ); + break; + default: + QVERIFY2(false, "Incorrect Test"); + break; + } +} +// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MAlarmCleared ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MAlarmCleared data definition ~~~~~~~~~~~~~~~~~~~~~~~~ // void tst_models::tst_MAlarmCleared_data () { @@ -4231,5 +4288,467 @@ QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_AdjustParametersValidationReq, vData, payload, canId)); } +void tst_models::tst_DG_headerCoverage() { + // This test is for code coverage purposes of the DG model headers + // ----------------------------------- + // FROM model/dg/data/ + // ----------------------------------- + // MDGValvesStates + Model::MDGValvesStates mdgValvesStates; + QCOMPARE(mdgValvesStates.typeText(), Model::MAbstract::Type_Enum::eDatum ); + // MDGTemperatures + Model::MDGTemperatures mDGTemperatures; + QCOMPARE(mDGTemperatures.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // MDGReservoir + Model::MDGReservoir mDGReservoir; + QCOMPARE(mDGReservoir.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // MDGROPump + Model::MDGROPump mDGROPump; + QCOMPARE(mDGROPump.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // MDGPressures + Model::MDGPressures mDGPressures; + QCOMPARE(mDGPressures.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // MDGOperationMode + Model::MDGOperationMode mDGOperationMode; + QCOMPARE(mDGOperationMode.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // MDGLoadCellReadings + Model::MDGLoadCellReadings mDGLoadCellReadings; + QCOMPARE(mDGLoadCellReadings.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // MDGHeaters + Model::MDGHeaters mDGHeaters; + QCOMPARE(mDGHeaters.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // MDGGeneralEvent + Model::MDGGeneralEvent mDGGeneralEvent; + QCOMPARE(mDGGeneralEvent.typeText(), Model::MAbstract::Type_Enum::eEvent ); + + // MDGDrainPump + Model::MDGDrainPump mDGDrainPump; + QCOMPARE(mDGDrainPump.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // MDGDebugText + Model::MDGDebugText mDGDebugText; + QCOMPARE(mDGDebugText.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // MDGConductivityData + Model::MDGConductivityData mDGConductivityData; + QCOMPARE(mDGConductivityData.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // MDGAccelerometer + Model::MDGAccelerometer mDGAccelerometer; + QCOMPARE(mDGAccelerometer.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // ----------------------------------- + // FROM model/dg/data/pretreatment/ + // ----------------------------------- + // MDGFilterFlush + Model::MDGFilterFlush mDGFilterFlush; + QCOMPARE(mDGFilterFlush.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // ----------------------------------- + // FROM model/dg/data/post/ + // ----------------------------------- + // MDGPostSingleResult + Model::MDGPostSingleResult mDGPostSingleResult; + QCOMPARE(mDGPostSingleResult.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // MDGPostFinalResult + Model::MDGPostFinalResult mDGPostFinalResult; + QCOMPARE(mDGPostFinalResult.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // ----------------------------------- + // FROM model/dg/adjustment/settings/ + // ----------------------------------- + + // MAdjustVersionsDGResponse + Model::MAdjustVersionsDGResponse mAdjustVersionsDGResponse; + QCOMPARE(mAdjustVersionsDGResponse.typeText(), Model::MAbstract::Type_Enum::eEvent ); + + // MAdjustServiceDatesDGResponse + Model::MAdjustServiceDatesDGResponse mAdjustServiceDatesDGResponse; + QCOMPARE(mAdjustServiceDatesDGResponse.typeText(), Model::MAbstract::Type_Enum::eEvent ); + + // MAdjustSerialNumberDGResponse + Model::MAdjustSerialNumberDGResponse mAdjustSerialNumberDGResponse; + QCOMPARE(mAdjustVersionsDGResponse.typeText(), Model::MAbstract::Type_Enum::eEvent ); + + // MAdjustDGCleaningUsageResponse + Model::MAdjustDGCleaningUsageResponse mAdjustDGCleaningUsageResponse; + QCOMPARE(mAdjustDGCleaningUsageResponse.typeText(), Model::MAbstract::Type_Enum::eEvent ); + + // MDuetRoWaterStatDGq + Model::MDuetRoWaterStatDGq mDuetRoWaterStatDGq; + QCOMPARE(mDuetRoWaterStatDGq.typeText(), Model::MAbstract::Type_Enum::eEvent ); +} + + +void tst_models::tst_HD_headerCoverage() { + // This test is for code coverage purposes of the HD model headers + + // ----------------------------------- + // FROM model/hd/alarm/ + // ----------------------------------- + // MAlarmTriggered + Model::MAlarmTriggered mAlarmTriggered; + QCOMPARE(mAlarmTriggered.typeText(), Model::MAbstract::Type_Enum::eEvent ); + + // MAlarmStatus + Model::MAlarmStatus mAlarmStatus; + QCOMPARE(mAlarmStatus.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // MAlarmConditionCleared + Model::MAlarmClearedCondition mAlarmClearedCondition; + QCOMPARE(mAlarmClearedCondition.typeText(), Model::MAbstract::Type_Enum::eEvent ); + + // MAlarmCleared + Model::MAlarmCleared mAlarmCleared; + QCOMPARE(mAlarmCleared.typeText(), Model::MAbstract::Type_Enum::eEvent ); + + // MAlarmActiveListReq + Model::MAlarmActiveListReq mAlarmActiveListReq; + QVERIFY(mAlarmActiveListReq.toString() == "UI,AlarmActiveList"); + + Model::MAlarmActiveListResponse mAlarmActiveListResponse; + QCOMPARE(mAlarmActiveListResponse.typeText(), Model::MAbstract::Type_Enum::eEvent ); + + // ----------------------------------- + // FROM model/hd/data/treatment + // ----------------------------------- + // MTreatmentTime + Model::MTreatmentTime mTreatmentTime; + QCOMPARE(mTreatmentTime.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // MTreatmentStop + Model::MTreatmentStop mTreatmentStop; + QCOMPARE(mTreatmentStop.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // MTreatmentStates + Model::MTreatmentStates mTreatmentStates; + QCOMPARE(mTreatmentStates.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // MTreatmentSaline + Model::MTreatmentSaline mTreatmentSaline; + QCOMPARE(mTreatmentSaline.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // MTreatmentRinseback + Model::MTreatmentRinseback mTreatmentRinseback; + QCOMPARE(mTreatmentRinseback.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // MTreatmentRecirculate + Model::MTreatmentRecirculate mTreatmentRecirculate; + QCOMPARE(mTreatmentRecirculate.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // MPressureOcclusion + Model::MPressureOcclusion mPressureOcclusion; + QCOMPARE(mPressureOcclusion.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // MOutletFlow + Model::MOutletFlow mOutletFlow; + QCOMPARE(mOutletFlow.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // MTreatmentHeparin + Model::MTreatmentHeparin mTreatmentHeparin; + QCOMPARE(mTreatmentHeparin.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // MDialysateFlow + Model::MDialysateFlow mDialysateFlow; + QCOMPARE(mDialysateFlow.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // MTreatmentBloodPrime + Model::MTreatmentBloodPrime mTreatmentBloodPrime; + QCOMPARE(mTreatmentBloodPrime.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // MBloodFlow + Model::MBloodFlow mBloodFlow; + QCOMPARE(mBloodFlow.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // ----------------------------------- + // FROM model/hd/data/pretreatment/ + // ----------------------------------- + // MPreTreatmentStates + Model::MPreTreatmentStates mPreTreatmentStates; + QCOMPARE(mPreTreatmentStates.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // MPreTreatmentSelfTestNoCartridge + Model::MPreTreatmentSelfTestNoCartridge mPreTreatmentSelfTestNoCartridge; + QCOMPARE(mPreTreatmentSelfTestNoCartridge.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // MPreTreatmentSelfTestDry + Model::MPreTreatmentSelfTestDry mPreTreatmentSelfTestDry; + QCOMPARE(mPreTreatmentSelfTestDry.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // MPreTreatmentDisposablesPrime + Model::MPreTreatmentDisposablesPrime mPreTreatmentDisposablesPrime; + QCOMPARE(mPreTreatmentDisposablesPrime.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // ----------------------------------- + // FROM model/hd/data/treatmentlog/ + // ----------------------------------- + // MTreatmentLogEventData + Model::MTreatmentLogEventData mTreatmentLogEventData; + QCOMPARE(mTreatmentLogEventData.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // MTreatmentLogAvrgeData + Model::MTreatmentLogAvrgeData mTreatmentLogAvrgeData; + QCOMPARE(mTreatmentLogAvrgeData.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // MTreatmentLogAlarmData + Model::MTreatmentLogAlarmData mTreatmentLogAlarmData; + QCOMPARE(mTreatmentLogAlarmData.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // ----------------------------------- + // FROM model/hd/data/posttreatment/ + // ----------------------------------- + // MPostTreatmentStates + Model::MPostTreatmentStates mPostTreatmentStates2; + QCOMPARE(mPostTreatmentStates2.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // ----------------------------------- + // FROM model/hd/data/post/ + // ----------------------------------- + // MUIPostFinalResultHDRequest + Model::MUIPostFinalResultHDRequest mUIPostFinalResultHDRequest; + QCOMPARE(mUIPostFinalResultHDRequest.typeText(), Model::MAbstract::Type_Enum::eEvent ); + + // MHDRTCEpochData + Model::MHDRTCEpochData mHDRTCEpochData; + QCOMPARE(mHDRTCEpochData.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // MHDPostSingleResult + Model::MHDPostSingleResult mHDPostSingleResult; + QCOMPARE(mHDPostSingleResult.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // MHDPostFinalResult + Model::MHDPostFinalResult mHDPostFinalResult; + QCOMPARE(mHDPostFinalResult.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // ----------------------------------- + // FROM model/hd/data/ + // ----------------------------------- + // MTreatmentRanges + Model::MTreatmentRanges mTreatmentRanges; + QCOMPARE(mTreatmentRanges.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // MHDUsageInfoResponse + Model::MHDUsageInfoResponse mHDUsageInfoResponse; + QCOMPARE(mHDUsageInfoResponse.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // MHDSyringePump + Model::MHDSyringePump mHDSyringePump; + QCOMPARE(mHDSyringePump.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // MHDOperationMode + Model::MHDOperationMode mHDOperationMode; + QCOMPARE(mHDOperationMode.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // MHDGeneralEvent + Model::MHDGeneralEvent mHDGeneralEvent; + QCOMPARE(mHDGeneralEvent.typeText(), Model::MAbstract::Type_Enum::eEvent ); + + // MHDSyringePump + Model::MHDDebugText mHDDebugText; + QCOMPARE(mHDDebugText.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // MHDBloodLeakData + Model::MHDBloodLeakData mHDBloodLeakData; + QCOMPARE(mHDBloodLeakData.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // MHDAirTrapData + Model::MHDAirTrapData mHDAirTrapData; + QCOMPARE(mHDAirTrapData.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // MHDAirBubbleData + Model::MHDAirBubbleData mHDAirBubbleData; + QCOMPARE(mHDAirBubbleData.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // MHDAccelerometer + Model::MHDAccelerometer mHDAccelerometer; + QCOMPARE(mHDAccelerometer.typeText(), Model::MAbstract::Type_Enum::eDatum ); + + // ----------------------------------- + // FROM model/hd/adjustment/posttreatment + // ----------------------------------- + // MAdjustTreatmentLogResponse + Model::MAdjustTreatmentLogResponse mAdjustTreatmentLogResponse; + QCOMPARE(mAdjustTreatmentLogResponse.typeText(), Model::MAbstract::Type_Enum::eEvent ); + + // MAdjustPatientDisconnectionConfirmResponse + Model::MAdjustPatientDisconnectionConfirmResponse mAdjustPatientDisconnectionConfirmResponse; + QCOMPARE(mAdjustPatientDisconnectionConfirmResponse.typeText(), Model::MAbstract::Type_Enum::eEvent ); + + // MAdjustDisposablesRemovalConfirmResponse + Model::MAdjustDisposablesRemovalConfirmResponse mAdjustDisposablesRemovalConfirmResponse; + QCOMPARE(mAdjustDisposablesRemovalConfirmResponse.typeText(), Model::MAbstract::Type_Enum::eEvent ); + + // ----------------------------------- + // FROM model/hd/adjustment/pretreatment + // ----------------------------------- + // MAdjustWaterSampleResponse + Model::MAdjustWaterSampleResponse mAdjustWaterSampleResponse; + QCOMPARE(mAdjustWaterSampleResponse.typeText(), Model::MAbstract::Type_Enum::eEvent ); + + // MAdjustUltrafiltrationInitResponse + Model::MAdjustUltrafiltrationInitResponse mAdjustUltrafiltrationInitResponse; + QCOMPARE(mAdjustUltrafiltrationInitResponse.typeText(), Model::MAbstract::Type_Enum::eEvent ); + + // MAdjustStartTreatmentResponse + Model::MAdjustStartTreatmentResponse mAdjustStartTreatmentResponse; + QCOMPARE(mAdjustStartTreatmentResponse.typeText(), Model::MAbstract::Type_Enum::eEvent ); + + // MAdjustPatientConnectionConfirmResponse + Model::MAdjustPatientConnectionConfirmResponse mAdjustPatientConnectionConfirmResponse; + QCOMPARE(mAdjustPatientConnectionConfirmResponse.typeText(), Model::MAbstract::Type_Enum::eEvent ); + + // MAdjustPatientConnectionBeginResponse + Model::MAdjustPatientConnectionBeginResponse mAdjustPatientConnectionBeginResponse; + QCOMPARE(mAdjustPatientConnectionBeginResponse.typeText(), Model::MAbstract::Type_Enum::eEvent ); + + // MAdjustParametersValidationResponse + Model::MAdjustParametersValidationResponse mAdjustParametersValidationResponse; + QCOMPARE(mAdjustParametersValidationResponse.typeText(), Model::MAbstract::Type_Enum::eEvent ); + + // MAdjustInitTreatmentResponse + Model::MAdjustInitTreatmentResponse mAdjustInitTreatmentResponse; + QCOMPARE(mAdjustInitTreatmentResponse.typeText(), Model::MAbstract::Type_Enum::eEvent ); + + // MAdjustDisposablesPrimeResponse + Model::MAdjustDisposablesPrimeResponse mAdjustDisposablesPrimeResponse; + QCOMPARE(mAdjustDisposablesPrimeResponse.typeText(), Model::MAbstract::Type_Enum::eEvent ); + + // MAdjustDisposablesConfirmResponse + Model::MAdjustDisposablesConfirmResponse mAdjustDisposablesConfirmResponse; + QCOMPARE(mAdjustDisposablesConfirmResponse.typeText(), Model::MAbstract::Type_Enum::eEvent ); + + // ----------------------------------- + // FROM model/hd/adjustment/settings + // ----------------------------------- + // MAdjustVersionsHDResponse + Model::MAdjustVersionsHDResponse mAdjustVersionsHDResponse; + QCOMPARE(mAdjustVersionsHDResponse.typeText(), Model::MAbstract::Type_Enum::eEvent ); + + // MAdjustVersionsHDRequest + Model::MAdjustVersionsHDRequest mAdjustVersionsHDRequest; + QCOMPARE(mAdjustVersionsHDRequest.typeText(), Model::MAbstract::Type_Enum::eEvent ); + + // MAdjustServiceModeResponse + Model::MAdjustServiceModeResponse mAdjustServiceModeResponse; + QCOMPARE(mAdjustServiceModeResponse.typeText(), Model::MAbstract::Type_Enum::eEvent ); + + // MAdjustSerialNumberHDResponse + Model::MAdjustSerialNumberHDResponse mAdjustSerialNumberHDResponse; + QCOMPARE(mAdjustSerialNumberHDResponse.typeText(), Model::MAbstract::Type_Enum::eEvent ); + + // MAdjustHDDateTimeResponse + Model::MAdjustHDDateTimeResponse mAdjustHDDateTimeResponse; + QCOMPARE(mAdjustHDDateTimeResponse.typeText(), Model::MAbstract::Type_Enum::eEvent ); + + // MAdjustHDAlarmVolumeResponse + Model::MAdjustHDAlarmVolumeResponse mAdjustHDAlarmVolumeResponse; + QCOMPARE(mAdjustHDAlarmVolumeResponse.typeText(), Model::MAbstract::Type_Enum::eEvent ); + + // ----------------------------------- + // FROM model/hd/adjustment/treatment + // ----------------------------------- + // MAdjustVersionsHDResponse + Model::MAdjustUltrafiltrationStateResponse mAdjustUltrafiltrationStateResponse; + QCOMPARE(mAdjustUltrafiltrationStateResponse.typeText(), Model::MAbstract::Type_Enum::eEvent ); + + // MAdjustSalineResponse + Model::MAdjustSalineResponse mAdjustSalineResponse; + QCOMPARE(mAdjustSalineResponse.typeText(), Model::MAbstract::Type_Enum::eEvent ); + + // MAdjustRinsebackResponse + Model::MAdjustRinsebackResponse mAdjustRinsebackResponse; + QCOMPARE(mAdjustRinsebackResponse.typeText(), Model::MAbstract::Type_Enum::eEvent ); + + // MAdjustRecirculateResponse + Model::MAdjustRecirculateResponse mAdjustRecirculateResponse; + QCOMPARE(mAdjustRecirculateResponse.typeText(), Model::MAbstract::Type_Enum::eEvent ); + + // MAdjustPressuresLimitsResponse + Model::MAdjustPressuresLimitsResponse mAdjustPressuresLimitsResponse; + QCOMPARE(mAdjustPressuresLimitsResponse.typeText(), Model::MAbstract::Type_Enum::eEvent ); + + // MAdjustHeparinResponse + Model::MAdjustHeparinResponse mAdjustHeparinResponse; + QCOMPARE(mAdjustHeparinResponse.typeText(), Model::MAbstract::Type_Enum::eEvent ); + + // MAdjustTreatmentEndResponse + Model::MAdjustTreatmentEndResponse mAdjustTreatmentEndResponse; + QCOMPARE(mAdjustTreatmentEndResponse.typeText(), Model::MAbstract::Type_Enum::eEvent ); + + // MAdjustDurationResponse + Model::MAdjustDurationResponse mAdjustDurationResponse; + QCOMPARE(mAdjustDurationResponse.typeText(), Model::MAbstract::Type_Enum::eEvent ); + + // MAdjustBloodDialysateResponse + Model::MAdjustBloodDialysateResponse mAdjustBloodDialysateResponse; + QCOMPARE(mAdjustBloodDialysateResponse.typeText(), Model::MAbstract::Type_Enum::eEvent ); + + // ----------------------------------- + // FROM model/hd/adjustment/disinfect/ + // ----------------------------------- + // MAdjustDisinfectStartResponse + Model::MAdjustDisinfectStartResponse mAdjustDisinfectStartResponse; + QCOMPARE(mAdjustDisinfectStartResponse.typeText(), Model::MAbstract::Type_Enum::eEvent ); + + // MAdjustDisinfectModeResponse + Model::MAdjustDisinfectModeResponse mAdjustDisinfectModeResponse; + QCOMPARE(mAdjustDisinfectModeResponse.typeText(), Model::MAbstract::Type_Enum::eEvent ); + + // ----------------------------------- + // FROM model/hd/adjustment/ + // ----------------------------------- + // MPowerOff + Model::MPowerOff mPowerOff; + QCOMPARE(mPowerOff.typeText(), Model::MAbstract::Type_Enum::eEvent ); +} + +void tst_models::tst_modelsHeader_Coverage() +{ + QVERIFY(Model::MAbstract::typeText(Model::MAbstract::Type_Enum::eEvent) == "E"); + QVERIFY(Model::MAbstract::typeText(Model::MAbstract::Type_Enum::eDatum) == "D"); +} + +void tst_models::tst_MDisinfectAdjustModeRequests_ToStrings() +{ + // This is to do code coverage for the toString functions + // MAdjustDisinfectModeReq + Model::MAdjustDisinfectModeReq mMAdjustDisinfectModeReq; + QVERIFY(mMAdjustDisinfectModeReq.toString().contains("DisinfectMode")); + +} + +void tst_models::tst_MPostTreatmentAdjustRequests_ToStrings() +{ + // This is to do code coverage for the toString functions + // MAdjustPatientDisconnectionNotifyReq + Model::MAdjustPatientDisconnectionNotifyReq mMAdjustPatientDisconnectionNotifyReq; + QVERIFY(mMAdjustPatientDisconnectionNotifyReq.toString().contains("PatientDisconnectionNotify")); + + // MAdjustPatientDisconnectionConfirmReq + Model::MAdjustPatientDisconnectionConfirmReq mAdjustPatientDisconnectionConfirmReq; + QVERIFY(mAdjustPatientDisconnectionConfirmReq.toString().contains("PatientDisconnectionConfirm")); + + // MAdjustDisposablesRemovalConfirmReq + Model::MAdjustDisposablesRemovalConfirmReq mMAdjustDisposablesRemovalConfirmReq; + QVERIFY(mMAdjustDisposablesRemovalConfirmReq.toString().contains("DisposablesRemovalConfirm")); + + // MAdjustTreatmentLogReq + Model::MAdjustTreatmentLogReq mMAdjustTreatmentLogReq; + QVERIFY(mMAdjustTreatmentLogReq.toString().contains("TreatmentLog")); +} + + + + + +