Index: unittests/tst_views.cpp
===================================================================
diff -u -rc838ade760d18fe2b391ea2e90bc04de0d4aa1eb -r97fc44f948bd39ed0b4238558a16bf99f750bf5e
--- unittests/tst_views.cpp	(.../tst_views.cpp)	(revision c838ade760d18fe2b391ea2e90bc04de0d4aa1eb)
+++ unittests/tst_views.cpp	(.../tst_views.cpp)	(revision 97fc44f948bd39ed0b4238558a16bf99f750bf5e)
@@ -269,7 +269,7 @@
     view.set_bicarbonateConcentrate(-1);
 
     view.set_dialyzerType(-1);
-    view.set_dialysateTemp(0);
+    view.set_dialysateTemp(1);
     view.set_arterialPressureLimitLow(1);
     view.set_arterialPressureLimitHigh(1);
     view.set_venousPressureLimitLow(1);
@@ -343,6 +343,155 @@
 
 }
 
+void tst_views::VCreateTreatment_check_init()
+{
+    View::VCreateTreatment view;
+    quint32 val = 150; view.bloodFlowRateMin(val); ++val;
+                       view.bloodFlowRateMin(val);
+    QCOMPARE(val,      view.bloodFlowRateMin());
+
+    val = 501;    view.bloodFlowRateMax(val); ++val;
+                  view.bloodFlowRateMax(val);
+                  view.bloodFlowRateMax(val);
+    QCOMPARE(val, view.bloodFlowRateMax());
+
+    val = 100;    view.dialysateFlowRateMin(val); ++val;
+                  view.dialysateFlowRateMin(val);
+    QCOMPARE(val, view.dialysateFlowRateMin());
+
+    val = 600;    view.dialysateFlowRateMax(val); ++val;
+                  view.dialysateFlowRateMax(val);
+    QCOMPARE(val, view.dialysateFlowRateMax());
+
+    val = 60;     view.durationMin(val); ++val;
+                  view.durationMin(val);
+    QCOMPARE(val, view.durationMin());
+
+    val = 480;    view.durationMax(val); ++val;
+                  view.durationMax(val);
+    QCOMPARE(val, view.durationMax());
+
+    val = 0;      view.heparinDispensingRateMin(val); ++val;
+                  view.heparinDispensingRateMin(val);
+    QCOMPARE(val, view.heparinDispensingRateMin());
+
+    val = 1000;   view.heparinDispensingRateMax(val); ++val;
+                  view.heparinDispensingRateMax(val);
+    QCOMPARE(val, view.heparinDispensingRateMax());
+
+    val = 100;    view.heparinBolusVolumeMin(val); ++val;
+                  view.heparinBolusVolumeMin(val);
+    QCOMPARE(val, view.heparinBolusVolumeMin());
+
+    val = 2000;   view.heparinBolusVolumeMax(val); ++val;
+                  view.heparinBolusVolumeMax(val);
+    QCOMPARE(val, view.heparinBolusVolumeMax());
+
+    val = 1000;   view.heparinStopTimeMin(val); ++val;
+                  view.heparinStopTimeMin(val);
+    QCOMPARE(val, view.heparinStopTimeMin());
+
+    val = 2000;   view.heparinStopTimeMax(val); ++val;
+                  view.heparinStopTimeMax(val);
+    QCOMPARE(val, view.heparinStopTimeMax());
+
+    val = 480;    view.durationMax(val); ++val;
+                  view.durationMax(val);
+    QCOMPARE(val, view.durationMax());
+
+    QStringList options = QStringList() << "100 mL" << "200 mL" << "300 mL";
+                      view.salineBolusOptions(options); options.append(" ");
+                      view.salineBolusOptions(options);
+    QCOMPARE(options, view.salineBolusOptions());
+
+
+    options = QStringList() << "08-1251-1" << "08-2251-0" << "08-3251-9";
+                      view.acidConcentrateOptions(options); options.append(" ");
+                      view.acidConcentrateOptions(options);
+    QCOMPARE(options, view.acidConcentrateOptions());
+
+    options = QStringList() << "Dimesol - BC-201";
+                      view.bicarbonateConcentrateOptions(options); options.append(" ");
+                      view.bicarbonateConcentrateOptions(options);
+    QCOMPARE(options, view.bicarbonateConcentrateOptions());
+
+
+    options = QStringList() << "Nipro Elisio-H 17"
+                            << "Nipro Elisio-H 19"
+                            << "Fresenius Optiflux F160NRe"
+                            << "Fresenius Optiflux F180NRe";
+                      view.dialyzerTypeOptions(options); options.append(" ");
+                      view.dialyzerTypeOptions(options);
+    QCOMPARE(options, view.dialyzerTypeOptions());
+
+    val = 36;     view.dialysateTempMin(val); ++val;
+                  view.dialysateTempMin(val);
+    QCOMPARE(val, view.dialysateTempMin());
+
+    val = 37;     view.dialysateTempMax(val); ++val;
+                  view.dialysateTempMax(val);
+    QCOMPARE(val, view.dialysateTempMax());
+
+    qint32 v;
+    v = -299;   view.arterialPressureLimitLowMin(v); ++v;
+                view.arterialPressureLimitLowMin(v);
+    QCOMPARE(v, view.arterialPressureLimitLowMin());
+
+    v = 201;    view.arterialPressureLimitLowMax(v); ++v;
+                view.arterialPressureLimitLowMax(v);
+    QCOMPARE(v, view.arterialPressureLimitLowMax());
+
+    v = 1000;   view.arterialPressureLimitHighMin(v); ++v;
+                view.arterialPressureLimitHighMin(v);
+    QCOMPARE(v, view.arterialPressureLimitHighMin());
+
+    v = 2000;   view.arterialPressureLimitHighMax(v); ++v;
+                view.arterialPressureLimitHighMax(v);
+    QCOMPARE(v, view.arterialPressureLimitHighMax());
+
+    v = -101;   view.venousPressureLimitLowMin(v); ++v;
+                view.venousPressureLimitLowMin(v);
+    QCOMPARE(v, view.venousPressureLimitLowMin());
+
+    v = 601;    view.venousPressureLimitLowMax(v); ++v;
+                view.venousPressureLimitLowMax(v);
+    QCOMPARE(v, view.venousPressureLimitLowMax());
+
+    v = 10;     view.venousPressureLimitHighMin(v); ++v;
+                view.venousPressureLimitHighMin(v);
+    QCOMPARE(v, view.venousPressureLimitHighMin());
+
+    v = 601;    view.venousPressureLimitHighMax(v); ++v;
+                view.venousPressureLimitHighMax(v);
+    QCOMPARE(v, view.venousPressureLimitHighMax());
+
+
+    val = 1;      view.bloodPressureMeasureIntervalMin(val); ++val;
+                  view.bloodPressureMeasureIntervalMin(val);
+    QCOMPARE(val, view.bloodPressureMeasureIntervalMin());
+
+    val = 31;     view.bloodPressureMeasureIntervalMax(val); ++val;
+                  view.bloodPressureMeasureIntervalMax(val);
+    QCOMPARE(val, view.bloodPressureMeasureIntervalMax());
+
+
+    val = 10;     view.rinsebackFlowRateMin(val); ++val;
+                  view.rinsebackFlowRateMin(val);
+    QCOMPARE(val, view.rinsebackFlowRateMin());
+
+    val = 149;    view.rinsebackFlowRateMax(val); ++val;
+                  view.rinsebackFlowRateMax(val);
+    QCOMPARE(val, view.rinsebackFlowRateMax());
+
+    bool b = false; view.continueEnabled(b);
+                    view.continueEnabled(b);
+    QCOMPARE(b,     view.continueEnabled());
+
+                    view.saveTreatmentProfile(b);
+                    view.saveTreatmentProfile(b);
+    QCOMPARE(b,     view.saveTreatmentProfile());
+}
+
 void tst_views::VCreateTreatment_save_csv()
 {
     View::VCreateTreatment view;
@@ -387,9 +536,14 @@
         {"rinsebackFlowRate",           QString::number(view.treatmentData.rinsebackFlowRate)}
     };
 
+    QString oldFilename = view.saveNewTreatment(objectWritten);
+
+    QThread::msleep(500);
     QString filename = view.saveNewTreatment(objectWritten);
 
+    QVERIFY(oldFilename != filename);
 
+
     QThread::msleep(500);
 
     QJsonObject objectRead;