Index: unittests/tst_views.cpp =================================================================== diff -u -r0d59385f134f65a19dace1e2b46eb2631924396e -r9e234daa89b49df33be6faeaa597e6592526b539 --- unittests/tst_views.cpp (.../tst_views.cpp) (revision 0d59385f134f65a19dace1e2b46eb2631924396e) +++ unittests/tst_views.cpp (.../tst_views.cpp) (revision 9e234daa89b49df33be6faeaa597e6592526b539) @@ -197,11 +197,8 @@ obj["heparinBolusVolumeMax"] = 2000; obj["heparinStopTimeMin"] = 1000; obj["heparinStopTimeMax"] = 2000; - obj["salineBolusOptions"] = QJsonArray({ - "100 mL", - "200 mL", - "300 mL" - }); + obj["salineBolusVolumeMin"] = 100; + obj["salineBolusVolumeMax"] = 300; obj["acidConcentrateOptions"] = QJsonArray({ "08-1251-1", "08-2251-0", @@ -238,36 +235,82 @@ */ void tst_views::VCreateTreatment_validation_ranges() { - View::VTreatmentCreate view; + View::VTreatmentCreate v; // 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(v.bloodFlowRateRes(), quint32(25)); + QCOMPARE(v.dialysateFlowRateRes(), quint32(50 )); + QCOMPARE(v.durationRes(), quint32(15 )); + QCOMPARE(v.heparinDispensingRateRes(), qreal(0.1)); + QCOMPARE(v.heparinBolusVolumeRes(), qreal(0.1)); + QCOMPARE(v.heparinStopTimeRes(), quint32(10 )); + QCOMPARE(v.salineBolusVolumeRes(), quint32(100)); - QCOMPARE(view.acidConcentrateRes(), quint32(1)); - QCOMPARE(view.bicarbonateConcentrateRes(), quint32(1)); - QCOMPARE(view.dialyzerTypeRes(), quint32(1)); + QCOMPARE(v.acidConcentrateRes(), quint32(1)); + QCOMPARE(v.bicarbonateConcentrateRes(), quint32(1)); + QCOMPARE(v.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)); + QCOMPARE(v.dialysateTempRes(), qreal(0.5)); + QCOMPARE(v.arterialPressureLimitLowRes(), qint32(10)); + QCOMPARE(v.arterialPressureLimitHighRes(), qint32(10)); + QCOMPARE(v.venousPressureLimitLowRes(), qint32(10)); + QCOMPARE(v.venousPressureLimitHighRes(), qint32(10)); + QCOMPARE(v.bloodPressureMeasureIntervalRes(), quint32(5)); + QCOMPARE(v.rinsebackFlowRateRes(), quint32(25)); + v.bloodFlowRateRes (quint32(26)); + v.dialysateFlowRateRes (quint32(51)); + v.durationRes (quint32(16)); + v.heparinDispensingRateRes (qreal(0.2)); + v.heparinBolusVolumeRes (qreal(0.2)); + v.heparinStopTimeRes (quint32(11)); + v.salineBolusVolumeRes (quint32(101)); + + v.acidConcentrateRes (quint32(2)); + v.bicarbonateConcentrateRes (quint32(2)); + v.dialyzerTypeRes (quint32(2)); + + v.dialysateTempRes (qreal(0.6)); + v.arterialPressureLimitLowRes (qint32(11)); + v.arterialPressureLimitHighRes (qint32(11)); + v.venousPressureLimitLowRes (qint32(11)); + v.venousPressureLimitHighRes (qint32(11)); + v.bloodPressureMeasureIntervalRes (quint32(6)); + v.rinsebackFlowRateRes (quint32(26)); + + QCOMPARE(v.bloodFlowRateRes(), quint32(26)); + QCOMPARE(v.dialysateFlowRateRes(), quint32(51)); + QCOMPARE(v.durationRes(), quint32(16)); + QCOMPARE(v.heparinDispensingRateRes(), qreal(0.2)); + QCOMPARE(v.heparinBolusVolumeRes(), qreal(0.2)); + QCOMPARE(v.heparinStopTimeRes(), quint32(11)); + QCOMPARE(v.salineBolusVolumeRes(), quint32(101)); + + QCOMPARE(v.acidConcentrateRes(), quint32(2)); + QCOMPARE(v.bicarbonateConcentrateRes(), quint32(2)); + QCOMPARE(v.dialyzerTypeRes(), quint32(2)); + + QCOMPARE(v.dialysateTempRes(), qreal(0.6)); + QCOMPARE(v.arterialPressureLimitLowRes(), qint32(11)); + QCOMPARE(v.arterialPressureLimitHighRes(), qint32(11)); + QCOMPARE(v.venousPressureLimitLowRes(), qint32(11)); + QCOMPARE(v.venousPressureLimitHighRes(), qint32(11)); + QCOMPARE(v.bloodPressureMeasureIntervalRes(), quint32(6)); + QCOMPARE(v.rinsebackFlowRateRes(), quint32(26)); + + View::VTreatmentCreate view; + // adjust quint32 minimums view.bloodFlowRateMin(1); view.dialysateFlowRateMin(1); view.durationMin(1); view.heparinDispensingRateMin(2); view.heparinBolusVolumeMin(1); view.heparinStopTimeMin(1); + view.salineBolusVolumeMin(1); + view.acidConcentrateMin(1); + view.bicarbonateConcentrateMin(1); + view.dialyzerTypeMin(1); view.dialysateTempMin(1); view.arterialPressureLimitLowMin(2); @@ -285,11 +328,11 @@ view.heparinBolusVolume(0); view.heparinStopTime(0); - view.salineBolusVolume(-1); - view.acidConcentrate(-1); - view.bicarbonateConcentrate(-1); + view.salineBolusVolume(0); + view.acidConcentrate(view.acidConcentrateMin()); + view.bicarbonateConcentrate(view.bicarbonateConcentrateMin()); - view.dialyzerType(-1); + view.dialyzerType(view.dialyzerTypeMin()); view.dialysateTemp(0); view.arterialPressureLimitLow(1); view.arterialPressureLimitHigh(1); @@ -361,6 +404,10 @@ QCOMPARE(view.validate(view.treatmentData), false); view.doFinishedCreate(); } + view.dialyzerType(-1); + QVERIFY(!(view.dialyzerTypeOptions().length() - 1 < (int)view.dialyzerType())); + QStringList result = view.doGetOperatingParameterValues(); + QCOMPARE(result.at(2), "None"); } void tst_views::VCreateTreatment_check_init() @@ -436,12 +483,14 @@ QStringList options = QStringList() << "08-1251-1" << "08-2251-0" << "08-3251-9"; view.acidConcentrateOptions(options); options.append(" "); + view.acidConcentrateMax(view.acidConcentrateMax()+1); view.acidConcentrateOptions(options); view.acidConcentrateOptions(options); QCOMPARE(options, view.acidConcentrateOptions()); options = QStringList() << "Dimesol - BC-201"; view.bicarbonateConcentrateOptions(options); options.append(" "); + view.bicarbonateConcentrateMax(view.bicarbonateConcentrateMax()+1); view.bicarbonateConcentrateOptions(options); view.bicarbonateConcentrateOptions(options); QCOMPARE(options, view.bicarbonateConcentrateOptions()); @@ -452,6 +501,7 @@ << "Fresenius Optiflux F160NRe" << "Fresenius Optiflux F180NRe"; view.dialyzerTypeOptions(options); options.append(" "); + view.dialyzerTypeMax(view.dialyzerTypeMax()+1); view.dialyzerTypeOptions(options); view.dialyzerTypeOptions(options); QCOMPARE(options, view.dialyzerTypeOptions()); @@ -684,7 +734,7 @@ if (i == 6) respData.acidConcentrate = 1; else respData.acidConcentrate = 0; if (i == 7) respData.bicarbonateConcentrate = 1; else respData.bicarbonateConcentrate = 0; if (i == 8) respData.dialyzerType = 1; else respData.dialyzerType = 0; - if (i == 9) respData.bloodPressureMeasureInterval = 1; else respData.bloodPressureMeasureInterval= 0; + if (i == 9) respData.bloodPressureMeasureInterval = 1; else respData.bloodPressureMeasureInterval= 0; if (i == 10) respData.rinsebackFlowRate = 1; else respData.rinsebackFlowRate = 0; if (i == 11) respData.arterialPressureLimitLow = 1; else respData.arterialPressureLimitLow = 0; if (i == 12) respData.arterialPressureLimitHigh = 1; else respData.arterialPressureLimitHigh = 0; @@ -700,6 +750,12 @@ AdjustTreatmentParametersResponseData respData; + StartTreatmentResponseData startResponse; + + startResponse.startTreatmentResponse = 0; // REJECT + view.doActionReceive(startResponse); + QCOMPARE(view.pageToShow, View::VTreatmentCreate::Page::None); + QVERIFY(view.doActionReceive(respData)); view.saveTreatmentProfile(false); @@ -733,7 +789,6 @@ QCOMPARE(view.treatmentData.venousPressureLimitHigh, dataBackup.venousPressureLimitHigh); QCOMPARE(view.treatmentData.bloodPressureMeasureInterval, dataBackup.bloodPressureMeasureInterval); QCOMPARE(view.treatmentData.rinsebackFlowRate, dataBackup.rinsebackFlowRate); - } /*! @@ -793,8 +848,14 @@ 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); @@ -803,6 +864,10 @@ 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);