Index: unittests/tst_views.cpp
===================================================================
diff -u -ra3030123e885fb9f22dea5839c4e988896a257e4 -r7cc15ae5968205b241a08ca4646f283b8bf97b03
--- unittests/tst_views.cpp	(.../tst_views.cpp)	(revision a3030123e885fb9f22dea5839c4e988896a257e4)
+++ unittests/tst_views.cpp	(.../tst_views.cpp)	(revision 7cc15ae5968205b241a08ca4646f283b8bf97b03)
@@ -20,8 +20,7 @@
 #include "VTreatmentAdjustmentResponseBase.h"
 #include "VTreatmentAdjustmentUltrafiltrationState.h"
 #include "FileHandler.h"
-#include "VTreatmentBegin.h"
-#include "VPriming.h"
+#include "VPreTreatmentDisposablesPrimeData.h"
 #include "VAlarmStatus.h"
 
 tst_views::tst_views(QObject *parent) : QObject(parent) { }
@@ -137,7 +136,7 @@
             QCOMPARE(view.bloodPressureMeasureInterval(), view.bloodPressureMeasureIntervalMax());
             QCOMPARE(view.rinsebackFlowRate(), view.rinsebackFlowRateMax());
 
-            view.doFinishedCreate();
+            view.doValidation();
         }
         else {
             QCOMPARE(view.validate(view.treatmentData), false);
@@ -396,7 +395,7 @@
         }
 
         QCOMPARE(view.validate(view.treatmentData), false);
-        view.doFinishedCreate();
+        view.doValidation();
     }
     view.dialyzerType(-1);
     QVERIFY(!(view.dialyzerTypeOptions().length() - 1 < (int)view.dialyzerType()));
@@ -709,13 +708,13 @@
 void tst_views::VCreateTreatment_fw_validation_response()
 {
     View::VTreatmentCreate view;
-    GuiActionType action = GuiActionType::ID_CreateTreatmentRsp;
+    GuiActionType action = GuiActionType::ID_AdjustParametersValidationRsp;
 
     for (int i = 0; i < 18; ++i)
     {
         // 0 = OK, 1,2,3 ... parameter is not OK
         QVariantList messageData;
-        AdjustTreatmentParametersResponseData respData;
+        AdjustParametersValidationResponseData respData;
         if (i == 0)   respData.requestValid                 = 1; else respData.requestValid                = 0;
         if (i == 1)   respData.bloodFlowRate                = 1; else respData.bloodFlowRate               = 0;
         if (i == 2)   respData.dialysateFlowRate            = 1; else respData.dialysateFlowRate           = 0;
@@ -734,32 +733,23 @@
         if (i == 15)  respData.heparinDispensingRate        = 1; else respData.heparinDispensingRate       = 0;
         if (i == 16)  respData.heparinBolusVolume           = 1; else respData.heparinBolusVolume          = 0;
         if (i == 17)  respData.dialysateTemp                = 1; else respData.dialysateTemp               = 0;
-        QVERIFY(!view.doActionReceive(respData));
+        QVERIFY(!view.onActionReceive(respData));
     }
 
-    AdjustTreatmentParametersRequestData dataBackup = view.treatmentData;
+    AdjustParametersValidationRequestData dataBackup = view.treatmentData;
 
-    AdjustTreatmentParametersResponseData respData;
+    AdjustParametersValidationResponseData respData;
 
-    StartTreatmentResponseData startResponse;
+    QVERIFY(view.onActionReceive(respData));
 
-    startResponse.startTreatmentResponse = 0; // REJECT
-    view.doActionReceive(startResponse);
-    QCOMPARE(view.pageToShow, View::VTreatmentCreate::Page::None);
-
-    QVERIFY(view.doActionReceive(respData));
-
     view.saveTreatmentProfile(false);
     QVERIFY(!view._saveTreatmentProfile);
-    view.doFinishedConfirm();
+    view.doConfirm();
 
     view.saveTreatmentProfile(true);
     QVERIFY(view._saveTreatmentProfile);
-    view.doFinishedConfirm();
+    view.doConfirm();
 
-    view.onFinishedSaveNewTreatment(true);
-    view.onFinishedSaveNewTreatment(false);
-    view.doFinishedPrime();
     view.doStartTreatment();
 
     QCOMPARE(view.treatmentData.bloodFlowRate, dataBackup.bloodFlowRate);
@@ -816,50 +806,3 @@
 
     QVERIFY(obj != readObj);
 }
-
-void tst_views::VTreatmentBegin_continue()
-{
-    View::VTreatmentBegin view;
-    view.continueEnabled(false);
-    QCOMPARE(view.continueEnabled(), false);
-    view.doUserModifiedParameters();
-    QCOMPARE(view.continueEnabled(), true);
-}
-
-void tst_views::VTreatmentPriming_properties()
-{
-    View::VPriming view;
-    PrimingData primingData;
-    primingData.currentState = View::VPriming::PRIMING_COMPLETE+1;
-
-    view.checkingInstallationComplete(true);
-    QCOMPARE(view.checkingInstallationComplete(), true);
-    view.creatingDialysateComplete(true);
-    QCOMPARE(view.creatingDialysateComplete(), true);
-    view.primingLinesComplete(true);
-    QCOMPARE(view.primingLinesComplete(), true);
-    view.primingLinesComplete(false);
-    QCOMPARE(view.primingLinesComplete(), false);
-    view.primingComplete(true);
-    QCOMPARE(view.primingComplete(), true);
-    view.primingComplete(false);
-    QCOMPARE(view.primingComplete(), false);
-    view.primingComplete(false);
-    QCOMPARE(view.primingComplete(), false);
-    view.continueEnabled(true);
-    QCOMPARE(view.continueEnabled(), true);
-    view.onActionReceive(primingData);
-    QCOMPARE(view.currentState(), (quint32)View::VPriming::PRIMING_COMPLETE+1);
-    view.primingLinesComplete(false);
-    QVERIFY(!view.primingLinesComplete());
-    view.secondsRemaining(quint32(10));
-    QCOMPARE(view.secondsRemaining(), quint32(10));
-    view.secondsRemaining(quint32(1));
-    QCOMPARE(view.secondsRemaining(), quint32(1));
-    view.secondsRemaining(quint32(1));
-    QCOMPARE(view.secondsRemaining(), quint32(1));
-    view.secondsTotal(quint32(50));
-    QCOMPARE(view.secondsTotal(), quint32(50));
-    view.continueEnabled(false);
-    QCOMPARE(view.continueEnabled(), false);
-}