Merge pull request #2041 from skliper/fix2040-isvalidmsgid_stub_impro…

…vement Fix #2040, Improve CFE_SB_IsValidMsgId handler
nasa · Feb 3, 2022 · 94fc960 · 94fc960
2 parents 546da3b + a5f27e8
commit 94fc960
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/modules/core_api/ut-stubs/src/cfe_sb_handlers.c b/modules/core_api/ut-stubs/src/cfe_sb_handlers.c
@@ -398,12 +398,19 @@ void UT_DefaultHandler_CFE_SB_GetUserDataLength(void *UserObj, UT_EntryKey_t Fun
  *------------------------------------------------------------*/
 void UT_DefaultHandler_CFE_SB_IsValidMsgId(void *UserObj, UT_EntryKey_t FuncKey, const UT_StubContext_t *Context)
 {
-    int32 status;
-    bool  return_value;
-
-    UT_Stub_GetInt32StatusCode(Context, &status);
+    int32          status;
+    bool           return_value;
+    CFE_SB_MsgId_t MsgId = UT_Hook_GetArgValueByName(Context, "MsgId", CFE_SB_MsgId_t);
 
-    return_value = status;
+    if (UT_Stub_GetInt32StatusCode(Context, &status))
+    {
+        return_value = status;
+    }
+    else
+    {
+        /* The only invalid value UT's should be using is CFE_SB_INVALID_MSG_ID */
+        return_value = !CFE_SB_MsgId_Equal(MsgId, CFE_SB_INVALID_MSG_ID);
+    }
 
     UT_Stub_SetReturnValue(FuncKey, return_value);
 }