Index: unittests/tst_views.cpp
===================================================================
diff -u -rb62ab443e75b76a91e35aca6ba2efd84e7199602 -r0d59385f134f65a19dace1e2b46eb2631924396e
--- unittests/tst_views.cpp	(.../tst_views.cpp)	(revision b62ab443e75b76a91e35aca6ba2efd84e7199602)
+++ unittests/tst_views.cpp	(.../tst_views.cpp)	(revision 0d59385f134f65a19dace1e2b46eb2631924396e)
@@ -20,6 +20,9 @@
 #include "VTreatmentAdjustmentResponseBase.h"
 #include "VTreatmentAdjustmentUltrafiltrationState.h"
 #include "FileHandler.h"
+#include "VTreatmentBegin.h"
+#include "VPriming.h"
+#include "VAlarmStatus.h"
 
 tst_views::tst_views(QObject *parent) : QObject(parent) { }
 
@@ -83,10 +86,10 @@
         if (i != 4) view.heparinBolusVolume(view.heparinBolusVolumeMax());
         if (i != 5) view.heparinStopTime(view.heparinStopTimeMax());
         if (i != 6) view.salineBolusVolume(view.salineBolusVolumeMax());
-        if (i != 7) view.acidConcentrate(0);
-        if (i != 8) view.bicarbonateConcentrate(0);
+        if (i != 7) view.acidConcentrate(view.acidConcentrateMax());
+        if (i != 8) view.bicarbonateConcentrate(view.bicarbonateConcentrateMax());
 
-        if (i != 9) view.dialyzerType(0);
+        if (i != 9) view.dialyzerType(view.dialyzerTypeMax());
         if (i != 10) view.dialysateTemp(view.dialysateTempMax());
         if (i != 11) view.arterialPressureLimitLow(view.arterialPressureLimitLowMin());
         if (i != 12) view.arterialPressureLimitHigh(view.arterialPressureLimitHighMax());
@@ -125,10 +128,10 @@
             QCOMPARE(view.heparinBolusVolume(),view.heparinBolusVolumeMax());
             QCOMPARE(view.heparinStopTime(),view.heparinStopTimeMax());
             QCOMPARE(view.salineBolusVolume(), view.salineBolusVolumeMax());
-            QCOMPARE(view.acidConcentrate(), quint32(0));
-            QCOMPARE(view.bicarbonateConcentrate(), quint32(0));
+            QCOMPARE(view.acidConcentrate(), view.acidConcentrateMax());
+            QCOMPARE(view.bicarbonateConcentrate(), view.bicarbonateConcentrateMax());
 
-            QCOMPARE(view.dialyzerType(), quint32(0));
+            QCOMPARE(view.dialyzerType(), view.dialyzerTypeMax());
             QCOMPARE(view.dialysateTemp(), view.dialysateTempMax());
             QCOMPARE(view.arterialPressureLimitLow(),view.arterialPressureLimitLowMin());
             QCOMPARE(view.arterialPressureLimitHigh(), view.arterialPressureLimitHighMax());
@@ -160,11 +163,11 @@
 
     view.heparinBolusVolume(view.heparinBolusVolumeMax());
     view.heparinStopTime(view.heparinStopTimeMax());
-    view.salineBolusVolume(0);
-    view.acidConcentrate(0);
-    view.bicarbonateConcentrate(0);
+    view.salineBolusVolume(view.salineBolusVolumeMax());
+    view.acidConcentrate(view.acidConcentrateMax());
+    view.bicarbonateConcentrate(view.bicarbonateConcentrateMax());
 
-    view.dialyzerType(0);
+    view.dialyzerType(view.dialyzerTypeMax());
     view.dialysateTemp(view.dialysateTempMax());
     view.arterialPressureLimitLow(view.arterialPressureLimitLowMin());
     view.arterialPressureLimitHigh(view.arterialPressureLimitHighMax());
@@ -173,7 +176,6 @@
 
     view.bloodPressureMeasureInterval(view.bloodPressureMeasureIntervalMax());
     view.rinsebackFlowRate(view.rinsebackFlowRateMax());
-
 }
 
 /*!
@@ -238,6 +240,27 @@
 {
     View::VTreatmentCreate view;
 
+    // check resolutions
+    QCOMPARE(view.bloodFlowRateRes(),               quint32(25));
+    QCOMPARE(view.dialysateFlowRateRes(),          quint32(50 ));
+    QCOMPARE(view.durationRes(),                   quint32(15 ));
+    QCOMPARE(view.heparinDispensingRateRes(),        qreal(0.1));
+    QCOMPARE(view.heparinBolusVolumeRes(),           qreal(0.1));
+    QCOMPARE(view.heparinStopTimeRes(),            quint32(10 ));
+    QCOMPARE(view.salineBolusVolumeRes(),          quint32(100));
+
+    QCOMPARE(view.acidConcentrateRes(),              quint32(1));
+    QCOMPARE(view.bicarbonateConcentrateRes(),       quint32(1));
+    QCOMPARE(view.dialyzerTypeRes(),                 quint32(1));
+
+    QCOMPARE(view.dialysateTempRes(),                qreal(0.5));
+    QCOMPARE(view.arterialPressureLimitLowRes(),     qint32(10));
+    QCOMPARE(view.arterialPressureLimitHighRes(),    qint32(10));
+    QCOMPARE(view.venousPressureLimitLowRes(),       qint32(10));
+    QCOMPARE(view.venousPressureLimitHighRes(),      qint32(10));
+    QCOMPARE(view.bloodPressureMeasureIntervalRes(), quint32(5));
+    QCOMPARE(view.rinsebackFlowRateRes(),           quint32(25));
+
     // adjust quint32 minimums
     view.bloodFlowRateMin(1);
     view.dialysateFlowRateMin(1);
@@ -338,7 +361,6 @@
         QCOMPARE(view.validate(view.treatmentData), false);
         view.doFinishedCreate();
     }
-
 }
 
 void tst_views::VCreateTreatment_check_init()
@@ -734,15 +756,55 @@
 
     _FileSaver.onConcurrentSave(path, document.toJson(), false);
 
-    QThread::msleep(500);
+    int elapsedSeconds = 0;
+    QDateTime startTime = QDateTime::currentDateTime();
+    while (view.loadTreatmentParameterRanges(path) != obj)
+        elapsedSeconds += startTime.secsTo(QDateTime::currentDateTime());
 
     QJsonObject readObj = view.loadTreatmentParameterRanges(path);
 
     QCOMPARE(obj, readObj);
+    QVERIFY(elapsedSeconds < 2);
 
     readObj = view.loadTreatmentParameterRanges(QString("/tmp/wrong_path_%0.json")
                                                 .arg(QDateTime::currentDateTime().toString(datetimeFormat)));
 
     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.primingComplete(true);
+    QCOMPARE(view.primingComplete(), true);
+    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.secondsTotal(quint32(50));
+    QCOMPARE(view.secondsTotal(), quint32(50));
+    view.continueEnabled(false);
+    QCOMPARE(view.continueEnabled(), false);
+}