Merge pull request #2636 from nasa/integration-candidate

cFE Integration candidate: Equuleus-rc1+dev25

Author: dzbaker

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Development Build: equuleus-rc1+dev235
+- add initialization of table indices
+- See <https://github.com/nasa/cFE/pull/2633>
+
 ## Development Build: equuleus-rc1+dev231
 - Update Upload Artifact Version
 - See <https://github.com/nasa/cFE/pull/2631>

modules/core_api/fsw/inc/cfe_version.h

@@ -26,7 +26,7 @@
 #define CFE_VERSION_H
 
 /* Development Build Macro Definitions */
-#define CFE_BUILD_NUMBER    231 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */
+#define CFE_BUILD_NUMBER    235 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */
 #define CFE_BUILD_BASELINE  "equuleus-rc1" /**< @brief Development: Reference git tag for build number */
 #define CFE_BUILD_DEV_CYCLE "equuleus-rc2" /**< @brief Development: Release name for current development cycle */
 #define CFE_BUILD_CODENAME  "Equuleus"     /**< @brief: Development: Code name for the current build */

modules/tbl/fsw/src/cfe_tbl_task.c

@@ -164,8 +164,8 @@ int32 CFE_TBL_TaskInit(void)
     /*
     ** Task startup event message
     */
-    CFE_Config_GetVersionString(VersionString, CFE_CFG_MAX_VERSION_STR_LEN, "cFE",
-        CFE_SRC_VERSION, CFE_BUILD_CODENAME, CFE_LAST_OFFICIAL);
+    CFE_Config_GetVersionString(VersionString, CFE_CFG_MAX_VERSION_STR_LEN, "cFE", CFE_SRC_VERSION, CFE_BUILD_CODENAME,
+                                CFE_LAST_OFFICIAL);
     Status = CFE_EVS_SendEvent(CFE_TBL_INIT_INF_EID, CFE_EVS_EventType_INFORMATION, "cFE TBL Initialized: %s",
                                VersionString);
 
@@ -199,4 +199,7 @@ void CFE_TBL_InitData(void)
     /* Message ID is set when sent, so OK as 0 here */
     CFE_MSG_Init(CFE_MSG_PTR(CFE_TBL_Global.NotifyMsg.CommandHeader), CFE_SB_INVALID_MSG_ID,
                  sizeof(CFE_TBL_Global.NotifyMsg));
+
+    CFE_TBL_Global.LastValidationResultId = CFE_ResourceId_FromInteger(CFE_TBL_VALRESULTID_BASE);
+    CFE_TBL_Global.LastDumpCtrlBlockId    = CFE_ResourceId_FromInteger(CFE_TBL_DUMPCTRLID_BASE);
 }

modules/tbl/ut-coverage/tbl_UT.c

@@ -783,7 +783,7 @@ void Test_CFE_TBL_ValidateCmd(void)
     ValidateCmd.Payload.ActiveTableFlag                                      = CFE_TBL_BufferSelect_ACTIVE;
     CFE_TBL_Global.Registry[0].Buffers[CFE_TBL_Global.Registry[0].ActiveBufferIndex].BufferPtr = BuffPtr;
 
-    UT_SetDeferredRetcode(UT_KEY(CFE_ResourceId_FindNext), 1, 0);
+    UT_SetDeferredRetcode(UT_KEY(CFE_ResourceId_FindNext), 1, -1);
     UtAssert_INT32_EQ(CFE_TBL_ValidateCmd(&ValidateCmd), CFE_TBL_INC_ERR_CTR);
 
     /* Test where the active buffer has data, but there is no validation
@@ -1127,6 +1127,19 @@ void Test_CFE_TBL_DumpCmd(void)
     snprintf(DumpCmd.Payload.TableName, sizeof(DumpCmd.Payload.TableName), "%d", CFE_PLATFORM_TBL_MAX_NUM_TABLES + 1);
     UtAssert_INT32_EQ(CFE_TBL_DumpCmd(&DumpCmd), CFE_TBL_INC_ERR_CTR);
 
+    /* Test where the active buffer has data, but no dump control buffer is available
+     */
+    UT_InitData();
+    strncpy(CFE_TBL_Global.Registry[2].Name, "DumpCmdTest", sizeof(CFE_TBL_Global.Registry[2].Name) - 1);
+    strncpy(DumpCmd.Payload.TableName, CFE_TBL_Global.Registry[2].Name, sizeof(DumpCmd.Payload.TableName) - 1);
+    CFE_TBL_Global.Registry[2].DumpOnly                              = true;
+    DumpCmd.Payload.TableName[sizeof(DumpCmd.Payload.TableName) - 1] = '\0';
+    DumpCmd.Payload.ActiveTableFlag                                  = CFE_TBL_BufferSelect_ACTIVE;
+    CFE_TBL_Global.Registry[2].Buffers[CFE_TBL_Global.Registry[2].ActiveBufferIndex].BufferPtr = BuffPtr;
+
+    UT_SetDeferredRetcode(UT_KEY(CFE_ResourceId_FindNext), 1, -1);
+    UtAssert_INT32_EQ(CFE_TBL_DumpCmd(&DumpCmd), CFE_TBL_INC_ERR_CTR);
+
     /* Test with an active buffer, the pointer is created, validation passes,
      * the table is dump only, no dump is already in progress, and have a
      * working buffer; load in progress, single-buffered
@@ -4068,7 +4081,7 @@ void Test_CFE_TBL_ResourceID_ValidationResult(void)
     UtAssert_BOOL_TRUE(CFE_TBL_CheckValidationResultSlotUsed(PendingId));
 
     /* Test case where no ID is available */
-    UT_SetDefaultReturnValue(UT_KEY(CFE_ResourceId_FindNext), 0);
+    UT_SetDefaultReturnValue(UT_KEY(CFE_ResourceId_FindNext), -1);
     UtAssert_VOIDCALL(PendingId = CFE_TBL_GetNextValResultBlock());
     UtAssert_BOOL_FALSE(CFE_ResourceId_IsDefined(PendingId));
 
@@ -4167,7 +4180,7 @@ void Test_CFE_TBL_ResourceID_DumpControl(void)
     UtAssert_BOOL_TRUE(CFE_TBL_CheckDumpCtrlSlotUsed(PendingId));
 
     /* Test case where no ID is available */
-    UT_SetDefaultReturnValue(UT_KEY(CFE_ResourceId_FindNext), 0);
+    UT_SetDefaultReturnValue(UT_KEY(CFE_ResourceId_FindNext), -1);
     UtAssert_VOIDCALL(PendingId = CFE_TBL_GetNextDumpCtrlBlock());
     UtAssert_BOOL_FALSE(CFE_ResourceId_IsDefined(PendingId));