Updates to address code coverage errors

Author: jphickey

modules/tbl/fsw/src/cfe_tbl_task_cmds.c

@@ -404,12 +404,9 @@ CFE_Status_t CFE_TBL_LoadCmd(const CFE_TBL_LoadCmd_t *data)
         /* Locate specified table in registry (wrapped in a lock) */
         /* NOTE: The header reading code ensures null term on the table name string, so its OK to pass direct */
         CFE_TBL_TxnLockRegistry(&Txn);
-        Status = CFE_TBL_TxnFindRegByName(&Txn, Header.Tbl.TableName);
+        CFE_TBL_TxnFindRegByName(&Txn, Header.Tbl.TableName);
         CFE_TBL_TxnUnlockRegistry(&Txn);
-    }
 
-    if (Status == CFE_SUCCESS)
-    {
         Status = CFE_TBL_ValidateFileIsLoadable(&Txn, &Header.Tbl);
     }
 

modules/tbl/ut-coverage/tbl_UT.c

@@ -143,6 +143,8 @@ void UtTest_Setup(void)
     UT_TBL_ADD_TEST(Test_CFE_TBL_Internal3);
 
     UT_TBL_RegisterCodecTests();
+
+    UT_TBL_ADD_TEST(Test_CFE_TBL_HandleConversions);
 }
 
 /*
@@ -4209,3 +4211,29 @@ void Test_CFE_TBL_TxnEvents(void)
     UtAssert_VOIDCALL(CFE_TBL_TxnClearEvents(&Txn));
     UtAssert_ZERO(CFE_TBL_TxnGetEventCount(&Txn));
 }
+
+void Test_CFE_TBL_HandleConversions(void)
+{
+    /* Test case for:
+     *  CFE_TBL_HandleId_t CFE_TBL_HandleToID(CFE_TBL_Handle_t TblHandle)
+     *  CFE_TBL_Handle_t   CFE_TBL_HandleFromID(CFE_TBL_HandleId_t TblId)
+     */
+
+    CFE_TBL_HandleId_t TblId;
+    CFE_TBL_Handle_t   TblHandle;
+
+    TblId = CFE_TBL_HandleToID(CFE_TBL_BAD_TABLE_HANDLE);
+    UtAssert_BOOL_FALSE(CFE_TBL_HandleID_IsDefined(TblId));
+
+    TblHandle = CFE_TBL_HandleFromID(CFE_TBL_HANDLEID_UNDEFINED);
+    UtAssert_BOOL_FALSE(CFE_TBL_HANDLE_IS_VALID(TblHandle));
+
+    TblId     = CFE_TBL_HANDLEID_C(CFE_ResourceId_FromInteger(CFE_TBL_HANDLE_BASE + 1));
+    UtAssert_BOOL_TRUE(CFE_TBL_HandleID_IsDefined(TblId));
+
+    TblHandle = CFE_TBL_HandleFromID(TblId);
+    UtAssert_BOOL_TRUE(CFE_TBL_HANDLE_IS_VALID(TblHandle));
+
+    UtAssert_UINT32_EQ(CFE_TBL_HandleID_AsInt(CFE_TBL_HandleToID(TblHandle)),CFE_TBL_HandleID_AsInt(TblId));
+
+}

modules/tbl/ut-coverage/tbl_UT.h

@@ -685,4 +685,7 @@ void Test_CFE_TBL_TableLoadCommon(void);
 void Test_CFE_TBL_TableLoadCodec(void);
 void Test_CFE_TBL_TableDumpCommon(void);
 
+/* Handle conversion tests */
+void Test_CFE_TBL_HandleConversions(void);
+
 #endif /* TBL_UT_H */