Index: unittests/tst_models.cpp
===================================================================
diff -u -r14c541d2b780b0a244bc84860aa565cf8dd7fe4b -rdf0c8b4fa51d4f5ef0216eb2c3f6f5dfc97bf12e
--- unittests/tst_models.cpp	(.../tst_models.cpp)	(revision 14c541d2b780b0a244bc84860aa565cf8dd7fe4b)
+++ unittests/tst_models.cpp	(.../tst_models.cpp)	(revision df0c8b4fa51d4f5ef0216eb2c3f6f5dfc97bf12e)
@@ -44,8 +44,9 @@
 #include "MTreatmentAdjustUltrafiltrationStateResponse.h"
 #include "MTreatmentAdjustUltrafiltrationEditResponse.h"
 #include "MTreatmentAdjustUltrafiltrationConfirmResponse.h"
-#include "MTreatmentAdjustSalineResponse.h"
 #include "MTreatmentAdjustPressuresLimitsResponse.h"
+#include "MTreatmentAdjustSalineResponse.h"
+#include "MTreatmentAdjustHeparinResponse.h"
 
 #include "MAlarmStatusData.h"
 #include "MAlarmTriggered.h"
@@ -916,19 +917,23 @@
 void tst_models::tst_MTreatmentStateData_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("mSubmode    ") <<  1 << QByteArray::fromHex(QByteArray());
-    QTest::newRow("mSubmode    ") <<  1 << QByteArray::fromHex(QByteArray("00"));
-    QTest::newRow("mSubmode    ") <<  1 << QByteArray::fromHex(QByteArray("00" "01"));
-    QTest::newRow("mSubmode    ") <<  1 << QByteArray::fromHex(QByteArray("00" "01" "02"));
-    QTest::newRow("mUFState    ") <<  2 << QByteArray::fromHex(QByteArray("00" "01" "02" "03"));
-    QTest::newRow("mUFState    ") <<  2 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04"));
-    QTest::newRow("mUFState    ") <<  2 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05"));
-    QTest::newRow("mUFState    ") <<  2 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06"));
-    QTest::newRow("mSalineState") <<  3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07"));
-    QTest::newRow("mSalineState") <<  3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08"));
-    QTest::newRow("mSalineState") <<  3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09"));
-    QTest::newRow("mSalineState") <<  3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A"));
+    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("mSubmode     ") <<  1 << QByteArray::fromHex(QByteArray());
+    QTest::newRow("mSubmode     ") <<  1 << QByteArray::fromHex(QByteArray("00"));
+    QTest::newRow("mSubmode     ") <<  1 << QByteArray::fromHex(QByteArray("00" "01"));
+    QTest::newRow("mSubmode     ") <<  1 << QByteArray::fromHex(QByteArray("00" "01" "02"));
+    QTest::newRow("mUFState     ") <<  2 << QByteArray::fromHex(QByteArray("00" "01" "02" "03"));
+    QTest::newRow("mUFState     ") <<  2 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04"));
+    QTest::newRow("mUFState     ") <<  2 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05"));
+    QTest::newRow("mUFState     ") <<  2 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06"));
+    QTest::newRow("mSalineState ") <<  3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07"));
+    QTest::newRow("mSalineState ") <<  3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08"));
+    QTest::newRow("mSalineState ") <<  3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09"));
+    QTest::newRow("mSalineState ") <<  3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A"));
+    QTest::newRow("mHeparinState") <<  4 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B"));
+    QTest::newRow("mHeparinState") <<  4 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B" "0C"));
+    QTest::newRow("mHeparinState") <<  4 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B" "0C" "0D"));
+    QTest::newRow("mHeparinState") <<  4 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B" "0C" "0D" "0E"));
 }
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MTreatmentStateData test definition ~~~~~~~~~~~~~~~~~~~~~~~~ //
 void tst_models::tst_MTreatmentStateData() {
@@ -946,10 +951,11 @@
 #endif
 
     switch (errorIndex) {
-    case  0: { index = 0                                      ; QVERIFY (  mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
-    case  1: { index = index * sizeof mData._data.mSubMode    ; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
-    case  2: { index = index * sizeof mData._data.mUFState    ; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
-    case  3: { index = index * sizeof mData._data.mSalineState; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
+    case  0: { index = 0                                       ; QVERIFY (  mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
+    case  1: { index = index * sizeof mData._data.mSubMode     ; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
+    case  2: { index = index * sizeof mData._data.mUFState     ; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
+    case  3: { index = index * sizeof mData._data.mSalineState ; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
+    case  4: { index = index * sizeof mData._data.mHeparinState; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
     default:
         QVERIFY2(false, "Incorrect Test");
         break;
@@ -1637,6 +1643,43 @@
     }
 }
 
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MTreatmentHeparinData ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MTreatmentHeparinData data definition ~~~~~~~~~~~~~~~~~~~~~~~~ //
+void tst_models::tst_MTreatmentHeparinData_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("mCumulative ") <<  1 << QByteArray::fromHex(QByteArray());
+    QTest::newRow("mCumulative ") <<  1 << QByteArray::fromHex(QByteArray("00"));
+    QTest::newRow("mCumulative ") <<  1 << QByteArray::fromHex(QByteArray("00" "01"));
+    QTest::newRow("mCumulative ") <<  1 << QByteArray::fromHex(QByteArray("00" "01" "02"));
+}
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MTreatmentHeparinData test definition ~~~~~~~~~~~~~~~~~~~~~~~~ //
+void tst_models::tst_MTreatmentHeparinData() {
+    Model::MTreatmentHeparin 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.mCumulative; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
+    default:
+        QVERIFY2(false, "Incorrect Test");
+        break;
+    }
+}
+
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MPrimingData ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MPrimingData data definition ~~~~~~~~~~~~~~~~~~~~~~~~ //
 void tst_models::tst_MPrimingData_data () {
@@ -1814,6 +1857,52 @@
     }
 }
 
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MSalineBolusResponse ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MSalineBolusResponse data definition ~~~~~~~~~~~~~~~~~~~~~~~~ //
+void tst_models::tst_MHeparinResponse_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("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("mState      ") <<  3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07"));
+    QTest::newRow("mState      ") <<  3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08"));
+    QTest::newRow("mState      ") <<  3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09"));
+    QTest::newRow("mState      ") <<  3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A"));
+}
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MHeparinResponse test definition ~~~~~~~~~~~~~~~~~~~~~~~~ //
+void tst_models::tst_MHeparinResponse() {
+    Model::MAdjustHeparinResponse 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.mState   ; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
+    default:
+        QVERIFY2(false, "Incorrect Test");
+        break;
+    }
+}
+
 void tst_models::tst_MAlarmAcknowledgeRequest()
 {
     MessageInterpreter interpreter;