Index: unittests/tst_views.cpp =================================================================== diff -u -rb61d8a3e01fef66eee8095c9cddf835d9bb32b66 -r0583a63307936f09e184dfe16acca25f9e3fd81c --- unittests/tst_views.cpp (.../tst_views.cpp) (revision b61d8a3e01fef66eee8095c9cddf835d9bb32b66) +++ unittests/tst_views.cpp (.../tst_views.cpp) (revision 0583a63307936f09e184dfe16acca25f9e3fd81c) @@ -82,7 +82,7 @@ if (i != 4) view.set_heparinBolusVolume(view.heparinBolusVolumeMax()); if (i != 5) view.set_heparinStopTime(view.heparinStopTimeMax()); - if (i != 6) view.set_salineBolusVolume(0); + if (i != 6) view.set_salineBolusVolume(view.salineBolusVolumeMax()); if (i != 7) view.set_acidConcentrate(0); if (i != 8) view.set_bicarbonateConcentrate(0); @@ -124,7 +124,7 @@ QCOMPARE(view.get_heparinBolusVolume(),view.heparinBolusVolumeMax()); QCOMPARE(view.get_heparinStopTime(),view.heparinStopTimeMax()); - QCOMPARE(view.get_salineBolusVolume(), quint32(0)); + QCOMPARE(view.get_salineBolusVolume(), view.salineBolusVolumeMax()); QCOMPARE(view.get_acidConcentrate(), quint32(0)); QCOMPARE(view.get_bicarbonateConcentrate(), quint32(0)); @@ -318,7 +318,7 @@ case 4: view.set_heparinBolusVolume(view.heparinBolusVolumeMax()+1); break; case 5: view.set_heparinStopTime(view.heparinStopTimeMax()+1); break; - case 6: view.set_salineBolusVolume(view.salineBolusOptions().length()); break; + case 6: view.set_salineBolusVolume(view.salineBolusVolumeMax()+1); break; case 7: view.set_acidConcentrate(view.acidConcentrateOptions().length()); break; case 8: view.set_bicarbonateConcentrate(view.bicarbonateConcentrateOptions().length()); break; @@ -407,14 +407,12 @@ view.durationMax(val); QCOMPARE(val, view.durationMax()); - QStringList options = QStringList() << "100 mL" << "200 mL" << "300 mL"; - view.salineBolusOptions(options); options.append(" "); - view.salineBolusOptions(options); - view.salineBolusOptions(options); - QCOMPARE(options, view.salineBolusOptions()); + val = 300; view.salineBolusVolumeMax(val); ++val; + view.salineBolusVolumeMax(val); + view.salineBolusVolumeMax(val); + QCOMPARE(val, view.salineBolusVolumeMax()); - - options = QStringList() << "08-1251-1" << "08-2251-0" << "08-3251-9"; + QStringList options = QStringList() << "08-1251-1" << "08-2251-0" << "08-3251-9"; view.acidConcentrateOptions(options); options.append(" "); view.acidConcentrateOptions(options); view.acidConcentrateOptions(options); @@ -654,36 +652,34 @@ { // 0 = OK, 1,2,3 ... parameter is not OK QVariantList messageData; - if (i == 0) messageData.append(1); else messageData.append(0); - if (i == 1) messageData.append(1); else messageData.append(0); - if (i == 2) messageData.append(1); else messageData.append(0); - if (i == 3) messageData.append(1); else messageData.append(0); - if (i == 4) messageData.append(1); else messageData.append(0); - if (i == 5) messageData.append(1); else messageData.append(0); - if (i == 6) messageData.append(1); else messageData.append(0); - if (i == 7) messageData.append(1); else messageData.append(0); - if (i == 8) messageData.append(1); else messageData.append(0); - if (i == 9) messageData.append(1); else messageData.append(0); - if (i == 10) messageData.append(1); else messageData.append(0); - if (i == 11) messageData.append(1); else messageData.append(0); - if (i == 12) messageData.append(1); else messageData.append(0); - if (i == 13) messageData.append(1); else messageData.append(0); - if (i == 14) messageData.append(1); else messageData.append(0); - if (i == 15) messageData.append(1); else messageData.append(0); - if (i == 16) messageData.append(1); else messageData.append(0); - if (i == 17) messageData.append(1); else messageData.append(0); - QVERIFY(!view.onFWValidationResponse(action, messageData)); + AdjustTreatmentParametersResponseData 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; + if (i == 3) respData.duration = 1; else respData.duration = 0; + if (i == 4) respData.heparinStopTime = 1; else respData.heparinStopTime = 0; + if (i == 5) respData.salineBolus = 1; else respData.salineBolus = 0; + 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 == 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; + if (i == 13) respData.venousPressureLimitLow = 1; else respData.venousPressureLimitLow = 0; + if (i == 14) respData.venousPressureLimitHigh = 1; else respData.venousPressureLimitHigh = 0; + 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.onFWValidationResponse(respData)); } AdjustTreatmentParametersRequestData dataBackup = view.treatmentData; - QVariantList validMessageData; - for (int i = 0; i < 18; ++i) { validMessageData.append(0); } + AdjustTreatmentParametersResponseData respData; - QVERIFY(!view.onFWValidationResponse(GuiActionType::ID_CreateTreatmentReq, validMessageData)); + QVERIFY(view.onFWValidationResponse(respData)); - QVERIFY(view.onFWValidationResponse(GuiActionType::ID_CreateTreatmentRsp, validMessageData)); - view.saveTreatmentProfile(false); QVERIFY(!view._saveTreatmentProfile); view.onFinishedConfirm();