Index: unittests/tst_models.cpp
===================================================================
diff -u -r7777127f3b60d5f884cd07adc9d586353d914f69 -r6581def57942b1c1ef56a2f2feb74559946517b9
--- unittests/tst_models.cpp	(.../tst_models.cpp)	(revision 7777127f3b60d5f884cd07adc9d586353d914f69)
+++ unittests/tst_models.cpp	(.../tst_models.cpp)	(revision 6581def57942b1c1ef56a2f2feb74559946517b9)
@@ -20,7 +20,7 @@
 #include "MTreatmentAdjustBloodDialysateResponse.h"
 #include "MTreatmentAdjustDurationResponse.h"
 #include "MTreatmentRangesData.h"
-#include "MPowerOff.h"
+#include "MAdjustPowerOff.h"
 
 #include "MDGDrainPumpData.h"
 #include "MDGHeatersData.h"
@@ -39,7 +39,7 @@
 #include "MTreatmentTimeData.h"
 #include "MTreatmentPressureOcclusionData.h"
 #include "MTreatmentSalineData.h"
-#include "MPrimingData.h"
+#include "MPreTreatmentDisposablesPrimeData.h"
 
 #include "MTreatmentAdjustUltrafiltrationStateResponse.h"
 #include "MTreatmentAdjustUltrafiltrationEditResponse.h"
@@ -52,9 +52,8 @@
 #include "MAlarmTriggered.h"
 #include "MAlarmCleared.h"
 
-#include "MTreatmentParametersResp.h"
-#include "MStartTreatmentResponse.h"
-#include "MEndTreatmentResponse.h"
+#include "MPreTreatmentAdjustParametersValidationResponse.h"
+#include "MPreTreatmentAdjustInitTreatmentResponse.h"
 
 #include "MessageInterpreter.h"
 
@@ -1600,7 +1599,7 @@
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MTreatmentParametersResp test definition ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //
 void tst_models::tst_MTreatmentParametersResp()
 {
-    Model::MTreatmentParametersResponse mData;
+    Model::MAdjustParametersValidationResponse mData;
 
     QFETCH(int       , errorIndex );
     QFETCH(QByteArray, data       );
@@ -1726,29 +1725,25 @@
     }
 }
 
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MPrimingData ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MPrimingData data definition ~~~~~~~~~~~~~~~~~~~~~~~~ //
-void tst_models::tst_MPrimingData_data () {
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MPreTreatmentPrime ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MPreTreatmentPrime data definition ~~~~~~~~~~~~~~~~~~~~~~~~ //
+void tst_models::tst_MPreTreatmentPrime_data () {
     QTest::addColumn<int        >("errorIndex");
     QTest::addColumn<QByteArray >("data");
     QTest::newRow("msg complete     ") <<  0 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B"));
-    QTest::newRow("currentState     ") <<  1 << QByteArray::fromHex(QByteArray());
-    QTest::newRow("currentState     ") <<  1 << QByteArray::fromHex(QByteArray("00"));
-    QTest::newRow("currentState     ") <<  1 << QByteArray::fromHex(QByteArray("00" "01"));
-    QTest::newRow("currentState     ") <<  1 << QByteArray::fromHex(QByteArray("00" "01" "02"));
-    QTest::newRow("secondsRemaining ") <<  2 << QByteArray::fromHex(QByteArray("00" "01" "02" "03"));
-    QTest::newRow("secondsRemaining ") <<  2 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04"));
-    QTest::newRow("secondsRemaining ") <<  2 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05"));
-    QTest::newRow("secondsRemaining ") <<  2 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06"));
-    QTest::newRow("secondsTotal     ") <<  3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07"));
-    QTest::newRow("secondsTotal     ") <<  3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08"));
-    QTest::newRow("secondsTotal     ") <<  3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09"));
-    QTest::newRow("secondsTotal     ") <<  3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A"));
+    QTest::newRow("timeout          ") <<  1 << QByteArray::fromHex(QByteArray());
+    QTest::newRow("timeout          ") <<  1 << QByteArray::fromHex(QByteArray("00"));
+    QTest::newRow("timeout          ") <<  1 << QByteArray::fromHex(QByteArray("00" "01"));
+    QTest::newRow("timeout          ") <<  1 << QByteArray::fromHex(QByteArray("00" "01" "02"));
+    QTest::newRow("countdown        ") <<  2 << QByteArray::fromHex(QByteArray("00" "01" "02" "03"));
+    QTest::newRow("countdown        ") <<  2 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04"));
+    QTest::newRow("countdown        ") <<  2 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05"));
+    QTest::newRow("countdown        ") <<  2 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06"));
 }
 
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MPrimingData test definition ~~~~~~~~~~~~~~~~~~~~~~~~ //
-void tst_models::tst_MPrimingData() {
-    Model::MPrimingData mData;
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MPreTreatmentPrime test definition ~~~~~~~~~~~~~~~~~~~~~~~~ //
+void tst_models::tst_MPreTreatmentPrime() {
+    Model::MPreTreatmentDisposablesPrime mData;
 
     QFETCH(int       , errorIndex );
     QFETCH(QByteArray, data       );
@@ -1763,19 +1758,18 @@
 #endif
 
     switch (errorIndex) {
-    case  0: { index = 0                                           ; QVERIFY (  mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
-    case  1: { index = index * sizeof mData._data.currentState     ; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
-    case  2: { index = index * sizeof mData._data.secondsRemaining ; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
-    case  3: { index = index * sizeof mData._data.secondsTotal     ; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
+    case  0: { index = 0                                        ; QVERIFY (  mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
+    case  1: { index = index * sizeof mData._data.mTimeout      ; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
+    case  2: { index = index * sizeof mData._data.mCountdown    ; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
     default:
         QVERIFY2(false, "Incorrect Test");
         break;
     }
 }
 
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MStartTreatmentResponse ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MStartTreatmentResponse data definition ~~~~~~~~~~~~~~~~~~~~~~~~ //
-void tst_models::tst_MStartTreatmentResponse_data () {
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MAdjustInitTreatmentResponse ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MAdjustInitTreatmentResponse data definition ~~~~~~~~~~~~~~~~~~~~~~~~ //
+void tst_models::tst_MAdjustInitTreatmentResponse_data () {
     QTest::addColumn<int        >("errorIndex");
     QTest::addColumn<QByteArray >("data");
     QTest::newRow("msg complete              ") <<  0 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07"));
@@ -1789,9 +1783,9 @@
     QTest::newRow("startTreatmentRejectReason") <<  2 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06"));
 }
 
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MStartTreatmentResponse test definition ~~~~~~~~~~~~~~~~~~~~~~~~ //
-void tst_models::tst_MStartTreatmentResponse() {
-    Model::MStartTreatmentResponse mData;
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MAdjustInitTreatmentResponse test definition ~~~~~~~~~~~~~~~~~~~~~~~~ //
+void tst_models::tst_MAdjustInitTreatmentResponse() {
+    Model::MAdjustInitTreatmentResponse mData;
 
     QFETCH(int       , errorIndex );
     QFETCH(QByteArray, data       );
@@ -1871,10 +1865,6 @@
     QTest::newRow("mTarget     ") <<  3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08"));
     QTest::newRow("mTarget     ") <<  3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09"));
     QTest::newRow("mTarget     ") <<  3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A"));
-    QTest::newRow("mState      ") <<  4 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B"));
-    QTest::newRow("mState      ") <<  4 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B" "0C"));
-    QTest::newRow("mState      ") <<  4 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B" "0C" "0D"));
-    QTest::newRow("mState      ") <<  4 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B" "0C" "0D" "0E"));
 }
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MSalineBolusResponse test definition ~~~~~~~~~~~~~~~~~~~~~~~~ //
 void tst_models::tst_MSalineBolusResponse() {
@@ -1896,7 +1886,6 @@
     case  1: { index = index * sizeof mData._data.mAccepted; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
     case  2: { index = index * sizeof mData._data.mReason  ; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
     case  3: { index = index * sizeof mData._data.mTarget  ; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
-    case  4: { index = index * sizeof mData._data.mState   ; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
     default:
         QVERIFY2(false, "Incorrect Test");
         break;
@@ -1918,10 +1907,6 @@
     QTest::newRow("mReason     ") <<  2 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04"));
     QTest::newRow("mReason     ") <<  2 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05"));
     QTest::newRow("mReason     ") <<  2 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06"));
-    QTest::newRow("mState      ") <<  3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07"));
-    QTest::newRow("mState      ") <<  3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08"));
-    QTest::newRow("mState      ") <<  3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09"));
-    QTest::newRow("mState      ") <<  3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A"));
 }
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MHeparinResponse test definition ~~~~~~~~~~~~~~~~~~~~~~~~ //
 void tst_models::tst_MHeparinResponse() {
@@ -1942,7 +1927,6 @@
     case  0: { index = 0                                   ; QVERIFY (  mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
     case  1: { index = index * sizeof mData._data.mAccepted; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
     case  2: { index = index * sizeof mData._data.mReason  ; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
-    case  3: { index = index * sizeof mData._data.mState   ; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
     default:
         QVERIFY2(false, "Incorrect Test");
         break;
@@ -1957,20 +1941,20 @@
     QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_AlarmUserActionReq, vData, payload));
 }
 
-void tst_models::tst_MStartTreatmentRequest()
+void tst_models::tst_MInitTreatmentRequest()
 {
     MessageInterpreter interpreter;
     QVariantList vData;
     QByteArray payload;
-    QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_StartTreatmentReq, vData, payload));
+    QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_AdjustInitTreatmentReq, vData, payload));
 }
 
 void tst_models::tst_MConfirmTreatmentRequest()
 {
     MessageInterpreter interpreter;
     QVariantList vData;
     QByteArray payload;
-    QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_ConfirmTreatmentReq, vData, payload));
+    QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_AdjustParametersConfirmReq, vData, payload));
 }
 
 void tst_models::tst_MEndTreatmentRequest()
@@ -1992,5 +1976,5 @@
     MessageInterpreter interpreter;
     QVariantList vData;
     QByteArray payload;
-    QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_CreateTreatmentReq, vData, payload));
+    QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_AdjustParametersValidationReq, vData, payload));
 }