Index: unittests/tst_models.cpp
===================================================================
diff -u -r97fc44f948bd39ed0b4238558a16bf99f750bf5e -r846a9ebc350e33be4affab3cc4c136248900015d
--- unittests/tst_models.cpp	(.../tst_models.cpp)	(revision 97fc44f948bd39ed0b4238558a16bf99f750bf5e)
+++ unittests/tst_models.cpp	(.../tst_models.cpp)	(revision 846a9ebc350e33be4affab3cc4c136248900015d)
@@ -6,8 +6,8 @@
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
  * \file tst_models.cpp
- * \author (last) Peter Lucia
- * \date (last) 07-Jul-2020
+ * \author (last) Behrouz NematiPour
+ * \date (last) 13-Aug-2020
  * \author (original) Behrouz NematiPour
  * \date (original) 21-Apr-2020
  *
@@ -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"
@@ -691,7 +693,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"));
@@ -1548,6 +1550,53 @@
     }
 }
 
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 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;
+    }
+}
+
 void tst_models::tst_MTreatmentParametersResp_fromVariantList()
 {
     Model::TreatmentParametersResp mData;
@@ -1655,6 +1704,50 @@
 
         }
     }
+}
 
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 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;
+    }
 }