Index: unittests/tst_models.cpp =================================================================== diff -u -r7edcaf054062754370e0abd165f17ca9941b7d07 -rcfb9dbd1fb0a0370d7b4394b2f8e48b350282aef --- unittests/tst_models.cpp (.../tst_models.cpp) (revision 7edcaf054062754370e0abd165f17ca9941b7d07) +++ unittests/tst_models.cpp (.../tst_models.cpp) (revision cfb9dbd1fb0a0370d7b4394b2f8e48b350282aef) @@ -1471,6 +1471,85 @@ { Model::TreatmentParametersResp mData; + + QFETCH(int , errorIndex ); + QFETCH(QByteArray, data ); + + int startIndex = 0; + int index = errorIndex - 1; + bool ok = mData.fromByteArray(data, &startIndex); + + Q_UNUSED(ok) +#ifdef CONSOLEOUT + qDebug() << "index: " << index << "\n" + << "errorIndex: " << errorIndex << "\n" + << "startIndex: " << startIndex << "\n" + << "ok: " << ok << "\n" + << "data: " << data; +#endif + switch (errorIndex) { + case 0: { index = 0; + QVERIFY ( mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break; + + case 1: { index = index * sizeof mData._data.requestValid; + QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break; + + case 2: { index = index * sizeof mData._data.bloodFlowRate; + QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break; + + case 3: { index = index * sizeof mData._data.dialysateFlowRate; + QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break; + + case 4: { index = index * sizeof mData._data.duration; + QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break; + + case 5: { index = index * sizeof mData._data.heparinDispensingRate; + QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break; + + case 6: { index = index * sizeof mData._data.heparinBolusVolume; + QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break; + + case 7: { index = index * sizeof mData._data.heparinStopTime; + QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break; + + case 8: { index = index * sizeof mData._data.salineBolus; + QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break; + + case 9: { index = index * sizeof mData._data.acidConcentrate; + QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break; + + case 10: { index = index * sizeof mData._data.bicarbonateConcentrate; + QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break; + + case 11: { index = index * sizeof mData._data.dialyzerType; + QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break; + + case 12: { index = index * sizeof mData._data.dialysateTemp; + QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break; + + case 13: { index = index * sizeof mData._data.arterialPressureLimitLow; + QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break; + + case 14: { index = index * sizeof mData._data.arterialPressureLimitHigh; + QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break; + + case 15: { index = index * sizeof mData._data.venousPressureLimitLow; + QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break; + + case 16: { index = index * sizeof mData._data.venousPressureLimitHigh; + QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break; + + case 17: { index = index * sizeof mData._data.bloodPressureMeasureInterval; + QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break; + + case 18: { index = index * sizeof mData._data.rinsebackFlowRate; + QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break; + default: + QVERIFY2(false, "Incorrect Test"); + break; + } +} + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MTreatmentSalineBolusData ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MTreatmentSalineBolusData data definition ~~~~~~~~~~~~~~~~~~~~~~~~ // @@ -1625,6 +1704,8 @@ QVERIFY(data.rinsebackFlowRate == tempData.rinsebackFlowRate); } + } +} // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MSalineBolusResponse ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MSalineBolusResponse data definition ~~~~~~~~~~~~~~~~~~~~~~~~ // Index: unittests/tst_models.h =================================================================== diff -u -r7edcaf054062754370e0abd165f17ca9941b7d07 -rcfb9dbd1fb0a0370d7b4394b2f8e48b350282aef --- unittests/tst_models.h (.../tst_models.h) (revision 7edcaf054062754370e0abd165f17ca9941b7d07) +++ unittests/tst_models.h (.../tst_models.h) (revision cfb9dbd1fb0a0370d7b4394b2f8e48b350282aef) @@ -105,9 +105,7 @@ void tst_MTreatmentParametersResp_data(); void tst_MTreatmentParametersResp(); void tst_MTreatmentParametersResp_fromVariantList(); -}; - void tst_MTreatmentSalineBolusData_data(); void tst_MTreatmentSalineBolusData();