Index: unittests/tst_views.cpp =================================================================== diff -u -rc3a1e077ddeba65709084f9af5dd756741db8b4f -r0bde586566a8c0324fbc786690102b79a87afa4a --- unittests/tst_views.cpp (.../tst_views.cpp) (revision c3a1e077ddeba65709084f9af5dd756741db8b4f) +++ unittests/tst_views.cpp (.../tst_views.cpp) (revision 0bde586566a8c0324fbc786690102b79a87afa4a) @@ -23,6 +23,8 @@ #include "VTreatmentBegin.h" #include "VPriming.h" #include "VAlarmStatus.h" +#include "VBluetooth.h" +#include "VBluetoothDeviceInfo.h" tst_views::tst_views(QObject *parent) : QObject(parent) { } @@ -52,11 +54,6 @@ // try rejected v.adjustment_Accepted(false); - // SALINE_BOLUS_STATE_IDLE = 0, - // SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP - // SALINE_BOLUS_STATE_IN_PROGRESS, - // SALINE_BOLUS_STATE_MAX_DELIVERED, - // if not accepted and a reason passed then the parent should translate it and return v.adjustment_Reason(GuiRequestReasons::REQUEST_REJECT_REASON_INVALID_TREATMENT_STATE); QCOMPARE(v.text(), tr("REQUEST_REJECT_REASON_INVALID_TREATMENT_STATE")); @@ -373,7 +370,6 @@ view.doResetCreateTreatment(); - for (int i = 0; i < 17; ++i) { VCreateTreatment_simulate_valid_parameters(view); @@ -401,7 +397,6 @@ default: break; } - QCOMPARE(view.validate(view.treatmentData), false); view.doFinishedCreate(); } @@ -496,7 +491,6 @@ view.bicarbonateConcentrateOptions(options); QCOMPARE(options, view.bicarbonateConcentrateOptions()); - options = QStringList() << "Nipro Elisio-H 17" << "Nipro Elisio-H 19" << "Fresenius Optiflux F160NRe" @@ -558,7 +552,6 @@ view.venousPressureLimitHighMax(v); QCOMPARE(v, view.venousPressureLimitHighMax()); - val = 1; view.bloodPressureMeasureIntervalMin(val); ++val; view.bloodPressureMeasureIntervalMin(val); view.bloodPressureMeasureIntervalMin(val); @@ -569,7 +562,6 @@ view.bloodPressureMeasureIntervalMax(val); QCOMPARE(val, view.bloodPressureMeasureIntervalMax()); - val = 10; view.rinsebackFlowRateMin(val); ++val; view.rinsebackFlowRateMin(val); view.rinsebackFlowRateMin(val); @@ -767,11 +759,11 @@ QVERIFY(view._saveTreatmentProfile); view.doFinishedConfirm(); - view.onFinishedSaveNewTreatment(true); view.onFinishedSaveNewTreatment(false); + view._requestedSaveNewTreatmentProfile = true; + view.onFinishedSaveNewTreatment(false); view.doFinishedPrime(); - view.doStartTreatment(); QCOMPARE(view.treatmentData.bloodFlowRate, dataBackup.bloodFlowRate); QCOMPARE(view.treatmentData.dialysateFlowRate, dataBackup.dialysateFlowRate); @@ -874,3 +866,29 @@ view.continueEnabled(false); QCOMPARE(view.continueEnabled(), false); } + +void tst_views::VBluetoothDeviceInfo_properties() +{ + View::VBluetoothDeviceInfo view("EC:21:E5:F4:BC:C9", "BP7000"); + QCOMPARE("EC:21:E5:F4:BC:C9", view.getAddress()); + QCOMPARE("BP7000", view.getName()); + QCOMPARE(view.isValid(), true); + + QCOMPARE(view.isConnected(), false); + view.setConnected(true); + QCOMPARE(view.isConnected(), true); + view.setConnected(false); + QCOMPARE(view.isConnected(), false); + + View::VBluetoothDeviceInfo view2("EC:21:E5:F4:BC", "BP7000"); + QCOMPARE(view2.isValid(), false); + + View::VBluetoothDeviceInfo view3("EC:21:E5:F4:BC:C9", ""); + QCOMPARE(view3.isValid(), false); + + QCOMPARE(view2 == view3, false); + + View::VBluetoothDeviceInfo view4("EC:21:E5:F4:BC:C9", "BP7000"); + QCOMPARE(view == view4, true); + +}