From ebeb8f371f32b6e4ba1b673d7a3c7a8b9c1ea761 Mon Sep 17 00:00:00 2001
From: Anh D Van <anh.d.van@nasa.gov>
Date: Tue, 10 Sep 2024 14:26:38 +0000
Subject: [PATCH] Fix #2597, fix sb coverage test failure

Fix #2597, fix sb coverage test failure involving topic ID
---
 modules/sb/ut-coverage/sb_UT.c | 96 +++++++++++++++++++++++++++++-----
 1 file changed, 82 insertions(+), 14 deletions(-)

diff --git a/modules/sb/ut-coverage/sb_UT.c b/modules/sb/ut-coverage/sb_UT.c
index 770b6963b..8988eb77e 100644
--- a/modules/sb/ut-coverage/sb_UT.c
+++ b/modules/sb/ut-coverage/sb_UT.c
@@ -4629,56 +4629,124 @@ void Test_CFE_SB_ValidateMsgId(void)
 
 void Test_CFE_SB_CmdTopicIdToMsgId(void)
 {
-    CFE_SB_MsgId_Atom_t MsgIdVal;
+    CFE_SB_MsgId_Atom_t MsgIdVal1;
+    CFE_SB_MsgId_Atom_t MsgIdVal2;
+    bool ReturnCode1 = false;
+    bool ReturnCode2 = false;
+
+    MsgIdVal1 = CFE_SB_CmdTopicIdToMsgId(1, 1);
+    ReturnCode1 = CFE_SB_IsValidMsgId(CFE_SB_ValueToMsgId(MsgIdVal1));
 
-    MsgIdVal = CFE_SB_CmdTopicIdToMsgId(1, 1);
-    UtAssert_BOOL_TRUE(CFE_SB_IsValidMsgId(CFE_SB_ValueToMsgId(MsgIdVal)));
+    MsgIdVal2 = CFE_SB_CmdTopicIdToMsgId(1, 0);
+    ReturnCode2 = CFE_SB_IsValidMsgId(CFE_SB_ValueToMsgId(MsgIdVal2));
 
-    MsgIdVal = CFE_SB_CmdTopicIdToMsgId(1, 0);
-    UtAssert_BOOL_TRUE(CFE_SB_IsValidMsgId(CFE_SB_ValueToMsgId(MsgIdVal)));
+    if(MsgIdVal1 == 0 || MsgIdVal2 == 0)
+    {
+        /* Macro does not exist. Topic ID has not been implemented. */
+        UtAssert_MIR("Topic ID has not been implemented. ");
+    }
+    else
+    {
+        UtAssert_BOOL_TRUE(ReturnCode1);
+        UtAssert_BOOL_TRUE(ReturnCode2);
+    }
 }
 
 void Test_CFE_SB_TlmTopicIdToMsgId(void)
 {
-    CFE_SB_MsgId_Atom_t MsgIdVal;
+    CFE_SB_MsgId_Atom_t MsgIdVal1;
+    CFE_SB_MsgId_Atom_t MsgIdVal2;
+    bool ReturnCode1 = false;
+    bool ReturnCode2 = false;
+
+    MsgIdVal1 = CFE_SB_TlmTopicIdToMsgId(1, 1);
+    ReturnCode1 = CFE_SB_IsValidMsgId(CFE_SB_ValueToMsgId(MsgIdVal1));
 
-    MsgIdVal = CFE_SB_TlmTopicIdToMsgId(1, 1);
-    UtAssert_BOOL_TRUE(CFE_SB_IsValidMsgId(CFE_SB_ValueToMsgId(MsgIdVal)));
+    MsgIdVal2 = CFE_SB_TlmTopicIdToMsgId(1, 0);
+    ReturnCode2 = CFE_SB_IsValidMsgId(CFE_SB_ValueToMsgId(MsgIdVal2));
 
-    MsgIdVal = CFE_SB_CmdTopicIdToMsgId(1, 0);
-    UtAssert_BOOL_TRUE(CFE_SB_IsValidMsgId(CFE_SB_ValueToMsgId(MsgIdVal)));
+    if(MsgIdVal1 == 0 || MsgIdVal2 == 0)
+    {
+        /* Macro does not exist. Topic ID has not been implemented. */
+        UtAssert_MIR("Topic ID has not been implemented. ");
+    }
+    else
+    {
+        UtAssert_BOOL_TRUE(ReturnCode1);
+        UtAssert_BOOL_TRUE(ReturnCode2);
+    }
 }
 
 void Test_CFE_SB_GlobalCmdTopicIdToMsgId(void)
 {
     CFE_SB_MsgId_Atom_t MsgIdVal;
+    bool ReturnCode = false;
 
     MsgIdVal = CFE_SB_GlobalCmdTopicIdToMsgId(2);
-    UtAssert_BOOL_TRUE(CFE_SB_IsValidMsgId(CFE_SB_ValueToMsgId(MsgIdVal)));
+    ReturnCode = CFE_SB_IsValidMsgId(CFE_SB_ValueToMsgId(MsgIdVal));
+    if(MsgIdVal == 0)
+    {
+        /* Macro does not exist. Topic ID has not been implemented. */
+        UtAssert_MIR("Topic ID has not been implemented. ");
+    }
+    else
+    {
+        UtAssert_BOOL_TRUE(ReturnCode);
+    }
 }
 
 void Test_CFE_SB_GlobalTlmTopicIdToMsgId(void)
 {
     CFE_SB_MsgId_Atom_t MsgIdVal;
+    bool ReturnCode = false;
 
     MsgIdVal = CFE_SB_GlobalTlmTopicIdToMsgId(2);
-    UtAssert_BOOL_TRUE(CFE_SB_IsValidMsgId(CFE_SB_ValueToMsgId(MsgIdVal)));
+    ReturnCode = CFE_SB_IsValidMsgId(CFE_SB_ValueToMsgId(MsgIdVal));
+    if(MsgIdVal == 0)
+    {
+        /* Macro does not exist. Topic ID has not been implemented. */
+        UtAssert_MIR("Topic ID has not been implemented. ");
+    }
+    else
+    {
+        UtAssert_BOOL_TRUE(ReturnCode);
+    }
 }
 
 void Test_CFE_SB_LocalCmdTopicIdToMsgId(void)
 {
     CFE_SB_MsgId_Atom_t MsgIdVal;
+    bool ReturnCode = false;
 
     MsgIdVal = CFE_SB_LocalCmdTopicIdToMsgId(3);
-    UtAssert_BOOL_TRUE(CFE_SB_IsValidMsgId(CFE_SB_ValueToMsgId(MsgIdVal)));
+    ReturnCode = CFE_SB_IsValidMsgId(CFE_SB_ValueToMsgId(MsgIdVal));
+    if(MsgIdVal == 0)
+    {
+        /* Macro does not exist. Topic ID has not been implemented. */
+        UtAssert_MIR("Topic ID has not been implemented. ");
+    }
+    else
+    {
+        UtAssert_BOOL_TRUE(ReturnCode);
+    }
 }
 
 void Test_CFE_SB_LocalTlmTopicIdToMsgId(void)
 {
     CFE_SB_MsgId_Atom_t MsgIdVal;
+    bool ReturnCode = false;
 
     MsgIdVal = CFE_SB_LocalTlmTopicIdToMsgId(3);
-    UtAssert_BOOL_TRUE(CFE_SB_IsValidMsgId(CFE_SB_ValueToMsgId(MsgIdVal)));
+    ReturnCode = CFE_SB_IsValidMsgId(CFE_SB_ValueToMsgId(MsgIdVal));
+    if(MsgIdVal == 0)
+    {
+        /* Macro does not exist. Topic ID has not been implemented. */
+        UtAssert_MIR("Topic ID has not been implemented. ");
+    }
+    else
+    {
+        UtAssert_BOOL_TRUE(ReturnCode);
+    }
 }
 
 /*