Index: denali.pro.user =================================================================== diff -u -r7d3062c841b788ced31d939dec990afe0de1442d -r4578edcba291c0ffe718f31fb3077a1c931aaa46 --- denali.pro.user (.../denali.pro.user) (revision 7d3062c841b788ced31d939dec990afe0de1442d) +++ denali.pro.user (.../denali.pro.user) (revision 4578edcba291c0ffe718f31fb3077a1c931aaa46) @@ -1,6 +1,6 @@ - + EnvironmentId Index: sources/model/mtreatmentadjustultrafiltrationstateresponse.h =================================================================== diff -u -r7d3062c841b788ced31d939dec990afe0de1442d -r4578edcba291c0ffe718f31fb3077a1c931aaa46 --- sources/model/mtreatmentadjustultrafiltrationstateresponse.h (.../mtreatmentadjustultrafiltrationstateresponse.h) (revision 7d3062c841b788ced31d939dec990afe0de1442d) +++ sources/model/mtreatmentadjustultrafiltrationstateresponse.h (.../mtreatmentadjustultrafiltrationstateresponse.h) (revision 4578edcba291c0ffe718f31fb3077a1c931aaa46) @@ -37,7 +37,7 @@ private: struct { - Types::U08 mAccepted ; // IMPORTANT : This is a responce to AcknowGeneric which has a data of 1 byte for the accpted/rejected. + Types::U08 mAccepted ; // IMPORTANT : This is a response to AcknowGeneric which has a data of 1 byte for the accepted/rejected. } _data; public: Index: unittests/tst_canbus.cpp =================================================================== diff -u -r7d3062c841b788ced31d939dec990afe0de1442d -r4578edcba291c0ffe718f31fb3077a1c931aaa46 --- unittests/tst_canbus.cpp (.../tst_canbus.cpp) (revision 7d3062c841b788ced31d939dec990afe0de1442d) +++ unittests/tst_canbus.cpp (.../tst_canbus.cpp) (revision 4578edcba291c0ffe718f31fb3077a1c931aaa46) @@ -327,7 +327,7 @@ frame.init(); QVERIFY(frame._txFrameList.isEmpty()); frame.removeHead(); - // if the code doesn't work and calls the removeFist of and empty list it will assert. + // if the code doesn't work and calls the removeFirst of and empty list it will assert. QVERIFY(true); } Index: unittests/tst_messaging.h =================================================================== diff -u -r7d3062c841b788ced31d939dec990afe0de1442d -r4578edcba291c0ffe718f31fb3077a1c931aaa46 --- unittests/tst_messaging.h (.../tst_messaging.h) (revision 7d3062c841b788ced31d939dec990afe0de1442d) +++ unittests/tst_messaging.h (.../tst_messaging.h) (revision 4578edcba291c0ffe718f31fb3077a1c931aaa46) @@ -84,8 +84,6 @@ 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(); @@ -98,7 +96,6 @@ void tst_MessageInterpreter_interpretMessage_DG_Unhandled(); - void tst_MessageBuilder_addActionId(); void tst_MessageBuilder_addData_shorterLen(); void tst_MessageBuilder_addData_LongerThanMax(); Index: unittests/tst_models.cpp =================================================================== diff -u -r7d3062c841b788ced31d939dec990afe0de1442d -r4578edcba291c0ffe718f31fb3077a1c931aaa46 --- unittests/tst_models.cpp (.../tst_models.cpp) (revision 7d3062c841b788ced31d939dec990afe0de1442d) +++ unittests/tst_models.cpp (.../tst_models.cpp) (revision 4578edcba291c0ffe718f31fb3077a1c931aaa46) @@ -39,7 +39,7 @@ { QTest::addColumn("errorIndex"); QTest::addColumn("data"); - QTest::newRow("msg compelete ")<< 0 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B" "0C" "0D" "0E" "0F")); + QTest::newRow("msg complete ")<< 0 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B" "0C" "0D" "0E" "0F")); QTest::newRow("mAccepted ")<< 1 << QByteArray::fromHex(QByteArray()); QTest::newRow("mAccepted ")<< 1 << QByteArray::fromHex(QByteArray("00")); QTest::newRow("mAccepted ")<< 1 << QByteArray::fromHex(QByteArray("00" "01")); @@ -89,7 +89,7 @@ { QTest::addColumn("errorIndex"); QTest::addColumn("data"); - QTest::newRow("msg compelete ")<< 0 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B" "0C" "0D" "0E" "0F" "10" "11" "12" "13" "14" "15" "16" "17")); + QTest::newRow("msg complete ")<< 0 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B" "0C" "0D" "0E" "0F" "10" "11" "12" "13" "14" "15" "16" "17")); QTest::newRow("mDuration_Min ")<< 1 << QByteArray::fromHex(QByteArray()); QTest::newRow("mDuration_Min ")<< 1 << QByteArray::fromHex(QByteArray("00")); QTest::newRow("mDuration_Min ")<< 1 << QByteArray::fromHex(QByteArray("00" "01")); @@ -150,7 +150,7 @@ { QTest::addColumn("errorIndex"); QTest::addColumn("data"); - QTest::newRow("msg compelete ")<< 0 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B" "0C" "0D" "0E" "0F")); + QTest::newRow("msg complete ")<< 0 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B" "0C" "0D" "0E" "0F")); QTest::newRow("mAccepted ")<< 1 << QByteArray::fromHex(QByteArray()); QTest::newRow("mAccepted ")<< 1 << QByteArray::fromHex(QByteArray("00")); QTest::newRow("mAccepted ")<< 1 << QByteArray::fromHex(QByteArray("00" "01")); @@ -201,7 +201,7 @@ { QTest::addColumn("errorIndex"); QTest::addColumn("data"); - QTest::newRow("msg compelete ")<< 0 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B" "0C" "0D" "0E" "0F")); + QTest::newRow("msg complete ")<< 0 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B" "0C" "0D" "0E" "0F")); QTest::newRow("mReservoir1Prim")<< 1 << QByteArray::fromHex(QByteArray()); QTest::newRow("mReservoir1Prim")<< 1 << QByteArray::fromHex(QByteArray("00")); QTest::newRow("mReservoir1Prim")<< 1 << QByteArray::fromHex(QByteArray("00" "01")); @@ -252,7 +252,7 @@ { QTest::addColumn("errorIndex"); QTest::addColumn("data"); - QTest::newRow("msg compelete ")<< 0 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B" "0C" "0D" "0E" "0F" "10" "11" "12" "13" "14" "15" "16" "17" "18" "19" "1A" "1B" "1C" "1D" "1E" "1F" "20" "21" "22" "23" "24" "25" "26" "27" "28" "29" "2A" "2B" "2C" "2D" "2E" "2F")); + QTest::newRow("msg complete ")<< 0 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B" "0C" "0D" "0E" "0F" "10" "11" "12" "13" "14" "15" "16" "17" "18" "19" "1A" "1B" "1C" "1D" "1E" "1F" "20" "21" "22" "23" "24" "25" "26" "27" "28" "29" "2A" "2B" "2C" "2D" "2E" "2F")); QTest::newRow("mInletPrimaryHeater ")<< 1 << QByteArray::fromHex(QByteArray()); QTest::newRow("mInletPrimaryHeater ")<< 1 << QByteArray::fromHex(QByteArray("00")); QTest::newRow("mInletPrimaryHeater ")<< 1 << QByteArray::fromHex(QByteArray("00" "01")); @@ -343,7 +343,7 @@ { QTest::addColumn("errorIndex"); QTest::addColumn("data"); - QTest::newRow("msg compelete ")<< 0 << QByteArray::fromHex(QByteArray("00" "01")); + QTest::newRow("msg complete ")<< 0 << QByteArray::fromHex(QByteArray("00" "01")); QTest::newRow("mAccepted ")<< 1 << QByteArray::fromHex(QByteArray()); } @@ -375,7 +375,7 @@ { QTest::addColumn("errorIndex"); QTest::addColumn("data"); - QTest::newRow("msg compelete ")<< 0 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B" "0C" "0D" "0E" "0F" "10" "11" "12" "13" "14" "15" "16" "17" "18" "19" "1A" "1B" "1C" "1D" "1E" "1F")); + QTest::newRow("msg complete ")<< 0 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B" "0C" "0D" "0E" "0F" "10" "11" "12" "13" "14" "15" "16" "17" "18" "19" "1A" "1B" "1C" "1D" "1E" "1F")); QTest::newRow("mAccepted ")<< 1 << QByteArray::fromHex(QByteArray()); QTest::newRow("mAccepted ")<< 1 << QByteArray::fromHex(QByteArray("00")); QTest::newRow("mAccepted ")<< 1 << QByteArray::fromHex(QByteArray("00" "01")); @@ -446,7 +446,7 @@ { QTest::addColumn("errorIndex"); QTest::addColumn("data"); - QTest::newRow("msg compelete ")<< 0 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B" "0C" "0D" "0E" "0F" "10" "11" "12" "13")); + QTest::newRow("msg complete ")<< 0 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B" "0C" "0D" "0E" "0F" "10" "11" "12" "13")); QTest::newRow("mAccepted ")<< 1 << QByteArray::fromHex(QByteArray()); QTest::newRow("mAccepted ")<< 1 << QByteArray::fromHex(QByteArray("00")); QTest::newRow("mAccepted ")<< 1 << QByteArray::fromHex(QByteArray("00" "01")); Index: unittests/tst_views.cpp =================================================================== diff -u -r0b1e55604d139154b791e1615792921df211ba4d -r4578edcba291c0ffe718f31fb3077a1c931aaa46 --- unittests/tst_views.cpp (.../tst_views.cpp) (revision 0b1e55604d139154b791e1615792921df211ba4d) +++ unittests/tst_views.cpp (.../tst_views.cpp) (revision 4578edcba291c0ffe718f31fb3077a1c931aaa46) @@ -52,12 +52,12 @@ v.adjustment_Reason(GuiRequestReasons::REQUEST_REJECT_REASON_INVALID_TREATMENT_STATE); QCOMPARE(v.text(), tr("REQUEST_REJECT_REASON_INVALID_TREATMENT_STATE")); - // if not accepted and not a reason passed then general message will be returned regardig the paused state + // if not accepted and not a reason passed then general message will be returned regarding the paused state v.isPaused(true); v.adjustment_Reason(GuiRequestReasons::REQUEST_REJECT_REASON_NONE); QCOMPARE(v.text(), tr("Unable to Resume Ultrafiltration or already running")); - // if not accepted and not a reason passed then general message will be returned regardig the paused state + // if not accepted and not a reason passed then general message will be returned regarding the paused state v.isPaused(false); v.adjustment_Reason(GuiRequestReasons::REQUEST_REJECT_REASON_NONE); QCOMPARE(v.text(), tr("Unable to Pause Ultrafiltration or already paused"));