Index: sources/storage/filesaver.h =================================================================== diff -u -rc71deaab48699cffdf9db816dfac2778d79c2238 -rf3b164487b1648637f5dd9a306cb6ade763d27c9 --- sources/storage/filesaver.h (.../filesaver.h) (revision c71deaab48699cffdf9db816dfac2778d79c2238) +++ sources/storage/filesaver.h (.../filesaver.h) (revision f3b164487b1648637f5dd9a306cb6ade763d27c9) @@ -18,7 +18,7 @@ { Q_OBJECT -SINGLETON(FileSaver); +SINGLETON(FileSaver) private: QFutureWatcher _futureWatcher; Index: sources/view/VCreateTreatment.cpp =================================================================== diff -u -r97fc44f948bd39ed0b4238558a16bf99f750bf5e -rf3b164487b1648637f5dd9a306cb6ade763d27c9 --- sources/view/VCreateTreatment.cpp (.../VCreateTreatment.cpp) (revision 97fc44f948bd39ed0b4238558a16bf99f750bf5e) +++ sources/view/VCreateTreatment.cpp (.../VCreateTreatment.cpp) (revision f3b164487b1648637f5dd9a306cb6ade763d27c9) @@ -397,15 +397,15 @@ * \returns QString - the file to be written to * */ -QString VCreateTreatment::saveNewTreatment(QJsonObject obj) +QString VCreateTreatment::saveNewTreatment(const QJsonObject &obj, const QString &dir) { QJsonDocument document(obj); int i = 0; - while (QFile(QString("%0treatment%1.json").arg(Treatment_Profiles_Dir).arg(i)).exists()) + while (QFile(QString("%0treatment%1.json").arg(dir).arg(i)).exists()) { i++; } - QString filename = QString("%0treatment%1.json").arg(Treatment_Profiles_Dir).arg(i); + QString filename = QString("%0treatment%1.json").arg(dir).arg(i); _FileSaver.concurrentSave(filename, document.toJson(), false); return filename; Index: sources/view/VCreateTreatment.h =================================================================== diff -u -rc838ade760d18fe2b391ea2e90bc04de0d4aa1eb -rf3b164487b1648637f5dd9a306cb6ade763d27c9 --- sources/view/VCreateTreatment.h (.../VCreateTreatment.h) (revision c838ade760d18fe2b391ea2e90bc04de0d4aa1eb) +++ sources/view/VCreateTreatment.h (.../VCreateTreatment.h) (revision f3b164487b1648637f5dd9a306cb6ade763d27c9) @@ -95,7 +95,7 @@ TreatmentData treatmentData; bool validate(const TreatmentData &vData); - QString saveNewTreatment(QJsonObject obj); + QString saveNewTreatment(const QJsonObject &obj, const QString &dir = Treatment_Profiles_Dir); QString getParameterRangesDataCSV(); bool saveTreatmentRangesCSV(const QString &filename); QJsonObject loadTreatmentParameterRanges(const QString &path = Treatment_Parameter_Ranges_Path); Index: unittests/tst_messaging.cpp =================================================================== diff -u -r97fc44f948bd39ed0b4238558a16bf99f750bf5e -rf3b164487b1648637f5dd9a306cb6ade763d27c9 --- unittests/tst_messaging.cpp (.../tst_messaging.cpp) (revision 97fc44f948bd39ed0b4238558a16bf99f750bf5e) +++ unittests/tst_messaging.cpp (.../tst_messaging.cpp) (revision f3b164487b1648637f5dd9a306cb6ade763d27c9) @@ -816,6 +816,8 @@ QByteArray byteArray; QVERIFY(interpreter.interpretMessage(msg.actionId, variantList, byteArray)); + QVERIFY(!interpreter.interpretMessage(msg.actionId, QVariantList(), byteArray)); + } /*! Index: unittests/tst_messaging.h =================================================================== diff -u -r9551959461d534dc624f0cbcca0e6f953844fb16 -rf3b164487b1648637f5dd9a306cb6ade763d27c9 --- unittests/tst_messaging.h (.../tst_messaging.h) (revision 9551959461d534dc624f0cbcca0e6f953844fb16) +++ unittests/tst_messaging.h (.../tst_messaging.h) (revision f3b164487b1648637f5dd9a306cb6ade763d27c9) @@ -110,8 +110,7 @@ void tst_MessageBuilder_buildFrames_eLenCanFrame(); void tst_MessageDispatcher_actionTransmit(); - void tst_MessageDispatcher_actionTransmit_Unknown(); - + void tst_MessageDispatcher_actionTransmit_Unknown(); }; Index: unittests/tst_views.cpp =================================================================== diff -u -r97fc44f948bd39ed0b4238558a16bf99f750bf5e -rf3b164487b1648637f5dd9a306cb6ade763d27c9 --- unittests/tst_views.cpp (.../tst_views.cpp) (revision 97fc44f948bd39ed0b4238558a16bf99f750bf5e) +++ unittests/tst_views.cpp (.../tst_views.cpp) (revision f3b164487b1648637f5dd9a306cb6ade763d27c9) @@ -269,7 +269,7 @@ view.set_bicarbonateConcentrate(-1); view.set_dialyzerType(-1); - view.set_dialysateTemp(1); + view.set_dialysateTemp(0); view.set_arterialPressureLimitLow(1); view.set_arterialPressureLimitHigh(1); view.set_venousPressureLimitLow(1); @@ -348,6 +348,7 @@ View::VCreateTreatment view; quint32 val = 150; view.bloodFlowRateMin(val); ++val; view.bloodFlowRateMin(val); + view.bloodFlowRateMin(val); QCOMPARE(val, view.bloodFlowRateMin()); val = 501; view.bloodFlowRateMax(val); ++val; @@ -361,6 +362,7 @@ val = 600; view.dialysateFlowRateMax(val); ++val; view.dialysateFlowRateMax(val); + view.dialysateFlowRateMax(val); QCOMPARE(val, view.dialysateFlowRateMax()); val = 60; view.durationMin(val); ++val; @@ -369,50 +371,61 @@ val = 480; view.durationMax(val); ++val; view.durationMax(val); + view.durationMax(val); QCOMPARE(val, view.durationMax()); val = 0; view.heparinDispensingRateMin(val); ++val; view.heparinDispensingRateMin(val); + view.heparinDispensingRateMin(val); QCOMPARE(val, view.heparinDispensingRateMin()); val = 1000; view.heparinDispensingRateMax(val); ++val; view.heparinDispensingRateMax(val); + view.heparinDispensingRateMax(val); QCOMPARE(val, view.heparinDispensingRateMax()); val = 100; view.heparinBolusVolumeMin(val); ++val; view.heparinBolusVolumeMin(val); + view.heparinBolusVolumeMin(val); QCOMPARE(val, view.heparinBolusVolumeMin()); val = 2000; view.heparinBolusVolumeMax(val); ++val; view.heparinBolusVolumeMax(val); + view.heparinBolusVolumeMax(val); QCOMPARE(val, view.heparinBolusVolumeMax()); val = 1000; view.heparinStopTimeMin(val); ++val; view.heparinStopTimeMin(val); + view.heparinStopTimeMin(val); QCOMPARE(val, view.heparinStopTimeMin()); val = 2000; view.heparinStopTimeMax(val); ++val; view.heparinStopTimeMax(val); + view.heparinStopTimeMax(val); QCOMPARE(val, view.heparinStopTimeMax()); val = 480; view.durationMax(val); ++val; view.durationMax(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); + 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); + view.acidConcentrateOptions(options); QCOMPARE(options, view.acidConcentrateOptions()); options = QStringList() << "Dimesol - BC-201"; view.bicarbonateConcentrateOptions(options); options.append(" "); view.bicarbonateConcentrateOptions(options); + view.bicarbonateConcentrateOptions(options); QCOMPARE(options, view.bicarbonateConcentrateOptions()); @@ -422,65 +435,80 @@ << "Fresenius Optiflux F180NRe"; view.dialyzerTypeOptions(options); options.append(" "); view.dialyzerTypeOptions(options); + view.dialyzerTypeOptions(options); QCOMPARE(options, view.dialyzerTypeOptions()); val = 36; view.dialysateTempMin(val); ++val; view.dialysateTempMin(val); + view.dialysateTempMin(val); QCOMPARE(val, view.dialysateTempMin()); val = 37; view.dialysateTempMax(val); ++val; view.dialysateTempMax(val); + view.dialysateTempMax(val); QCOMPARE(val, view.dialysateTempMax()); qint32 v; v = -299; view.arterialPressureLimitLowMin(v); ++v; view.arterialPressureLimitLowMin(v); + view.arterialPressureLimitLowMin(v); QCOMPARE(v, view.arterialPressureLimitLowMin()); v = 201; view.arterialPressureLimitLowMax(v); ++v; view.arterialPressureLimitLowMax(v); + view.arterialPressureLimitLowMax(v); QCOMPARE(v, view.arterialPressureLimitLowMax()); v = 1000; view.arterialPressureLimitHighMin(v); ++v; view.arterialPressureLimitHighMin(v); + view.arterialPressureLimitHighMin(v); QCOMPARE(v, view.arterialPressureLimitHighMin()); v = 2000; view.arterialPressureLimitHighMax(v); ++v; view.arterialPressureLimitHighMax(v); + view.arterialPressureLimitHighMax(v); QCOMPARE(v, view.arterialPressureLimitHighMax()); v = -101; view.venousPressureLimitLowMin(v); ++v; view.venousPressureLimitLowMin(v); + view.venousPressureLimitLowMin(v); QCOMPARE(v, view.venousPressureLimitLowMin()); v = 601; view.venousPressureLimitLowMax(v); ++v; view.venousPressureLimitLowMax(v); + view.venousPressureLimitLowMax(v); QCOMPARE(v, view.venousPressureLimitLowMax()); v = 10; view.venousPressureLimitHighMin(v); ++v; view.venousPressureLimitHighMin(v); + view.venousPressureLimitHighMin(v); QCOMPARE(v, view.venousPressureLimitHighMin()); v = 601; view.venousPressureLimitHighMax(v); ++v; view.venousPressureLimitHighMax(v); + view.venousPressureLimitHighMax(v); QCOMPARE(v, view.venousPressureLimitHighMax()); val = 1; view.bloodPressureMeasureIntervalMin(val); ++val; view.bloodPressureMeasureIntervalMin(val); + view.bloodPressureMeasureIntervalMin(val); QCOMPARE(val, view.bloodPressureMeasureIntervalMin()); val = 31; view.bloodPressureMeasureIntervalMax(val); ++val; view.bloodPressureMeasureIntervalMax(val); + view.bloodPressureMeasureIntervalMax(val); QCOMPARE(val, view.bloodPressureMeasureIntervalMax()); val = 10; view.rinsebackFlowRateMin(val); ++val; view.rinsebackFlowRateMin(val); + view.rinsebackFlowRateMin(val); QCOMPARE(val, view.rinsebackFlowRateMin()); val = 149; view.rinsebackFlowRateMax(val); ++val; view.rinsebackFlowRateMax(val); + view.rinsebackFlowRateMax(val); QCOMPARE(val, view.rinsebackFlowRateMax()); bool b = false; view.continueEnabled(b); @@ -536,10 +564,12 @@ {"rinsebackFlowRate", QString::number(view.treatmentData.rinsebackFlowRate)} }; - QString oldFilename = view.saveNewTreatment(objectWritten); + QString dir = QString("/tmp/newTreatment_%0.json").arg(QDateTime::currentDateTime().toString(datetimeFormat)); + QString oldFilename = view.saveNewTreatment(objectWritten, dir); + QThread::msleep(500); - QString filename = view.saveNewTreatment(objectWritten); + QString filename = view.saveNewTreatment(objectWritten, dir); QVERIFY(oldFilename != filename); @@ -692,7 +722,7 @@ QJsonDocument document(obj); - QString path = "/tmp/ranges.json"; + QString path = QString("/tmp/ranges_%0.json").arg(QDateTime::currentDateTime().toString(datetimeFormat));; _FileSaver.concurrentSave(path, document.toJson(), false); @@ -702,7 +732,8 @@ QCOMPARE(obj, readObj); - readObj = view.loadTreatmentParameterRanges("/tmp/wrong_path.json"); + readObj = view.loadTreatmentParameterRanges(QString("/tmp/wrong_path_%0.json") + .arg(QDateTime::currentDateTime().toString(datetimeFormat))); QVERIFY(obj != readObj);