Index: unittests/tst_messaging.cpp
===================================================================
diff -u -rd2035a8728794afeefaa244bf8d1597926d945f5 -rbf645acccabb7b5a84801620c4f7fa0b0e6878e0
--- unittests/tst_messaging.cpp	(.../tst_messaging.cpp)	(revision d2035a8728794afeefaa244bf8d1597926d945f5)
+++ unittests/tst_messaging.cpp	(.../tst_messaging.cpp)	(revision bf645acccabb7b5a84801620c4f7fa0b0e6878e0)
@@ -1,16 +1,16 @@
 /*!
- * 
+ *
  * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
  * \copyright
  * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
- * 
+ *
  * \file tst_messaging.cpp
  * \author (last) Peter Lucia
  * \date (last) 06-Jul-2020
  * \author (original) Behrouz NematiPour
  * \date (original) 21-Apr-2020
- * 
+ *
  */
 #include "tst_messaging.h"
 
@@ -77,7 +77,7 @@
     msg.data = {};
     Model::MPowerOff data;
     data.fromByteArray(msg.data);
-    //QVERIFY( ! iMsg.interpretMessage(msg, data));
+    // QVERIFY( ! iMsg.interpretMessage(msg, data));
 }
 
 /*!
@@ -92,7 +92,7 @@
     msg.data = {};
     Model::MPowerOff data;
     data.fromByteArray(msg.data);
-    //QVERIFY( ! iMsg.interpretMessage(msg, data));
+    // QVERIFY( ! iMsg.interpretMessage(msg, data));
 }
 
 /*!
@@ -285,7 +285,7 @@
     msg.actionId = Gui::GuiActionType::ID_TreatmentTime;
     msg.data = {};
     QVariantList data;
-    //QVERIFY( ! iMsg.treatmentTime(msg, data));
+    QVERIFY( ! iMsg.interpretMessage(msg, data));
     QVERIFY(   data.isEmpty());
 }
 
@@ -446,7 +446,7 @@
     msg.actionId = Gui::GuiActionType::ID_Unknown;
     msg.data = {};
     QVariantList list;
-    QVERIFY( ! iMsg.interpretMessage(msg, list));
+    QVERIFY( ! iMsg.adjustUltrafiltrationState(msg, list));
 }
 
 /*!
@@ -460,7 +460,7 @@
     msg.actionId = Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq;
     msg.data = {};
     QVariantList list;
-    QVERIFY( ! iMsg.interpretMessage(msg, list));
+    QVERIFY( ! iMsg.adjustUltrafiltrationState(msg, list));
 }
 
 /*!
@@ -474,7 +474,7 @@
     msg.actionId = Gui::GuiActionType::ID_Unknown;
     msg.data = {};
     QVariantList list;
-    QVERIFY( ! iMsg.interpretMessage(msg, list));
+    QVERIFY( ! iMsg.adjustUltrafiltrationEdit(msg, list));
 }
 
 /*!
@@ -488,7 +488,7 @@
     msg.actionId = Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp;
     msg.data = {};
     QVariantList list;
-    QVERIFY( ! iMsg.interpretMessage(msg, list));
+    QVERIFY( ! iMsg.adjustUltrafiltrationEdit(msg, list));
 }
 
 /*!
@@ -502,7 +502,7 @@
     msg.actionId = Gui::GuiActionType::ID_Unknown;
     msg.data = {};
     QVariantList list;
-    QVERIFY( ! iMsg.interpretMessage(msg, list));
+    QVERIFY( ! iMsg.adjustUltrafiltrationConfirm(msg, list));
 }
 
 /*!
@@ -516,7 +516,7 @@
     msg.actionId = Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp;
     msg.data = {};
     QVariantList list;
-    QVERIFY( ! iMsg.interpretMessage(msg, list));
+    QVERIFY( ! iMsg.adjustUltrafiltrationConfirm(msg, list));
 }
 
 /*!
@@ -525,27 +525,26 @@
  */
 void tst_messaging::tst_MessageInterpreter_HD_emptyMessages()
 {
-    gDisableHunhandledReport = true;
+    gDisableUnhandledReport = true;
     Can::MessageInterpreter interpreter;
     Can::Message msg;
-    msg.actionId = Gui::GuiActionType::AlarmTriggered;
+    msg.actionId = Gui::GuiActionType::ID_AlarmTriggered;
     msg.data = {};
     QVariantList list;
 
     QList<Gui::GuiActionType> actionTypes = {
-        Gui::GuiActionType::AlarmTriggered,
-        Gui::GuiActionType::AlarmCleared,
-        Gui::GuiActionType::AlarmSilenceRsp,
-        Gui::GuiActionType::TreatmentState,
+        Gui::GuiActionType::ID_AlarmTriggered,
+        Gui::GuiActionType::ID_AlarmCleared,
+        Gui::GuiActionType::ID_AlarmSilenceRsp,
+        Gui::GuiActionType::ID_TreatmentStates,
     };
 
     foreach (const Gui::GuiActionType &each, actionTypes) {
         msg.actionId = each;
-        QVERIFY(interpreter.interpretMessage_HD(msg, list));
-
+        QVERIFY(! interpreter.interpretMessage_HD(msg, list));
     }
 
-    msg.actionId = Gui::GuiActionType::String;
+    msg.actionId = Gui::GuiActionType::ID_RawData;
     QVERIFY(!interpreter.interpretMessage_HD(msg, list));
 }
 
@@ -686,6 +685,17 @@
     QVERIFY(list.isEmpty());
 }
 
+void tst_messaging::tst_MessageInterpreter_notify_fromByteArray()
+{
+    Can::MessageInterpreter iMsg;
+    Can::Message msg;
+    msg.actionId = Gui::GuiActionType::ID_PowerOff;
+    msg.data = {};
+    QVariantList list;
+    QVERIFY( ! iMsg.notify<Model::MPowerOff>(msg, list, Gui::GuiActionType::ID_PowerOff));
+    QVERIFY(list.isEmpty());
+}
+
 /*!
  * \brief   tst_messaging::tst_MessageInterpreter_interpretMessage_AdjustBloodDialysateReq
  * \details Tests MessageInterpreter interpretMessage to handle AdjustBloodDialysateReq message type
@@ -695,7 +705,8 @@
 {
     Can::MessageInterpreter iMsg;
     QByteArray payload;
-    //QVERIFY(iMsg.interpretMessage(Gui::GuiActionType::ID_AdjustBloodDialysateReq, {}, payload));
+    // if the payload is empty the len is not valid and should return false and empty payload
+    QVERIFY(! iMsg.interpretMessage(Gui::GuiActionType::ID_AdjustBloodDialysateReq, {}, payload));
     QVERIFY(payload.isEmpty());
 }
 
@@ -708,7 +719,8 @@
 {
     Can::MessageInterpreter iMsg;
     QByteArray payload;
-    //QVERIFY(iMsg.interpretMessage(Gui::GuiActionType::ID_AdjustDurationReq, {}, payload));
+    // if the payload is empty the len is not valid and should return false and empty payload
+    QVERIFY( ! iMsg.interpretMessage(Gui::GuiActionType::ID_AdjustDurationReq, {}, payload));
     QVERIFY(payload.isEmpty());
 }
 
@@ -721,7 +733,8 @@
 {
     Can::MessageInterpreter iMsg;
     QByteArray payload;
-    QVERIFY(iMsg.interpretMessage(Gui::GuiActionType::AlarmSilenceReq, {}, payload));
+    // if the payload is empty the len is not valid and should return false and empty payload
+    QVERIFY(! iMsg.interpretMessage(Gui::GuiActionType::ID_AlarmSilenceReq, {}, payload));
     QVERIFY(payload.isEmpty());
 }
 
@@ -734,7 +747,8 @@
 {
     Can::MessageInterpreter iMsg;
     QByteArray payload;
-    //QVERIFY(iMsg.interpretMessage(Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq, {}, payload));
+    // if the payload is empty the len is not valid and should return false and empty payload
+    QVERIFY(! iMsg.interpretMessage(Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq, {}, payload));
     QVERIFY(payload.isEmpty());
 }
 
@@ -747,7 +761,8 @@
 {
     Can::MessageInterpreter iMsg;
     QByteArray payload;
-    //QVERIFY(iMsg.interpretMessage(Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq, {}, payload));
+    // if the payload is empty the len is not valid and should return false and empty payload
+    QVERIFY( ! iMsg.interpretMessage(Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq, {}, payload));
     QVERIFY(payload.isEmpty());
 }
 
@@ -760,7 +775,8 @@
 {
     Can::MessageInterpreter iMsg;
     QByteArray payload;
-    //QVERIFY(iMsg.interpretMessage(Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmReq, {}, payload));
+    // if the payload is empty the len is not valid and should return false and empty payload
+    QVERIFY( ! iMsg.interpretMessage(Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmReq, {}, payload));
     QVERIFY(payload.isEmpty());
 }
 
@@ -906,3 +922,16 @@
     dMsg.actionTransmit(Gui::GuiActionType::ID_AdjustBloodDialysateReq, data, seq);
 }
 
+/*!
+ * \brief   tst_messaging::tst_MessageDispatcher_actionTransmit
+ * \details Tests MessageDispatcher actionTransmit()
+ */
+void tst_messaging::tst_MessageDispatcher_actionTransmit_Unknown()
+{
+    Can::MessageDispatcher dMsg;
+    QVariantList data;
+    Can::Sequence seq = 1;
+    dMsg.actionTransmit(Gui::GuiActionType::ID_KeepAlive, data, seq);
+}
+
+