Index: unittests/tst_models.cpp
===================================================================
diff -u -rd28dcbacdb1818e5777d83feb1e513a339da6995 -r0e528e5f706308c7b0e8f22a4d9dbb5b5715db7c
--- unittests/tst_models.cpp	(.../tst_models.cpp)	(revision d28dcbacdb1818e5777d83feb1e513a339da6995)
+++ unittests/tst_models.cpp	(.../tst_models.cpp)	(revision 0e528e5f706308c7b0e8f22a4d9dbb5b5715db7c)
@@ -38,10 +38,12 @@
 #include "MTreatmentFlowsData.h"
 #include "MTreatmentTimeData.h"
 #include "MTreatmentPressureOcclusionData.h"
+#include "MTreatmentSalineData.h"
 
 #include "MTreatmentAdjustUltrafiltrationStateResponse.h"
 #include "MTreatmentAdjustUltrafiltrationEditResponse.h"
 #include "MTreatmentAdjustUltrafiltrationConfirmResponse.h"
+#include "MTreatmentAdjustSalineResponse.h"
 
 #include "MAlarmStatusData.h"
 #include "MAlarmTriggered.h"
@@ -688,7 +690,7 @@
 void tst_models::tst_DGLoadCellReadingsData_data () {
     QTest::addColumn<int        >("errorIndex");
     QTest::addColumn<QByteArray >("data");
-    QTest::newRow("msg complete") <<  0 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B" "0C" "0D" "0E" "0F"));
+    QTest::newRow("msg complete   ") <<  0 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B" "0C" "0D" "0E" "0F"));
     QTest::newRow("mReservoir1Prim") <<  1 << QByteArray::fromHex(QByteArray());
     QTest::newRow("mReservoir1Prim") <<  1 << QByteArray::fromHex(QByteArray("00"));
     QTest::newRow("mReservoir1Prim") <<  1 << QByteArray::fromHex(QByteArray("00" "01"));
@@ -912,7 +914,7 @@
 void tst_models::tst_MOutletFlowData_data () {
     QTest::addColumn<int        >("errorIndex");
     QTest::addColumn<QByteArray >("data");
-    QTest::newRow("msg complete   ") <<  0 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B" "0C" "0D" "0E" "0F" "10" "11" "12" "13" "14" "15" "16" "17" "18" "19" "1A" "1B"));
+    QTest::newRow("msg complete    ") <<  0 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B" "0C" "0D" "0E" "0F" "10" "11" "12" "13" "14" "15" "16" "17" "18" "19" "1A" "1B"));
     QTest::newRow("mRefUFVol       ") <<  1 << QByteArray::fromHex(QByteArray());
     QTest::newRow("mRefUFVol       ") <<  1 << QByteArray::fromHex(QByteArray("00"));
     QTest::newRow("mRefUFVol       ") <<  1 << QByteArray::fromHex(QByteArray("00" "01"));
@@ -978,7 +980,7 @@
 void tst_models::tst_MBloodFlowData_data () {
     QTest::addColumn<int        >("errorIndex");
     QTest::addColumn<QByteArray >("data");
-    QTest::newRow("msg complete   ") <<  0 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B" "0C" "0D" "0E" "0F" "10" "11" "12" "13" "14" "15" "16" "17" "18" "19" "1A" "1B"));
+    QTest::newRow("msg complete    ") <<  0 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B" "0C" "0D" "0E" "0F" "10" "11" "12" "13" "14" "15" "16" "17" "18" "19" "1A" "1B"));
     QTest::newRow("mFlowSetPoint   ") <<  1 << QByteArray::fromHex(QByteArray());
     QTest::newRow("mFlowSetPoint   ") <<  1 << QByteArray::fromHex(QByteArray("00"));
     QTest::newRow("mFlowSetPoint   ") <<  1 << QByteArray::fromHex(QByteArray("00" "01"));
@@ -1044,7 +1046,7 @@
 void tst_models::tst_MDialysateFlowData_data () {
     QTest::addColumn<int        >("errorIndex");
     QTest::addColumn<QByteArray >("data");
-    QTest::newRow("msg complete   ") <<  0 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B" "0C" "0D" "0E" "0F" "10" "11" "12" "13" "14" "15" "16" "17" "18" "19" "1A" "1B"));
+    QTest::newRow("msg complete    ") <<  0 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B" "0C" "0D" "0E" "0F" "10" "11" "12" "13" "14" "15" "16" "17" "18" "19" "1A" "1B"));
     QTest::newRow("mFlowSetPoint   ") <<  1 << QByteArray::fromHex(QByteArray());
     QTest::newRow("mFlowSetPoint   ") <<  1 << QByteArray::fromHex(QByteArray("00"));
     QTest::newRow("mFlowSetPoint   ") <<  1 << QByteArray::fromHex(QByteArray("00" "01"));
@@ -1156,7 +1158,7 @@
 void tst_models::tst_MPressureOcclusionData_data () {
     QTest::addColumn<int        >("errorIndex");
     QTest::addColumn<QByteArray >("data");
-    QTest::newRow("msg complete                ") <<  0 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B" "0C" "0D" "0E" "0F" "10" "11" "12" "13"));
+    QTest::newRow("msg complete                 ") <<  0 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B" "0C" "0D" "0E" "0F" "10" "11" "12" "13"));
     QTest::newRow("mArterialPressure            ") <<  1 << QByteArray::fromHex(QByteArray());
     QTest::newRow("mArterialPressure            ") <<  1 << QByteArray::fromHex(QByteArray("00"));
     QTest::newRow("mArterialPressure            ") <<  1 << QByteArray::fromHex(QByteArray("00" "01"));
@@ -1376,3 +1378,95 @@
         break;
     }
 }
+
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MTreatmentSalineBolusData ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MTreatmentSalineBolusData data definition ~~~~~~~~~~~~~~~~~~~~~~~~ //
+void tst_models::tst_MTreatmentSalineBolusData_data () {
+    QTest::addColumn<int        >("errorIndex");
+    QTest::addColumn<QByteArray >("data");
+    QTest::newRow("msg complete") <<  0 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B"));
+    QTest::newRow("mTarget     ") <<  1 << QByteArray::fromHex(QByteArray());
+    QTest::newRow("mTarget     ") <<  1 << QByteArray::fromHex(QByteArray("00"));
+    QTest::newRow("mTarget     ") <<  1 << QByteArray::fromHex(QByteArray("00" "01"));
+    QTest::newRow("mTarget     ") <<  1 << QByteArray::fromHex(QByteArray("00" "01" "02"));
+    QTest::newRow("mCumulative ") <<  2 << QByteArray::fromHex(QByteArray("00" "01" "02" "03"));
+    QTest::newRow("mCumulative ") <<  2 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04"));
+    QTest::newRow("mCumulative ") <<  2 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05"));
+    QTest::newRow("mCumulative ") <<  2 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06"));
+    QTest::newRow("mDelivered  ") <<  3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07"));
+    QTest::newRow("mDelivered  ") <<  3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08"));
+    QTest::newRow("mDelivered  ") <<  3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09"));
+    QTest::newRow("mDelivered  ") <<  3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A"));
+}
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MTreatmentSalineBolusData test definition ~~~~~~~~~~~~~~~~~~~~~~~~ //
+void tst_models::tst_MTreatmentSalineBolusData() {
+    Model::MTreatmentSaline 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 << errorIndex << startIndex << ok << data ;
+#endif
+
+    switch (errorIndex) {
+    case  0: { index = 0                                     ; QVERIFY (  mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
+    case  1: { index = index * sizeof mData._data.mTarget    ; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
+    case  2: { index = index * sizeof mData._data.mCumulative; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
+    case  3: { index = index * sizeof mData._data.mDelivered ; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
+    default:
+        QVERIFY2(false, "Incorrect Test");
+        break;
+    }
+}
+
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MSalineBolusResponse ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MSalineBolusResponse data definition ~~~~~~~~~~~~~~~~~~~~~~~~ //
+void tst_models::tst_MSalineBolusResponse_data () {
+    QTest::addColumn<int        >("errorIndex");
+    QTest::addColumn<QByteArray >("data");
+    QTest::newRow("msg complete") <<  0 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B"));
+    QTest::newRow("mAccepted   ") <<  1 << QByteArray::fromHex(QByteArray());
+    QTest::newRow("mAccepted   ") <<  1 << QByteArray::fromHex(QByteArray("00"));
+    QTest::newRow("mAccepted   ") <<  1 << QByteArray::fromHex(QByteArray("00" "01"));
+    QTest::newRow("mAccepted   ") <<  1 << QByteArray::fromHex(QByteArray("00" "01" "02"));
+    QTest::newRow("mReason     ") <<  2 << QByteArray::fromHex(QByteArray("00" "01" "02" "03"));
+    QTest::newRow("mReason     ") <<  2 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04"));
+    QTest::newRow("mReason     ") <<  2 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05"));
+    QTest::newRow("mReason     ") <<  2 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06"));
+    QTest::newRow("mTarget     ") <<  3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07"));
+    QTest::newRow("mTarget     ") <<  3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08"));
+    QTest::newRow("mTarget     ") <<  3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09"));
+    QTest::newRow("mTarget     ") <<  3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A"));
+}
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MSalineBolusResponse test definition ~~~~~~~~~~~~~~~~~~~~~~~~ //
+void tst_models::tst_MSalineBolusResponse() {
+    Model::MAdjustSalineResponse 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 << errorIndex << startIndex << ok << data ;
+#endif
+
+    switch (errorIndex) {
+    case  0: { index = 0                                   ; QVERIFY (  mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
+    case  1: { index = index * sizeof mData._data.mAccepted; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
+    case  2: { index = index * sizeof mData._data.mReason  ; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
+    case  3: { index = index * sizeof mData._data.mTarget  ; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
+    default:
+        QVERIFY2(false, "Incorrect Test");
+        break;
+    }
+}