Index: unittests/tst_views.cpp =================================================================== diff -u -ra3030123e885fb9f22dea5839c4e988896a257e4 -r96854524927f212c24b9e4a253baeff2e672228f --- unittests/tst_views.cpp (.../tst_views.cpp) (revision a3030123e885fb9f22dea5839c4e988896a257e4) +++ unittests/tst_views.cpp (.../tst_views.cpp) (revision 96854524927f212c24b9e4a253baeff2e672228f) @@ -21,7 +21,7 @@ #include "VTreatmentAdjustmentUltrafiltrationState.h" #include "FileHandler.h" #include "VTreatmentBegin.h" -#include "VPriming.h" +#include "VPreTreatmentPrimeData.h" #include "VAlarmStatus.h" tst_views::tst_views(QObject *parent) : QObject(parent) { } @@ -825,41 +825,3 @@ 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.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); - 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.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); - QCOMPARE(view.continueEnabled(), false); -}